fixed an error with notifications in Android 9

fandreuz · Feb 8, 2019 · 2117fe0 · 2117fe0
1 parent aca95b9
commit 2117fe0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,9 +8,7 @@ android {
         targetSdkVersion 26
         flavorDimensions "default"
 
-        versionName "v6.10"
-
-        manifestPlaceholders = [playstore:"false"]
+        versionName "v6.11"
     }
 
     buildTypes {
@@ -28,10 +26,10 @@ android {
 //        odd is fdroid, otherwise playstore
 //        !!!!!!!!!!!!!
         fdroid {
-            versionCode 198
+            versionCode 200
         }
         playstore {
-            versionCode 195
+            versionCode 197
         }
     }
 

diff --git a/app/src/main/java/ohi/andre/consolelauncher/managers/notifications/KeeperService.java b/app/src/main/java/ohi/andre/consolelauncher/managers/notifications/KeeperService.java
@@ -135,11 +135,12 @@ private int lastNull() {
     @Override
     public boolean onUnbind(Intent intent) {
         lastCommands = null;
-
         return true;
     }
 
     public static Notification buildNotification(Context c, String title, String subtitle, String cmdLabel, String clickCmd, boolean showHome, CharSequence[] lastCommands, boolean upDown, int priority) {
+        if(priority < -2 || priority > 2) priority = NotificationCompat.PRIORITY_DEFAULT;
+
         PendingIntent pendingIntent;
         if(showHome) {
             Intent startMain = new Intent(Intent.ACTION_MAIN);
@@ -172,7 +173,10 @@ public static Notification buildNotification(Context c, String title, String sub
 
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-                NotificationChannel notificationChannel = new NotificationChannel(BuildConfig.APPLICATION_ID, c.getString(R.string.app_name), priority);
+                int oPriority = Tuils.scale(new int[] {0, 4}, new int[] {2,4}, priority + 2);
+                if(oPriority < 2 || oPriority > 4) oPriority = NotificationManager.IMPORTANCE_UNSPECIFIED;
+
+                NotificationChannel notificationChannel = new NotificationChannel(BuildConfig.APPLICATION_ID, c.getString(R.string.app_name), oPriority);
                 ((NotificationManager) c.getSystemService(Context.NOTIFICATION_SERVICE)).createNotificationChannel(notificationChannel);
             }
 

diff --git a/app/src/main/java/ohi/andre/consolelauncher/managers/xml/options/Behavior.java b/app/src/main/java/ohi/andre/consolelauncher/managers/xml/options/Behavior.java
@@ -765,7 +765,7 @@ public String defaultValue() {
 
         @Override
         public String info() {
-            return "The priority of the T-UI notification (-2 maximum priority, 2 minimum)";
+            return "The priority of the T-UI notification (min: -2, max: 2)";
         }
 
         @Override

diff --git a/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java b/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java
@@ -941,6 +941,10 @@ public static List<String> getClassesInPackage(String packageName, Context c) th
         return classes;
     }
 
+    public static int scale(int[] from, int[] to, int n) {
+        return (to[1] - to[0])*(n - from[0])/(from[1] - from[0]) + to[0];
+    }
+
     public static String[] toString(Enum[] enums) {
         String[] arr = new String[enums.length];
         for(int count = 0; count < enums.length; count++) arr[count] = enums[count].name();