From 10214658ec3daa7a7f53421d0247d9cbb2aba17b Mon Sep 17 00:00:00 2001
From: A117870935 <surinder.kumar@t-systems.com>
Date: Mon, 24 Apr 2023 11:47:04 +0530
Subject: [PATCH] Login related customization.

---
 app/src/debug/res/values/setup.xml                          | 6 ++++++
 .../android/authentication/AuthenticatorActivity.java       | 4 ++++
 .../com/owncloud/android/ui/activity/DrawerActivity.java    | 3 ++-
 app/src/main/res/values/setup.xml                           | 2 +-
 app/src/release/res/values/setup.xml                        | 5 +++++
 5 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 app/src/debug/res/values/setup.xml
 create mode 100644 app/src/release/res/values/setup.xml

diff --git a/app/src/debug/res/values/setup.xml b/app/src/debug/res/values/setup.xml
new file mode 100644
index 000000000000..046f7830a774
--- /dev/null
+++ b/app/src/debug/res/values/setup.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- webview_login_url should be empty in debug mode to show login url input screen
+    this will be useful in switching the environments during testing -->
+    <string name="webview_login_url" translatable="false" />
+</resources>
\ No newline at end of file
diff --git a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
index 4e3532fd649a..392ed65d0445 100644
--- a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -449,6 +449,10 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
             public void onPageFinished(WebView view, String url) {
                 super.onPageFinished(view, url);
 
+                //scroll to top when url loads
+                //because directly loading Telekom login page it scrolls down automatically
+                view.scrollTo(0,0);
+
                 accountSetupWebviewBinding.loginWebviewProgressBar.setVisibility(View.GONE);
                 accountSetupWebviewBinding.loginWebview.setVisibility(View.VISIBLE);
 
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
index 30b88ba07347..b69637c9315b 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -1105,7 +1105,8 @@ protected void onStop() {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onAccountRemovedEvent(AccountRemovedEvent event) {
-        restart();
+        //NMC customization
+        finish();
     }
 
     /**
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
index 501c30b0a3d5..0099dc52896c 100644
--- a/app/src/main/res/values/setup.xml
+++ b/app/src/main/res/values/setup.xml
@@ -50,7 +50,7 @@
     <color name="login_text_hint_color">#7fC0E3</color>
 
     <!-- Multiaccount support -->
-    <bool name="multiaccount_support">true</bool>
+    <bool name="multiaccount_support">false</bool>
 
     <!-- Drawer options -->
     <bool name="recently_modified_enabled">false</bool>
diff --git a/app/src/release/res/values/setup.xml b/app/src/release/res/values/setup.xml
new file mode 100644
index 000000000000..a4600f0ff88a
--- /dev/null
+++ b/app/src/release/res/values/setup.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- webview_login_url prod -->
+    <string name="webview_login_url" translatable="false" >https://magentacloud.de/index.php/login/flow</string>
+</resources>
\ No newline at end of file