From 70b60bb852bde41be9941f81adf2e3f7239df2d3 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 5 Mar 2020 16:55:23 +0700
Subject: [PATCH] feat(android): more cleanup and update FV app

---
 android/KMAPro/build.gradle                       |  2 +-
 .../KMAPro/kMAPro/src/main/AndroidManifest.xml    |  1 -
 oem/firstvoices/android/app/build.gradle          | 15 ++++++++++++---
 oem/firstvoices/android/app/lint.xml              |  6 ++++++
 .../android/app/src/main/AndroidManifest.xml      |  8 ++++----
 oem/firstvoices/android/build.gradle              |  6 ++----
 6 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 oem/firstvoices/android/app/lint.xml

diff --git a/android/KMAPro/build.gradle b/android/KMAPro/build.gradle
index 9254cc5b2c..051f23297c 100644
--- a/android/KMAPro/build.gradle
+++ b/android/KMAPro/build.gradle
@@ -1,9 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
+        google()
         jcenter()
         mavenCentral()
-        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.2'
diff --git a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
index 456a1f88f4..bbaa4d8eb4 100644
--- a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
+++ b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
   package="com.tavultesoft.kmapro">
 
   <uses-permission android:name="android.permission.INTERNET" />
diff --git a/oem/firstvoices/android/app/build.gradle b/oem/firstvoices/android/app/build.gradle
index 1dc72342ce..8c1683e419 100644
--- a/oem/firstvoices/android/app/build.gradle
+++ b/oem/firstvoices/android/app/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.application'
+    id 'io.sentry.android.gradle'
     id 'com.github.triplet.play' version '2.5.0' apply false
 }
 
@@ -69,9 +70,19 @@ android {
 
     lintOptions {
         disable 'MissingTranslation'
+        lintConfig file("lint.xml")
     }
 }
 
+// how to configure the sentry android gradle plugin
+sentry {
+    // Disables or enables the automatic configuration of Native symbols
+    uploadNativeSymbols true
+
+    // Does or doesn't include the source code of native code for Sentry
+    includeNativeSources true
+}
+
 String env_keys_json_file = System.getenv("oem_firstvoices_keys_json_file")
 if (env_keys_json_file != null) {
     apply plugin: 'com.github.triplet.play'
@@ -102,9 +113,6 @@ repositories {
         dirs 'libs'
     }
     google()
-    maven {
-        url 'https://maven.fabric.io/public'
-    }
 }
 
 dependencies {
@@ -112,6 +120,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0-alpha02'
     implementation 'com.google.android.material:material:1.0.0'
     api(name: 'keyman-engine', ext: 'aar')
+    implementation 'io.sentry:sentry-android:2.0.1'
     implementation 'androidx.preference:preference:1.1.0'
     implementation 'io.sentry:sentry-android:2.0.1'
 }
diff --git a/oem/firstvoices/android/app/lint.xml b/oem/firstvoices/android/app/lint.xml
new file mode 100644
index 0000000000..e7e77bada5
--- /dev/null
+++ b/oem/firstvoices/android/app/lint.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lint>
+  <issue id="InvalidPackage">
+    <ignore path="**/sentry*.jar"/>
+  </issue>
+</lint>
\ No newline at end of file
diff --git a/oem/firstvoices/android/app/src/main/AndroidManifest.xml b/oem/firstvoices/android/app/src/main/AndroidManifest.xml
index 64f13e22e2..e564ff4d48 100644
--- a/oem/firstvoices/android/app/src/main/AndroidManifest.xml
+++ b/oem/firstvoices/android/app/src/main/AndroidManifest.xml
@@ -11,8 +11,12 @@
         android:theme="@style/AppTheme"
         android:fullBackupContent="@xml/backup_descriptor">
 
+        <!--    see the events from this app in sentry.keyman.com  dashboard -->
         <meta-data
             android:name="io.sentry.dsn" android:value="https://a00ed3e10a2045acb3d93416be90d89a@sentry.keyman.com/7"/>
+        <!--    how to enable Sentry's debug mode -->
+        <meta-data
+           android:name="io.sentry.debug" android:value="true" />
 
         <service
             android:name="com.firstvoices.keyboards.SystemKeyboard"
@@ -52,9 +56,5 @@
             android:launchMode="singleTask"
             android:theme="@android:style/Theme.Holo.Light.Dialog" >
         </activity>
-        <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="4efced22a226f98e05442a7e472b377d89fcc294"
-            />
     </application>
 </manifest>
diff --git a/oem/firstvoices/android/build.gradle b/oem/firstvoices/android/build.gradle
index 9e19aa8ebf..5afb7bb5aa 100644
--- a/oem/firstvoices/android/build.gradle
+++ b/oem/firstvoices/android/build.gradle
@@ -4,14 +4,12 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven {
-            url 'https://maven.fabric.io/public'
-        }
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.2'
         classpath 'com.google.gms:google-services:4.3.2'
-        classpath 'io.sentry:sentry-android:2.0.1'
+        classpath 'io.sentry:sentry-android-gradle-plugin:1.7.31'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files