From 54820d20f4aa509dda5a9e458e9dbed3b44c3c68 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Tue, 7 Jul 2015 10:23:19 +0200
Subject: [PATCH] Added option to show normal priority notification (fixes
 #366).

---
 .../syncthing/SyncthingService.java           | 20 ++++++++++---------
 src/main/res/values/arrays.xml                |  8 ++++++++
 src/main/res/values/strings.xml               | 10 ++++++++--
 src/main/res/xml/app_settings.xml             | 12 ++++++-----
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java b/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
index ffc5dc88..9dee2fa9 100644
--- a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
+++ b/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
@@ -92,7 +92,7 @@ public class SyncthingService extends Service implements
     public static final String PREF_SYNC_ONLY_WIFI           = "sync_only_wifi";
     public static final String PREF_SYNC_ONLY_CHARGING       = "sync_only_charging";
     public static final String PREF_USE_ROOT                 = "use_root";
-    private static final String PREF_PERSISTENT_NOTIFICATION  = "persistent_notification";
+    private static final String PREF_NOTIFICATION_TYPE       = "notification_type";
 
     private static final int NOTIFICATION_ACTIVE = 1;
 
@@ -242,22 +242,24 @@ public class SyncthingService extends Service implements
 
     /**
      * Shows or hides the persistent notification based on running state and
-     * {@link #PREF_PERSISTENT_NOTIFICATION}.
+     * {@link #PREF_NOTIFICATION_TYPE}.
      */
     private void updateNotification() {
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+        String type = sp.getString(PREF_NOTIFICATION_TYPE, "low_priority");
         NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
         if ((mCurrentState == State.ACTIVE || mCurrentState == State.STARTING) &&
-                sp.getBoolean(PREF_PERSISTENT_NOTIFICATION, true)) {
-            Notification n = new NotificationCompat.Builder(this)
+                !type.equals("none")) {
+            NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
                     .setContentTitle(getString(R.string.syncthing_active))
                     .setSmallIcon(R.drawable.ic_stat_notify)
                     .setOngoing(true)
-                    .setPriority(NotificationCompat.PRIORITY_MIN)
                     .setContentIntent(PendingIntent.getActivity(this, 0,
-                            new Intent(this, MainActivity.class), 0))
-                    .build();
-            nm.notify(NOTIFICATION_ACTIVE, n);
+                            new Intent(this, MainActivity.class), 0));
+            if (type.equals("low_priority"))
+                builder.setPriority(NotificationCompat.PRIORITY_MIN);
+
+            nm.notify(NOTIFICATION_ACTIVE, builder.build());
         } else {
             nm.cancel(NOTIFICATION_ACTIVE);
         }
@@ -265,7 +267,7 @@ public class SyncthingService extends Service implements
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (key.equals(PREF_PERSISTENT_NOTIFICATION))
+        if (key.equals(PREF_NOTIFICATION_TYPE))
             updateNotification();
     }
 
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 6f7f043d..1377931f 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources translatable="false">
+
     <string-array name="compress_values">
         <item>never</item>
         <item>metadata</item>
         <item>always</item>
     </string-array>
+
+    <string-array name="notification_type_entry_values">
+        <item>normal</item>
+        <item>low_priority</item>
+        <item>none</item>
+    </string-array>
+
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5f1e618c..96c0d0d5 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -237,9 +237,15 @@ Please report any problems you encounter via Github.</string>
 
     <string name="use_root_summary">Run Syncthing as Superuser</string>
 
-    <string name="persistent_notification_title">Persistent Notification</string>
+    <string name="notification_type_title">Notification</string>
 
-    <string name="persistent_notification_summary">Show Notification while Syncthing is running</string>
+    <string name="notification_type_summary">Choose the notification type</string>
+
+    <string-array name="notification_type_entries">
+        <item>Normal</item>
+        <item>Low Priority</item>
+        <item>None</item>
+    </string-array>
 
     <string name="category_syncthing">Syncthing</string>
 
diff --git a/src/main/res/xml/app_settings.xml b/src/main/res/xml/app_settings.xml
index 3436195c..4711294e 100644
--- a/src/main/res/xml/app_settings.xml
+++ b/src/main/res/xml/app_settings.xml
@@ -32,11 +32,13 @@
             android:defaultValue="false"
             android:enabled="false" />
 
-        <CheckBoxPreference
-            android:key="persistent_notification"
-            android:title="@string/persistent_notification_title"
-            android:summary="@string/persistent_notification_summary"
-            android:defaultValue="true" />
+        <ListPreference
+            android:key="notification_type"
+            android:title="@string/notification_type_title"
+            android:entryValues="@array/notification_type_entry_values"
+            android:entries="@array/notification_type_entries"
+            android:summary="@string/notification_type_summary"
+            android:defaultValue="low_priority" />
 
     </PreferenceCategory>