From a99bf101c39eac02bf8464f1926d13ae21ab10d7 Mon Sep 17 00:00:00 2001
From: pacien
Date: Mon, 6 Aug 2018 13:29:22 +0200
Subject: Display crash notice correctly

---
 app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt   | 3 +--
 app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt  | 1 +
 app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
index 3d59cc0..4dc2381 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -42,7 +42,6 @@ abstract class BaseActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.base)
-    handleRecentCrash()
   }
 
   override fun onCreateOptionsMenu(m: Menu): Boolean {
@@ -86,7 +85,7 @@ abstract class BaseActivity : AppCompatActivity() {
     if (active) super.runOnUiThread(action)
   }
 
-  private fun handleRecentCrash() {
+  fun handleRecentCrash() {
     if (!CrashRecorder.hasPreviouslyCrashed()) return
     CrashRecorder.dismissPreviousCrash()
 
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
index 2faf3a6..1e267d6 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
@@ -166,6 +166,7 @@ class StartActivity : BaseActivity() {
     super.onResume()
     if (TincVpnService.isConnected()) openStatusActivity(false)
     broadcastMapper.register()
+    handleRecentCrash()
   }
 
   override fun onPause() {
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
index a4b36dc..68e008e 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
@@ -101,6 +101,7 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef
     super.onResume()
     broadcastMapper.register()
     updateView()
+    handleRecentCrash()
   }
 
   override fun onPause() {
-- 
cgit v1.2.3