Notfication checkbox functional

TheRolfFR · Dec 4, 2019 · f997a1c · f997a1c
1 parent 6180761
commit f997a1c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/app/src/main/java/com/therolf/optymoNext/controller/activities/Main/TrafficController.java b/app/src/main/java/com/therolf/optymoNext/controller/activities/Main/TrafficController.java
@@ -147,5 +147,13 @@ protected void onPostExecute(String page) {
                 Utility.setListViewHeightBasedOnChildren(tc.listView);
             });
         }
+
+        @Override
+        protected void onCancelled() {
+            super.onCancelled();
+
+            // gone visibility
+            tc.context.runOnUiThread(() -> tc.progressBar.setVisibility(View.GONE));
+        }
     }
 }
diff --git a/...src/main/java/com/therolf/optymoNext/controller/notifications/NotificationController.java b/...src/main/java/com/therolf/optymoNext/controller/notifications/NotificationController.java
@@ -173,7 +173,7 @@ void run(Context context) {
                 .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.mipmap.ic_launcher))
                 .setCustomBigContentView(notificationLayoutExpanded)
                 .setOngoing(true)
-                .setPriority(Notification.PRIORITY_LOW)
+                .setPriority(Notification.PRIORITY_MIN)
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) //to show content in lock screen
                 .setContentTitle(context.getString(R.string.update_never))
                 .setContentIntent(resultPendingIntent)
@@ -264,8 +264,11 @@ void setUpdatedAtTitle(Context context) {
         updateTitle(context.getString(R.string.update_last, dateFormatted));
     }
 
-    void cancelAll() {
+    void cancelAll(Context context) {
+        if(notificationManager == null)
+            notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+
         if(notificationManager != null)
-            notificationManager.cancelAll();
+            notificationManager.cancel(NOTIFICATION_ID);
     }
 }
diff --git a/app/src/main/java/com/therolf/optymoNext/controller/notifications/NotificationService.java b/app/src/main/java/com/therolf/optymoNext/controller/notifications/NotificationService.java
@@ -44,11 +44,15 @@ private void handleAction(String action) {
         OptymoDirection[] fav = ((GlobalApplication) getApplication()).getFavoritesController().getFavorites();
 //        Log.d("optymo", "" + fav.length);
 
+        // if action is cancel we cancel
+        if(action.equals(CANCEL_ACTION)) {
+            notificationController.cancelAll(this);
+            return;
+        }
+
         // reset index if refresh
         if(action.equals(REFRESH_ACTION))
             OnBoot.setIndex(0);
-        else if(action.equals(CANCEL_ACTION))
-            notificationController.cancelAll();
         else { // else its next
             // increase index of 6
             OnBoot.increaseIndex(6);