fix notif and toolboar

Author: stonebuzz

app/src/main/AndroidManifest.xml

@@ -75,10 +75,8 @@
         <activity android:exported="true" android:name="org.glpi.inventory.agent.ui.ActivityDetailServer">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
-
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
-
                 <data android:host="glpi-project.github.io" android:pathPrefix="/android-inventory-agent/deeplink"/>
                 <data android:scheme="http"/>
                 <data android:scheme="https"/>

app/src/main/java/org/glpi/inventory/agent/broadcast/InventoryJobScheduler.java

@@ -46,9 +46,12 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.preference.PreferenceManager;
+import android.provider.Settings;
 
 import androidx.core.app.NotificationCompat;
 
@@ -164,25 +167,36 @@ private void showPersistentNotification() {
             manager.createNotificationChannel(chan);
         }
 
+        // intent to redirect to notificaition ettings
+        /*Intent notificationIntent;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            notificationIntent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
+            notificationIntent.putExtra(Settings.EXTRA_APP_PACKAGE, getPackageName());
+            notificationIntent.putExtra(Settings.EXTRA_CHANNEL_ID, NOTIFICATION_CHANNEL_ID);
+            notificationIntent.putExtra("app_package", getPackageName());
+            notificationIntent.putExtra("app_uid", getApplicationInfo().uid);
+            notificationIntent.putExtra("android.provider.extra.APP_PACKAGE", getPackageName());
+        } else {
+            notificationIntent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+            notificationIntent.setData(Uri.parse("package:" + getPackageName()));
+        }
+        PendingIntent notificationPendingIntent = PendingIntent.getActivity(getApplicationContext(), 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);*/
+
+
         Intent appIntent = new Intent(this, ActivityMain.class);
         appIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
         PendingIntent appIntentRedirect = PendingIntent.getActivity(this, 0, appIntent, PendingIntent.FLAG_IMMUTABLE);
 
-        Intent notificationIntent = new Intent();
-        notificationIntent.setAction("android.settings.APP_NOTIFICATION_SETTINGS");
-        notificationIntent.putExtra("app_package", getPackageName());
-        notificationIntent.putExtra("app_uid", getApplicationInfo().uid);
-        PendingIntent notificationIntentRedirect = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);
-
         Notification notification = new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
-                .setOngoing(true)
+                .setOngoing(false)
                 .setSmallIcon(R.drawable.ic_stat)
                 .setContentTitle(getString(R.string.app_is_running))
-                .setContentText(getString(R.string.agent_description)) // Add a short text
+                .setContentText(getString(R.string.agent_description))
                 .setCategory(Notification.CATEGORY_SERVICE)
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
                 .setStyle(new NotificationCompat.BigTextStyle().bigText(getString(R.string.app_is_running_extend)))
                 .setContentIntent(appIntentRedirect)
-                .addAction(R.drawable.ic_about, getString(R.string.disable_notification), notificationIntentRedirect)
+                //.addAction(R.drawable.ic_stat, getString(R.string.disable_notification), notificationPendingIntent)
                 .build();
 
         int notificationId = 1;

app/src/main/java/org/glpi/inventory/agent/ui/ActivityMain.java

@@ -106,18 +106,6 @@ public class ActivityMain extends AppCompatActivity
     private TextView textview_settings, textview_scheduler;
     InventoryJobScheduler alarm = new InventoryJobScheduler();
 
-    private BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String strTime = intent.getStringExtra("time");
-            if (sharedPreferences.getBoolean("autoStartInventory", false)) {
-                toolbar.setSubtitle(strTime);
-            } else {
-                toolbar.setSubtitle("");
-            }
-        }
-    };
-
     private BroadcastReceiver mMessageReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -143,6 +131,12 @@ protected void onStart() {
         } else {
             registerReceiver(appRestrictionChange, restrictionsFilter);
         }
+
+        if (sharedPreferences.getBoolean("autoStartInventory", false)) {
+            toolbar.setSubtitle(sharedPreferences.getString("timeInventory", "Week"));
+        } else {
+            toolbar.setSubtitle("autoStartInventory not set");
+        }
     }