Merge pull request #38 from kike-canaries/av/crashlytics

Av/crashlytics
kike-canaries · Dec 27, 2019 · b99a9db · b99a9db
2 parents ee4e6b4 + ead2a80
commit b99a9db
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.livinglifetechway.quickpermissions_plugin'
+apply plugin: 'io.fabric'
+
 
 android {
     compileSdkVersion project.mCompileSdkVersion.toInteger()
@@ -75,6 +77,8 @@ dependencies {
     implementation 'com.google.firebase:firebase-core:17.2.1'
     implementation 'com.google.firebase:firebase-database:19.2.0'
     implementation 'com.firebaseui:firebase-ui-database:4.2.0'
+    implementation 'com.google.firebase:firebase-analytics:17.2.1'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
 
     implementation 'com.github.vic797:prowebview:2.2.1'
 

diff --git a/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsFragment.java b/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsFragment.java
@@ -8,6 +8,8 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
 import androidx.preference.SwitchPreference;
+
+import com.crashlytics.android.Crashlytics;
 import com.google.android.material.snackbar.Snackbar;
 import com.takisoft.preferencex.PreferenceFragmentCompat;
 import android.os.Handler;
@@ -441,6 +443,9 @@ public void configCallBack(SensorConfig config) {
             Logger.i(TAG, "apisrv:" + config.apisrv);
             Logger.i(TAG, "apiuri:" + config.apiuri);
             Logger.i(TAG, "apiprt:" + config.apiprt);
+            Crashlytics.setString(getString(R.string.crashkey_device_name),""+config.dname);
+            Crashlytics.setString(getString(R.string.crashkey_device_wmac),""+config.wmac);
+            Crashlytics.setString(getString(R.string.crashkey_api_usr),""+config.apiusr);
             updatePreferencesSummmary(config);
             updateSwitches(config);
             saveAllPreferences(config);

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -75,4 +75,7 @@
     <string name="msg_device_reboot">CanAirio device rebooting…</string>
     <string name="msg_set_current_location">Set current location into the device?</string>
     <string name="bt_location_save_action">set</string>
+    <string name="crashkey_device_wmac">crashkey_device_wmac</string>
+    <string name="crashkey_device_name">crashkey_device_name</string>
+    <string name="crashkey_api_usr">crashkey_api_usr</string>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -6,11 +6,15 @@ buildscript {
         google()
         jcenter()
         maven { url "https://jitpack.io" }
+        maven { url 'https://maven.fabric.io/public' }
+
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath 'com.github.QuickPermissions:QuickPermissions:0.3.2'
+        classpath 'io.fabric.tools:gradle:1.31.2'
+
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1536m
 mCompileSdkVersion=28
 mMinSdkVersion=19
 mTargetSdkVersion=28
-mVersionCode=319
+mVersionCode=357
 mVersionName=0.2.2
 android.useAndroidX=true
 android.enableJetifier=true