Application Crash Reports

.gitignore

@@ -23,3 +23,6 @@ signing.properties
 amahi-release-key.keystore
 
 .DS*
+
+# Acra
+acra.properties

.travis.yml

@@ -1,20 +1,20 @@
 language: android
 
 before_install:
+    - yes | sdkmanager "platforms;android-29"
     - yes | sdkmanager "platforms;android-28"
+    - yes | sdkmanager "platforms;android-19"
 
 jdk:
  - oraclejdk8
 
-sudo: required
 android:
   components:
     - tools
     - tools
     - platform-tools
     - build-tools-28.0.3
     - android-28
-    - android-26
     - android-19
     - extra-android-support
     - extra-android-m2repository

README.md

@@ -22,16 +22,24 @@ You will need JDK 1.7+ installed to work with it. Gradle, Android SDK, and proje
 
 This is something to keep **private** and you obtain it by sending a message to `support at Amahi dot org`.
 
+2. Set ACRA information
 
-2. Build the application using a command line or using GUI.
+  ```
+  $ vim acra.properties
+  ```
+  ```
+  mailto.email = myemail@mydomain.com
+  ```
+
+Enter your personal email in place of `myemail@mydomain.com`
+
+3. Build the application using a command line or using GUI.
 
   ```
   $ ./gradlew clean assembleDebug
-
   ```
 
-
-3. Once you have built the application, you will be needing credentials to use the application. Go to Amahi website and create your account, once the account is activated, you will see the description on how to set up the Amahi server. However, this is not strictly needed, as we have a set up of a demo server called "Welcome to Amahi" which you should see even without your own server installed.
+4. Once you have built the application, you will be needing credentials to use the application. Go to Amahi website and create your account, once the account is activated, you will see the description on how to set up the Amahi server. However, this is not strictly needed, as we have a set up of a demo server called "Welcome to Amahi" which you should see even without your own server installed.
 
 ## Code Style Convention
 

acra.properties.sample

@@ -0,0 +1,4 @@
+# Set ACRA mailing information in acra.properties.
+# This is something to keep private and can be created by following steps in README.md
+
+mailto.email = myemail@mydomain.com

build.gradle

@@ -6,8 +6,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
-        classpath 'io.fabric.tools:gradle:1.26.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'io.fabric.tools:gradle:1.28.1'
     }
 }
 
@@ -52,22 +52,32 @@ android {
         targetSdkVersion 28
 
         def apiFile = file("api.properties")
+        def acraFile = file("acra.properties")
         def apiProperties = new Properties()
+        def acraProperties = new Properties()
 
-        // NOTE-cpg: this fake api is here for the tests to pass
+        // NOTE-cpg: this fakeApi and fakeAcra is here for the tests to pass
         def fakeApiFile = file("fakeApi.properties")
+        def fakeAcraFile = file("fakeAcra.properties")
 
         if (apiFile.exists()) {
             apiProperties.load(apiFile.newInputStream())
         } else {
             apiProperties.load(fakeApiFile.newInputStream())
         }
 
+        if (acraFile.exists()) {
+            acraProperties.load(acraFile.newInputStream())
+        } else {
+            acraProperties.load(fakeAcraFile.newInputStream())
+        }
+
         buildConfigField "String", "API_URL_AMAHI", formatStringField(apiProperties["url.amahi"])
         buildConfigField "String", "API_URL_PROXY", formatStringField(apiProperties["url.proxy"])
         buildConfigField "String", "API_CLIENT_ID", formatStringField(apiProperties["client.id"])
         buildConfigField "String", "API_CLIENT_SECRET", formatStringField(apiProperties["client.secret"])
         buildConfigField "String", "CHROMECAST_APP_ID", formatStringField(apiProperties["chromecast.app.id"])
+        buildConfigField "String", "ACRA_EMAIL", formatStringField(acraProperties["mailto.email"])
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -88,8 +98,8 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
     }
 }
 
@@ -171,6 +181,12 @@ dependencies {
     implementation 'android.arch.persistence.room:runtime:' + rootProject.archRoomVersion
     annotationProcessor 'android.arch.persistence.room:compiler:' + rootProject.archRoomVersion
 
+    def acraVersion = '5.6.1'
+    implementation "ch.acra:acra-mail:$acraVersion"
+    implementation "ch.acra:acra-dialog:$acraVersion"
+    implementation "ch.acra:acra-notification:$acraVersion"
+    implementation "ch.acra:acra-toast:$acraVersion"
+
     // Uncomment the dependencies below to enable Chuck Interceptor for logging
 /*
     debugImplementation 'com.readystatesoftware.chuck:library:1.1.0'

fakeAcra.properties

@@ -0,0 +1,5 @@
+# Set ACRA mailing information in acra.properties.
+# This is something to keep private and can be created by following steps in README.md
+# Purpose: This file is required for Tests and Travis checks to pass
+
+mailto.email = myemail@mydomain.com

fakeApi.properties

@@ -1,6 +1,8 @@
 # Set API information in api.properties.
 # This is something to keep private and you obtain it by asking in the Amahi IRC channel or
 # send a message to support at Amahi dot org
+# Purpose: This file is required for Tests and Travis checks to pass
+
 url.amahi=https://amahi.org
 url.proxy=https://amahi.org
 client.id=1234567890

fakeSigning.properties

@@ -1,6 +1,8 @@
 # Set API information in api.properties.
 # This is something to keep private and you obtain it by asking in the Amahi IRC channel or
 # send a message to support at Amahi dot org
+# Purpose: This file is required for Tests and Travis checks to pass
+
 keystore.file=debug.keystore
 keystore.password=android
 key.alias=androiddebugkey

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jun 09 01:34:57 IST 2019
+#Sat Jul 18 05:49:07 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

src/main/AndroidManifest.xml

@@ -33,6 +33,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.READ_LOGS"/>
 
     <permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
 

src/main/java/org/amahi/anywhere/AmahiApplication.java

@@ -27,13 +27,21 @@
 import android.os.Build;
 import android.os.StrictMode;
 import android.preference.PreferenceManager;
+
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatDelegate;
 
 import com.crashlytics.android.Crashlytics;
 
+import org.acra.ACRA;
+import org.acra.ReportField;
+import org.acra.config.CoreConfigurationBuilder;
+import org.acra.config.MailSenderConfigurationBuilder;
+import org.acra.config.ToastConfigurationBuilder;
+import org.acra.data.StringFormat;
 import org.amahi.anywhere.job.NetConnectivityJob;
 import org.amahi.anywhere.job.PhotosContentJob;
+import org.amahi.anywhere.server.Api;
 
 import dagger.ObjectGraph;
 import io.fabric.sdk.android.Fabric;
@@ -43,6 +51,7 @@
  * Application declaration. Basically sets things up at the startup time,
  * such as dependency injection, logging, crash reporting and possible ANR detecting.
  */
+
 public class AmahiApplication extends Application {
     private ObjectGraph injector;
 
@@ -162,7 +171,34 @@ private void createNotificationChannel() {
         NotificationManager notificationManager = getSystemService(NotificationManager.class);
         notificationManager.createNotificationChannel(uploadChannel);
         notificationManager.createNotificationChannel(downloadChannel);
-
     }
 
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        if (isDebugging()) {
+
+            CoreConfigurationBuilder builder = new CoreConfigurationBuilder(this)
+                .setBuildConfigClass(BuildConfig.class)
+                .setReportFormat(StringFormat.JSON)
+                .setAlsoReportToAndroidFramework(true)
+                .setReportContent(ReportField.APP_VERSION_CODE)
+                .setReportContent(ReportField.APP_VERSION_NAME)
+                .setReportContent(ReportField.ANDROID_VERSION)
+                .setReportContent(ReportField.PHONE_MODEL)
+                .setReportContent(ReportField.CUSTOM_DATA)
+                .setReportContent(ReportField.STACK_TRACE)
+                .setReportContent(ReportField.LOGCAT);
+
+            builder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class)
+                .setMailTo(Api.getAcraEmail())
+                .setEnabled(true);
+
+            builder.getPluginConfigurationBuilder(ToastConfigurationBuilder.class)
+                .setResText(R.string.acra_report_toast)
+                .setEnabled(true);
+
+            ACRA.init(this, builder);
+        }
+    }
 }

src/main/java/org/amahi/anywhere/server/Api.java

@@ -43,4 +43,8 @@ public static String getClientId() {
     public static String getClientSecret() {
         return BuildConfig.API_CLIENT_SECRET;
     }
+
+    public static String getAcraEmail() {
+        return BuildConfig.ACRA_EMAIL;
+    }
 }

src/main/res/values/strings.xml

@@ -320,4 +320,6 @@
     <string name="pref_option_go_back">Go back</string>
     <string name="pref_connection_desc">Select the type of connection you want. You can set it as Auto detect, remote or local area network.</string>
 
+    <string name="acra_report_toast" translatable="false">ACRA Log Report Sent!</string>
+
 </resources>