fix navigation crash

LivingWithHippos · Aug 20, 2021 · aee9b21 · aee9b21
1 parent 7b8b8a8
commit aee9b21
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/data/local/ProtoStoreImpl.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/data/local/ProtoStoreImpl.kt
@@ -64,7 +64,11 @@ class ProtoStoreImpl @Inject constructor(
     }
 
     override suspend fun deleteCredentials() {
-        context.credentialsDataStore.updateData { it.toBuilder().clear().build() }
+        context.credentialsDataStore.updateData {
+            // fixme: using logout these lines do not work
+            it.toBuilder().clear().build()
+            // it.defaultInstanceForType
+        }
     }
 
     override suspend fun deleteIncompleteCredentials() {

diff --git a/app/app/src/main/java/com/github/livingwithhippos/unchained/start/view/StartFragment.kt b/app/app/src/main/java/com/github/livingwithhippos/unchained/start/view/StartFragment.kt
@@ -11,6 +11,7 @@ import com.github.livingwithhippos.unchained.data.model.AuthenticationStatus
 import com.github.livingwithhippos.unchained.data.model.UserAction
 import com.github.livingwithhippos.unchained.databinding.FragmentStartBinding
 import dagger.hilt.android.AndroidEntryPoint
+import timber.log.Timber
 
 /**
  * A simple [UnchainedFragment] subclass.
@@ -32,12 +33,24 @@ class StartFragment : UnchainedFragment() {
             {
                 when (it.peekContent()) {
                     is AuthenticationStatus.Authenticated -> {
-                        val action = StartFragmentDirections.actionStartFragmentToUserProfileFragment()
-                        findNavController().navigate(action)
+                        try {
+                            val action =
+                                StartFragmentDirections.actionStartFragmentToUserProfileFragment()
+                            findNavController().navigate(action)
+                        } catch (e: IllegalArgumentException) {
+                            Timber.e("This could have been a crash")
+                            // todo: fix this and remove this bypass
+                        }
                     }
                     is AuthenticationStatus.AuthenticatedNoPremium -> {
-                        val action = StartFragmentDirections.actionStartFragmentToUserProfileFragment()
-                        findNavController().navigate(action)
+                        try {
+                            val action =
+                                StartFragmentDirections.actionStartFragmentToUserProfileFragment()
+                            findNavController().navigate(action)
+                        } catch (e: IllegalArgumentException) {
+                            Timber.e("This could have been a crash")
+                            // todo: fix this and remove this bypass
+                        }
                     }
                     is AuthenticationStatus.RefreshToken -> {
                         activityViewModel.refreshToken()