Merge pull request #5286 from nextcloud/revert-to-login-v1

Revert to login v1

Author: mahibi

app/src/main/AndroidManifest.xml

@@ -123,7 +123,7 @@
             android:theme="@style/AppTheme" />
 
         <activity
-            android:name=".account.BrowserLoginActivity"
+            android:name=".account.WebViewLoginActivity"
             android:theme="@style/AppTheme" />
 
         <activity android:name=".contacts.ContactsActivity"

app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt

@@ -158,7 +158,7 @@ class AccountVerificationActivity : BaseActivity() {
                         bundle.putString(KEY_USERNAME, username)
                         bundle.putString(KEY_PASSWORD, "")
 
-                        val intent = Intent(context, BrowserLoginActivity::class.java)
+                        val intent = Intent(context, WebViewLoginActivity::class.java)
                         intent.putExtras(bundle)
                         startActivity(intent)
                     } else {

app/src/main/java/com/nextcloud/talk/account/BrowserLoginActivity.kt

@@ -53,6 +53,7 @@ import io.reactivex.schedulers.Schedulers
 import java.security.cert.CertificateException
 import javax.inject.Inject
 
+@Suppress("TooManyFunctions")
 @AutoInjector(NextcloudTalkApplication::class)
 class ServerSelectionActivity : BaseActivity() {
 
@@ -339,7 +340,7 @@ class ServerSelectionActivity : BaseActivity() {
                                 val bundle = Bundle()
                                 bundle.putString(BundleKeys.KEY_BASE_URL, queryUrl.replace("/status.php", ""))
 
-                                val intent = Intent(context, BrowserLoginActivity::class.java)
+                                val intent = Intent(context, WebViewLoginActivity::class.java)
                                 intent.putExtras(bundle)
                                 startActivity(intent)
                             }
@@ -435,7 +436,7 @@ class ServerSelectionActivity : BaseActivity() {
                     return@registerForActivityResult
                 }
 
-                val intent = Intent(this, BrowserLoginActivity::class.java)
+                val intent = Intent(this, WebViewLoginActivity::class.java)
                 val bundle = bundleOf().apply {
                     putString(BundleKeys.KEY_FROM_QR, resultData)
                 }