Merge pull request #76 from ngageoint/BUGFIX/MAGE-988-Random-Login-Issue

MAGE 988- Random Login Issue

Author: RyCarpenter

mage/src/main/java/mil/nga/giat/mage/login/LoginActivity.kt

@@ -18,7 +18,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.work.WorkManager
 import com.google.android.gms.common.ConnectionResult
-import com.google.android.gms.common.GooglePlayServicesUtil
+import com.google.android.gms.common.GoogleApiAvailability
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -98,12 +98,12 @@ class LoginActivity : AppCompatActivity() {
       preferences.edit().putInt(getString(R.string.databaseVersionKey), MageSqliteOpenHelper.DATABASE_VERSION).apply()
 
       // check google play services version
-      val isGooglePlayServicesAvailable = GooglePlayServicesUtil.isGooglePlayServicesAvailable(
+      val isGooglePlayServicesAvailable = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
          applicationContext
       )
       if (isGooglePlayServicesAvailable != ConnectionResult.SUCCESS) {
-         if (GooglePlayServicesUtil.isUserRecoverableError(isGooglePlayServicesAvailable)) {
-            val dialog = GooglePlayServicesUtil.getErrorDialog(isGooglePlayServicesAvailable, this, 1)
+         if (GoogleApiAvailability.getInstance().isUserResolvableError(isGooglePlayServicesAvailable)) {
+            val dialog = GoogleApiAvailability.getInstance().getErrorDialog(this, 1, isGooglePlayServicesAvailable)
             dialog?.setOnCancelListener { dialog1: DialogInterface ->
                dialog1.dismiss()
                finish()
@@ -193,67 +193,74 @@ class LoginActivity : AppCompatActivity() {
 
    private fun observeAuthentication(authentication: Authentication?) {
       if (authentication == null) return
-      val status = authentication.status
-      if (status is AuthenticationStatus.Success) {
-         val token = status.token
-         viewModel.authorize(authentication.strategy, token)
-      } else if (status is AccountCreated) {
-         val message = status.message
-         val dialog = ContactDialog(this, (preferences), "Account Created", message)
-         dialog.setAuthenticationStrategy(authentication.strategy)
-         dialog.show(null)
-      } else if (status is Offline) {
-         val message = status.message
-         val dialog = ContactDialog(this, (preferences), "Sign in Failed", message)
-         dialog.setAuthenticationStrategy(authentication.strategy)
-         dialog.show { workOffline: Boolean ->
-            if (workOffline) {
-               loginComplete(false)
+      when (val status = authentication.status){
+         is AuthenticationStatus.Success -> {
+            val token = status.token
+            viewModel.authorize(authentication.strategy, token)
+         }
+         is AccountCreated -> {
+            val message = status.message
+            val dialog = ContactDialog(this, (preferences), "Account Created", message)
+            dialog.setAuthenticationStrategy(authentication.strategy)
+            dialog.show(null)
+         }
+         is Offline -> {
+            val message = status.message
+            val dialog = ContactDialog(this, (preferences), "Sign in Failed", message)
+            dialog.setAuthenticationStrategy(authentication.strategy)
+            dialog.show { workOffline: Boolean ->
+               if (workOffline) {
+                  loginComplete(false)
+               }
+               viewModel.completeOffline(workOffline)
             }
-            viewModel.completeOffline(workOffline)
          }
-      } else if (status is AuthenticationStatus.Failure) {
-         val message = status.message
-         val dialog = ContactDialog(this, (preferences), "Sign in Failed", message)
-         dialog.setAuthenticationStrategy(authentication.strategy)
-         dialog.show(null)
+         is AuthenticationStatus.Failure -> {
+            val message = status.message
+            val dialog = ContactDialog(this, (preferences), "Sign in Failed", message)
+            dialog.setAuthenticationStrategy(authentication.strategy)
+            dialog.show(null)
+         }
       }
    }
 
    private fun observeAuthorization(authorization: Authorization?) {
       if (authorization == null) return
-      val status = authorization.status
-      if (status is AuthorizationStatus.Success) {
-         loginComplete(status.sessionChanged)
-      } else if (status is FailAuthorization) {
-         val dialog = ContactDialog(
-            this,
-            preferences,
-            "Registration Sent",
-            getString(R.string.device_registered_text)
-         )
-         val user = status.user
-         if (user != null) {
-            dialog.username = user.username
+      when (val status = authorization.status) {
+         is AuthorizationStatus.Success -> {
+            loginComplete(status.sessionChanged)
          }
-         dialog.show(null)
-      } else if (status is FailInvalidServer) {
-         val dialog = ContactDialog(
-            this,
-            preferences,
-            "Application Compatibility Error",
-            "MAGE is not compatible with this server, please ensure your application is up to date or contact your MAGE administrator."
-         )
-         dialog.show(null)
-      }
-      if (status is FailAuthentication) {
-         val message = status.message
-         val dialog = ContactDialog(this, preferences, "Sign-in Failed", message)
-         val user = status.user
-         if (user != null) {
-            dialog.username = user.username
+         is FailAuthorization -> {
+            val dialog = ContactDialog(
+               this,
+               preferences,
+               "Registration Sent",
+               getString(R.string.device_registered_text)
+            )
+            val user = status.user
+            if (user != null) {
+               dialog.username = user.username
+            }
+            dialog.show(null)
+         }
+         is FailInvalidServer -> {
+            val dialog = ContactDialog(
+               this,
+               preferences,
+               "Application Compatibility Error",
+               "MAGE is not compatible with this server, please ensure your application is up to date or contact your MAGE administrator."
+            )
+            dialog.show(null)
+         }
+         is FailAuthentication -> {
+            val message = status.message
+            val dialog = ContactDialog(this, preferences, "Sign-in Failed", message)
+            val user = status.user
+            if (user != null) {
+               dialog.username = user.username
+            }
+            dialog.show(null)
          }
-         dialog.show(null)
       }
    }
 
@@ -277,41 +284,40 @@ class LoginActivity : AppCompatActivity() {
             Log.e(LOG_NAME, "Error parsing authentication strategy", e)
          }
       }
-      if (strategies.size > 1 && strategies.containsKey("local")) {
-         findViewById<View>(R.id.or).visibility = View.VISIBLE
-      } else {
-         findViewById<View>(R.id.or).visibility = View.GONE
+      when {
+         (strategies.size > 1) -> {
+            if (strategies.containsKey("local"))
+               findViewById<View>(R.id.or).visibility = View.VISIBLE
+         }
+         (strategies.size == 1) -> findViewById<View>(R.id.or).visibility = View.GONE
+         else -> {
+            findViewById<View>(R.id.or).visibility = View.GONE
+            findViewById<View>(R.id.login_error).visibility = View.VISIBLE
+         }
       }
       findViewById<View>(R.id.google_login_button).visibility = View.GONE
       for (entry: Map.Entry<String?, JSONObject> in strategies.entries) {
          val authenticationName = entry.key
          val authenticationType = entry.value.optString("type")
          if (supportFragmentManager.findFragmentByTag(authenticationName) != null) continue
-         if (("local" == authenticationName)) {
-            val loginFragment: Fragment = MageLoginFragment.newInstance(
-               entry.key!!, entry.value
-            )
-            transaction.add(R.id.local_auth, loginFragment, authenticationName)
-         } else if (("oauth" == authenticationType)) {
-            val loginFragment: Fragment = IdpLoginFragment.newInstance(
-               (entry.key)!!, entry.value
-            )
-            transaction.add(R.id.third_party_auth, loginFragment, authenticationName)
-         } else if (("saml" == authenticationType)) {
-            val loginFragment: Fragment = IdpLoginFragment.newInstance(
-               (entry.key)!!, entry.value
-            )
-            transaction.add(R.id.third_party_auth, loginFragment, authenticationName)
-         } else if (("ldap" == authenticationType)) {
-            val loginFragment: Fragment = LdapLoginFragment.newInstance(
-               (entry.key)!!, entry.value
-            )
-            transaction.add(R.id.third_party_auth, loginFragment, authenticationName)
-         } else {
-            val loginFragment: Fragment = IdpLoginFragment.newInstance(
-               (entry.key)!!, entry.value
-            )
-            transaction.add(R.id.third_party_auth, loginFragment, authenticationName)
+         when (authenticationType) {
+            "local" -> {
+               val loginFragment: Fragment = MageLoginFragment.newInstance(
+                  entry.key!!, entry.value
+               )
+               transaction.add(R.id.local_auth, loginFragment, authenticationName)
+            }
+            "ldap" -> {
+               val loginFragment: Fragment = LdapLoginFragment.newInstance(
+                  (entry.key)!!, entry.value
+               )
+               transaction.add(R.id.third_party_auth, loginFragment, authenticationName)
+            } else -> { // saml, oauth, and overflow
+               val loginFragment: Fragment = IdpLoginFragment.newInstance(
+                  (entry.key)!!, entry.value
+               )
+               transaction.add(R.id.third_party_auth, loginFragment, authenticationName)
+            }
          }
       }
 

mage/src/main/res/layout/activity_login.xml

@@ -8,6 +8,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:gravity="center"
         android:orientation="vertical">
 
         <LinearLayout
@@ -18,19 +19,13 @@
             android:gravity="center"
             tools:ignore="UseCompoundDrawables">
 
-            <ImageView
-                android:layout_width="56dp"
-                android:layout_height="56dp"
-                android:contentDescription="@string/sign_into_your_account"
-                app:tint="@color/header_color"
-                android:layout_marginBottom="8dp"
-                android:src="@drawable/ic_wand_white_50dp"/>
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:text="@string/sign_in_account"
                 android:textSize="30sp"
-                android:text="@string/sign_into_your_account"/>
+                android:translationY="30sp"
+                app:drawableTopCompat="@drawable/ic_wand_white_50dp"/>
 
         </LinearLayout>
 
@@ -41,6 +36,38 @@
             android:gravity="center"
             android:orientation="horizontal" >
 
+            <ScrollView
+                android:id="@+id/login_error"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/error_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="0dp"
+                        android:layout_weight=".8"
+                        android:drawablePadding="3dp"
+                        android:gravity="center"
+                        android:paddingStart="3dp"
+                        android:paddingEnd="3dp"
+                        android:scaleX="0.8"
+                        android:scaleY="0.8"
+                        android:text="@string/login_error_message"
+                        android:textSize="20sp"
+                        android:visibility="visible"
+                        app:drawableLeftCompat="@drawable/ic_error_outline_white_24dp"
+                        app:drawableTint="@color/md_red_900" />
+
+                </LinearLayout>
+            </ScrollView>
+
             <ScrollView
                 android:id="@+id/login"
                 android:layout_width="match_parent"
@@ -62,7 +89,7 @@
                         android:id="@+id/google_login_button"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/sign_in_with_google"
+                        android:text="@string/sign_in_google"
                         android:background="@drawable/common_google_signin_btn_text_dark"
                         android:textColor="@color/md_white_1000"
                         android:textAlignment="gravity"

mage/src/main/res/layout/activity_signup.xml

@@ -271,7 +271,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="@string/signup" />
+                        android:text="@string/signup_here" />
 
                 </LinearLayout>
 

mage/src/main/res/values/strings.xml

@@ -169,9 +169,6 @@
     <string name="avatar">avatar</string>
     <string name="noContent" />
     <string name="saveButton">save button</string>
-    <string name="sign_into_your_account">Sign into your Account</string>
-    <string name="sign_in_with_google">Sign in with Google</string>
-    <string name="or">or</string>
     <string name="what_type_of_observation_would_you_like_to_create">What type of observation would you like to create?</string>
     <string name="closeButton">Close Button</string>
     <string name="locationIcon">Location Icon</string>
@@ -285,5 +282,11 @@
     <string name="latitude">Latitude</string>
     <string name="longitude">Longitude</string>
     <string name="search_button">Search Button</string>
-
+    <string name="login_error_message">An Error Has Occurred
+        Please Contact Your Server Administrator
+        or Try the Server URL Again</string>
+    <string name="sign_in_account">Sign into your Account</string>
+    <string name="or">or</string>
+    <string name="wand_description">A Magic Wand With Sparkles</string>
+    <string name="sign_in_google">Sign in with Google</string>
 </resources>