From 69bbc73971764b2fd76a3e91ba232d2e2f1dfd86 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Wed, 11 Mar 2020 14:00:27 +0700
Subject: [PATCH] feat(android): Additional Sentry integration

Revert intentional crash from #2778

Now that the call stack in Sentry is tested on Release build
http://sentry.keyman.com/organizations/keyman/issues/61/?project=7

The temporary menu to generate the intentional crash can be removed.

Also disable monitoring Application Not Responding (ANR)
---
 android/KMAPro/kMAPro/src/main/AndroidManifest.xml       | 3 +++
 .../main/java/com/tavultesoft/kmapro/MainActivity.java   | 8 --------
 .../KMAPro/kMAPro/src/main/res/menu/overflow_menu.xml    | 9 +--------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
index bbaa4d8eb4..65d8d9a0dc 100644
--- a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
+++ b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
@@ -27,6 +27,9 @@
     <!--    how to enable Sentry's debug mode-->
     <meta-data
       android:name="io.sentry.debug" android:value="true" />
+    <!-- Disable monitoring "Application Not Responding" (ANR).  Too many reports at the default 4000 ms -->
+    <meta-data
+      android:name="io.sentry.anr.enable" android:value="false" />
 
     <service
       android:name="com.keyman.android.SystemKeyboard"
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index adda79203f..98f0b3794a 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -480,9 +480,6 @@ public class MainActivity extends AppCompatActivity implements OnKeyboardEventLi
       case R.id.action_settings:
         showSettings();
         return true;
-      case R.id.action_crash:
-        showCrash();
-        return true;
       case R.id.action_update_keyboards:
         KMManager.getUpdateTool().executeOpenUpdates();
         return true;
@@ -919,11 +916,6 @@ public class MainActivity extends AppCompatActivity implements OnKeyboardEventLi
     startActivity(settingsIntent);
   }
 
-  // Temporary menu item to intentionally generate crashes for Sentry
-  private void showCrash() {
-    throw new NullPointerException("MainActivity throwing null");
-  }
-
   public static Drawable getActionBarDrawable(Context context) {
     Point size = new Point();
     WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
diff --git a/android/KMAPro/kMAPro/src/main/res/menu/overflow_menu.xml b/android/KMAPro/kMAPro/src/main/res/menu/overflow_menu.xml
index e94f899fb0..e53eec98ac 100644
--- a/android/KMAPro/kMAPro/src/main/res/menu/overflow_menu.xml
+++ b/android/KMAPro/kMAPro/src/main/res/menu/overflow_menu.xml
@@ -34,17 +34,10 @@
         app:showAsAction="never"
         android:icon="@drawable/ic_settings" />
 
-      <!-- temp item to generate intentional crashes for Sentry -->
-      <item
-        android:id="@+id/action_crash"
-        android:title="Crash"
-        app:showAsAction="never"
-        android:icon="@drawable/ic_action_close" />
-
       <item
         android:id="@+id/action_update_keyboards"
         android:title="@string/action_install_updates"
         app:showAsAction="never"
         android:icon="@drawable/ic_cloud_download"/>
 
-</menu>
\ No newline at end of file
+</menu>