NMC-3250 -> opening login flow in internal webview instead of external browser.

NMC-1885: Splash screen customized
NMC-3680: sometimes app crash during launch fix

Author: surinder-tsys

app/src/androidTest/java/com/nmc/android/ui/LauncherActivityIT.kt

@@ -6,72 +6,33 @@
  */
 package com.nmc.android.ui
 
-import androidx.annotation.UiThread
-import androidx.test.core.app.launchActivity
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
 import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.owncloud.android.AbstractIT
 import com.owncloud.android.R
-import com.owncloud.android.utils.EspressoIdlingResource
-import org.junit.After
-import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class LauncherActivityIT : AbstractIT() {
 
-    @Before
-    fun registerIdlingResource() {
-        IdlingRegistry.getInstance().register(EspressoIdlingResource.countingIdlingResource)
-    }
-
-    @After
-    fun unregisterIdlingResource() {
-        IdlingRegistry.getInstance().unregister(EspressoIdlingResource.countingIdlingResource)
-    }
-
-    @Test
-    @UiThread
-    fun testSplashScreenWithEmptyTitlesShouldHideTitles() {
-        launchActivity<LauncherActivity>().use { scenario ->
-            scenario.onActivity { _ ->
-                onIdleSync {
-                    onView(withId(R.id.ivSplash)).check(matches(isCompletelyDisplayed()))
-                    onView(
-                        withId(R.id.splashScreenBold)
-                    ).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
-                    onView(
-                        withId(R.id.splashScreenNormal)
-                    ).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
-                }
-            }
-        }
-    }
+    @get:Rule
+    val activityRule = ActivityScenarioRule(LauncherActivity::class.java)
 
     @Test
-    @UiThread
-    fun testSplashScreenWithTitlesShouldShowTitles() {
-        launchActivity<LauncherActivity>().use { scenario ->
-            scenario.onActivity {
-                onIdleSync {
-                    onView(withId(R.id.ivSplash)).check(matches(isCompletelyDisplayed()))
-
-                    EspressoIdlingResource.increment()
-                    it.setSplashTitles("Example", "Cloud")
-                    EspressoIdlingResource.decrement()
-
-                    val onePercentArea = ViewMatchers.isDisplayingAtLeast(1)
-                    onView(withId(R.id.splashScreenBold)).check(matches(onePercentArea))
-                    onView(withId(R.id.splashScreenNormal)).check(matches(onePercentArea))
-                }
-            }
-        }
+    fun verifyUIElements() {
+        onView(withId(R.id.ivSplash)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.splashScreenBold)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.splashScreenNormal)).check(matches(isCompletelyDisplayed()))
+
+        onView(withId(R.id.splashScreenBold)).check(matches(withText("Magenta")))
+        onView(withId(R.id.splashScreenNormal)).check(matches(withText("CLOUD")))
+        shortSleep()
     }
 }

app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java

@@ -18,6 +18,7 @@
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.nextcloud.client.onboarding.FirstRunActivity;
 import com.nextcloud.common.NextcloudClient;
@@ -117,12 +118,22 @@ public boolean exists(Account account) {
 
         if (account != null && account.name != null) {
             int lastAtPos = account.name.lastIndexOf('@');
+            // NMC-3680 fix
+            if (lastAtPos == -1) {
+                Log_OC.e(TAG, "Invalid account name: " + account.name);
+                return false;
+            }
             String hostAndPort = account.name.substring(lastAtPos + 1);
             String username = account.name.substring(0, lastAtPos);
             String otherHostAndPort;
             String otherUsername;
             for (Account otherAccount : nextcloudAccounts) {
                 lastAtPos = otherAccount.name.lastIndexOf('@');
+                // NMC-3680 fix
+                if (lastAtPos == -1) {
+                    // Skip invalid account names
+                    continue;
+                }
                 otherHostAndPort = otherAccount.name.substring(lastAtPos + 1);
                 otherUsername = otherAccount.name.substring(0, lastAtPos);
                 if (otherHostAndPort.equals(hostAndPort) &&