From d440f6e3d7ad21ac7dfe2e52f02d73a3c10c040e Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 25 Jan 2023 13:22:21 +0100
Subject: [PATCH] fix crashes

---
 Habitica/res/drawable/gradient_white.xml               |  2 +-
 Habitica/res/drawable/no_party_background_gradient.xml |  2 +-
 .../android/habitica/helpers/ExceptionHandler.kt       |  5 ++++-
 .../com/habitrpg/android/habitica/ui/TutorialView.kt   | 10 +++++++---
 .../android/habitica/ui/helpers/ToolbarColorHelper.kt  |  6 +++---
 .../wearos/habitica/ui/activities/BaseActivity.kt      |  8 ++++++--
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/Habitica/res/drawable/gradient_white.xml b/Habitica/res/drawable/gradient_white.xml
index b4e0be097..23d57b8da 100644
--- a/Habitica/res/drawable/gradient_white.xml
+++ b/Habitica/res/drawable/gradient_white.xml
@@ -3,6 +3,6 @@
     <gradient
         android:angle="90"
         android:endColor="@color/content_80_alpha"
-        android:startColor="?attr/colorContentBackground"
+        android:startColor="@color/content_background"
         android:type="linear" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/no_party_background_gradient.xml b/Habitica/res/drawable/no_party_background_gradient.xml
index e8558404b..032d7e76c 100644
--- a/Habitica/res/drawable/no_party_background_gradient.xml
+++ b/Habitica/res/drawable/no_party_background_gradient.xml
@@ -3,7 +3,7 @@
 
     <gradient
         android:angle="90"
-        android:centerColor="@color/transparent_white"
+        android:centerColor="?attr/colorWindowBackground"
         android:endColor="?attr/colorContentBackground"
         android:startColor="?attr/colorContentBackground"
         android:type="linear"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ExceptionHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ExceptionHandler.kt
index 787d14fa2..e0b8bb8d8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ExceptionHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ExceptionHandler.kt
@@ -8,6 +8,7 @@ import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import okhttp3.internal.http2.ConnectionShutdownException
+import okhttp3.internal.http2.StreamResetException
 import retrofit2.HttpException
 import java.io.EOFException
 import java.io.IOException
@@ -42,7 +43,9 @@ class ExceptionHandler {
                     !retrofit2.HttpException::class.java.isAssignableFrom(throwable.javaClass) &&
                     !EOFException::class.java.isAssignableFrom(throwable.javaClass) &&
                     throwable !is ConnectionShutdownException &&
-                        throwable !is CancellationException
+                        throwable !is CancellationException &&
+                        throwable !is StreamResetException &&
+                        throwable !is ConnectionShutdownException
                 ) {
                     instance.analyticsManager?.logException(throwable)
                 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt
index 9898cd125..089babeee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt
@@ -5,8 +5,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import com.habitrpg.android.habitica.databinding.OverlayTutorialBinding
-import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.TutorialStep
+import com.habitrpg.common.habitica.extensions.layoutInflater
 
 class TutorialView(
     context: Context,
@@ -69,12 +69,16 @@ class TutorialView(
 
     private fun completeButtonClicked() {
         onReaction.onTutorialCompleted(step)
-        (parent as? ViewGroup)?.removeView(this)
+        post {
+            (parent as? ViewGroup)?.removeView(this)
+        }
     }
 
     private fun dismissButtonClicked() {
         onReaction.onTutorialDeferred(step)
-        (parent as? ViewGroup)?.removeView(this)
+        post {
+            (parent as? ViewGroup)?.removeView(this)
+        }
     }
 
     private fun backgroundClicked() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt
index 83315f0f0..f1d1758e9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt
@@ -108,9 +108,9 @@ object ToolbarColorHelper {
             if (outViews.isEmpty()) {
                 return@waitForLayout
             }
-            val overflowViewParent = outViews[0].parent as ActionMenuView
-            overflowViewParent.overflowIcon?.setTint(color)
-            overflowViewParent.overflowIcon?.setTintMode(PorterDuff.Mode.SRC_ATOP)
+            val overflowViewParent = outViews[0].parent as? ActionMenuView
+            overflowViewParent?.overflowIcon?.setTint(color)
+            overflowViewParent?.overflowIcon?.setTintMode(PorterDuff.Mode.SRC_ATOP)
         }
     }
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
index 585e6de18..d1a9d1088 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
@@ -77,12 +77,16 @@ abstract class BaseActivity<B: ViewBinding, VM: BaseViewModel> : ComponentActivi
     fun stopAnimatingProgress() {
         if (progressView != null) {
             progressView?.stopAnimation()
-            wrapperBinding.root.removeView(progressView)
+            progressView?.post {
+                wrapperBinding.root.removeView(progressView)
+            }
             progressView = null
         } else {
             wrapperBinding.root.children.forEach {
                 if (it is IndeterminateProgressView) {
-                    wrapperBinding.root.removeView(it)
+                    it.post {
+                        wrapperBinding.root.removeView(it)
+                    }
                 }
             }
         }