diff --git a/app/build.gradle b/app/build.gradle index 198a276..434e880 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,10 +7,10 @@ android { defaultConfig { applicationId "org.deke.risk.riskahead" - minSdkVersion 15 + minSdkVersion 19 targetSdkVersion 26 - versionCode 46 - versionName "3.1.2" + versionCode 48 + versionName "3.1.4" } buildTypes { release { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8ea8a54..9b09ca4 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -25,8 +25,13 @@ -keep class com.android.volley.** { *; } -dontwarn com.android.volley.** -# Hide warnings about references to newer platforms in the library --dontwarn android.support.v7.** -# don't process support library -keep class android.support.v7.** { *; } -keep interface android.support.v7.** { *; } +-dontwarn android.support.v7.** + +# Settings for Crashlytics +-keepattributes *Annotation* +-keepattributes SourceFile,LineNumberTable +-keep public class * extends java.lang.Exception +-keep class com.crashlytics.** { *; } +-dontwarn com.crashlytics.** diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 1f65157..fdb2ddf 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json index f0bcc4e..e15676b 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":46,"versionName":"3.1.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":48,"versionName":"3.1.4","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1960e93..4236dad 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -38,9 +38,6 @@ - diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java b/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java index 2bd69fe..1228468 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java @@ -220,11 +220,11 @@ public class NotificationService extends Service { if (!error) { JSONArray notification = jObj.getJSONArray("msg"); - sentNotification(notification); } else { String errorMsg = jObj.getString("error_msg"); - Crashlytics.log(Log.ERROR, TAG, "Error getting incident notification (server returned error): " + errorMsg); + int loglevel = (errorMsg.contains("No incidents found in given area and from time")) ? Log.INFO : Log.ERROR; + Crashlytics.log(loglevel, TAG, "Error getting incident notification (server returned error): " + errorMsg); } } catch (JSONException e) { Crashlytics.log(Log.ERROR, TAG, "JSONException caught");