Version 1.1.0 (#3)

* Add modes: filter by notification author count

* Add Signal as a known messaging app

* Prevent battery optimization dialog from appearing twice

Author: SilverTuxedo

app/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 26
         targetSdkVersion 30
         versionCode 1
-        versionName "1.0.1"
+        versionName "1.1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/talmar/conveyor/EchoingMode.java

@@ -0,0 +1,7 @@
+package com.talmar.conveyor;
+
+public enum EchoingMode {
+    ALL,  // All notifications are echoed
+    GROUPS_ONLY,  // Only notifications with 2 or more authors are echoed
+    DIRECT_MESSAGES_ONLY  // Only notifications with 1 or less authors are echoed
+}

app/src/main/java/com/talmar/conveyor/SettingsFragment.java

@@ -8,7 +8,9 @@
 import android.provider.Settings;
 import android.util.Pair;
 
+import androidx.annotation.Nullable;
 import androidx.preference.CheckBoxPreference;
+import androidx.preference.DropDownPreference;
 import androidx.preference.MultiSelectListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
@@ -22,6 +24,7 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class SettingsFragment extends PreferenceFragmentCompat {
     private static final String ACTION_NOTIFICATION_LISTENER_SETTINGS = "android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS";
@@ -37,12 +40,22 @@ public class SettingsFragment extends PreferenceFragmentCompat {
             "com.facebook.orca", // Facebook Messenger
             "com.instagram.android", // Instagram
             "com.google.android.apps.messaging", // Messages (by Google)
-            "com.discord")); // Discord
+            "com.discord", // Discord
+            "org.thoughtcrime.securesms")); // Signal
 
     private SwitchPreferenceCompat m_hasNotificationAccessSwitch;
     private MultiSelectListPreference m_selectedAppsPreference;
     private CheckBoxPreference m_clearNotificationsOnUnlockCheckBox;
     private Preference m_openGarminConnectPreference;
+    private DropDownPreference m_modePreference;
+
+    private AlertDialog m_batteryOptimizationDialog;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        m_batteryOptimizationDialog = buildBatteryOptimizationAlertDialog();
+        super.onCreate(savedInstanceState);
+    }
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -52,11 +65,13 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         m_selectedAppsPreference = findPreference("selected_apps");
         m_clearNotificationsOnUnlockCheckBox = findPreference("clear_notifications_on_unlock");
         m_openGarminConnectPreference = findPreference("open_garmin_connect");
+        m_modePreference = findPreference("mode");
 
         assert null != m_hasNotificationAccessSwitch;
         assert null != m_selectedAppsPreference;
         assert null != m_clearNotificationsOnUnlockCheckBox;
         assert null != m_openGarminConnectPreference;
+        assert null != m_modePreference;
 
         populateAppListPreference(m_selectedAppsPreference);
         pruneUninstalledAppsFromPreference(m_selectedAppsPreference);
@@ -88,6 +103,29 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             m_openGarminConnectPreference.setSummary(R.string.garmin_connect_tutorial);
         }
 
+        populateModePreference(m_modePreference);
+        m_modePreference.setSummaryProvider(
+                (Preference.SummaryProvider<DropDownPreference>) preference -> {
+                    EchoingMode mode;
+                    try {
+                        mode = EchoingMode.valueOf(preference.getValue());
+                    } catch (IllegalArgumentException e) {
+                        mode = EchoingMode.ALL;
+                    }
+
+                    int resource = R.string.mode_all_notifications_description;
+                    switch (mode) {
+                        case GROUPS_ONLY:
+                            resource = R.string.mode_groups_only_description;
+                            break;
+                        case DIRECT_MESSAGES_ONLY:
+                            resource = R.string.mode_direct_only_description;
+                            break;
+                    }
+
+                    return getString(resource);
+                });
+
         syncPreferencesToSystemState();
     }
 
@@ -104,7 +142,7 @@ private void syncPreferencesToSystemState() {
         String packageName = requireContext().getPackageName();
         PowerManager powerManager = (PowerManager) requireContext().getSystemService(Context.POWER_SERVICE);
         if (!powerManager.isIgnoringBatteryOptimizations(packageName)) {
-            buildBatteryOptimizationAlertDialog().show();
+            m_batteryOptimizationDialog.show();
         }
     }
 
@@ -189,4 +227,17 @@ private void pruneUninstalledAppsFromPreference(MultiSelectListPreference prefer
         Set<String> filteredValues = preference.getValues().stream().filter(installedApps::contains).collect(Collectors.toSet());
         preference.setValues(filteredValues);
     }
+
+    private void populateModePreference(DropDownPreference preference) {
+        CharSequence[] entries = new CharSequence[3];
+        entries[0] = getString(R.string.mode_all_notifications);
+        entries[1] = getString(R.string.mode_groups_only);
+        entries[2] = getString(R.string.mode_direct_only);
+        preference.setEntryValues(Stream.of(EchoingMode.values()).map(EchoingMode::name).toArray(CharSequence[]::new));
+        preference.setEntries(entries);
+
+        if (preference.getValue() == null) {
+            preference.setValue(EchoingMode.ALL.name());
+        }
+    }
 }

app/src/main/java/com/talmar/conveyor/notificationFilters/ModeFilter.java

@@ -0,0 +1,68 @@
+package com.talmar.conveyor.notificationFilters;
+
+import android.app.Notification;
+import android.content.SharedPreferences;
+import android.service.notification.StatusBarNotification;
+
+import androidx.annotation.NonNull;
+
+import com.talmar.conveyor.EchoingMode;
+import com.talmar.conveyor.components.Conversation;
+
+
+/**
+ * Filters notifications according to the current echoing mode.
+ */
+public class ModeFilter implements INotificationFilter, SharedPreferences.OnSharedPreferenceChangeListener {
+    private static final String MODE_KEY_NAME = "mode";
+
+    private EchoingMode m_echoingMode;
+
+    public ModeFilter(SharedPreferences sharedPreferences) {
+        m_echoingMode = getModeFromPreferences(sharedPreferences);
+        sharedPreferences.registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public boolean shouldIgnoreNotification(@NonNull StatusBarNotification sbn) {
+        if (EchoingMode.ALL == m_echoingMode) {
+            return false;
+        }
+
+        Notification notification = sbn.getNotification();
+        String notificationTemplate = notification.extras.getString(Notification.EXTRA_TEMPLATE);
+        boolean isMessagingStyle = Notification.MessagingStyle.class.getName().equals(notificationTemplate);
+
+        if (!isMessagingStyle) {
+            // This is not a messaging-style notification, meaning that we can't determine if it's
+            // a group or a DM. Ignore it.
+            return true;
+        }
+
+        Conversation conversation = new Conversation(sbn.getNotification());
+        boolean hasMultipleAuthors = conversation.getAuthors().size() > 1;
+
+        boolean isAllowed = (
+                hasMultipleAuthors && m_echoingMode == EchoingMode.GROUPS_ONLY
+                || !hasMultipleAuthors && m_echoingMode == EchoingMode.DIRECT_MESSAGES_ONLY);
+
+        return !isAllowed;
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (!key.equals(MODE_KEY_NAME)) {
+            return;
+        }
+
+        m_echoingMode = getModeFromPreferences(sharedPreferences);
+    }
+
+    private static EchoingMode getModeFromPreferences(SharedPreferences preferences) {
+        try {
+            return EchoingMode.valueOf(preferences.getString(MODE_KEY_NAME, EchoingMode.ALL.name()));
+        } catch (IllegalArgumentException e) {
+            return EchoingMode.ALL;
+        }
+    }
+}

app/src/main/java/com/talmar/conveyor/services/NotificationService.java

@@ -16,6 +16,7 @@
 import com.talmar.conveyor.NotificationEchoing;
 import com.talmar.conveyor.notificationFilters.CategoryFilter;
 import com.talmar.conveyor.notificationFilters.INotificationFilter;
+import com.talmar.conveyor.notificationFilters.ModeFilter;
 import com.talmar.conveyor.notificationFilters.NullContentFilter;
 import com.talmar.conveyor.notificationFilters.OwnNotificationFilter;
 import com.talmar.conveyor.notificationFilters.SelectedAppsFilter;
@@ -50,7 +51,8 @@ public void onCreate() {
                 new CategoryFilter(),
                 new NullContentFilter(),
                 new SelectedAppsFilter(sharedPreferences),
-                new UserPresenceFilter(this, sharedPreferences)
+                new UserPresenceFilter(this, sharedPreferences),
+                new ModeFilter(sharedPreferences)
         };
     }
 

app/src/main/res/drawable/ic_baseline_build_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
+</vector>

app/src/main/res/values/strings.xml

@@ -25,4 +25,11 @@
     <string name="disable_optimization_dialog_message">For this app to work consistently in the background, you must disable battery optimization for it. Please locate this app in the settings and select \"Don\'t optimize\". If your device allows control over app autostart, please enable that as well.</string>
     <string name="disable_optimization_dialog_positive">Open Settings</string>
     <string name="battery_optimization_active_warning">Battery optimization will make this app unreliable.</string>
+    <string name="select_mode_title">Select mode</string>
+    <string name="mode_all_notifications">All notifications</string>
+    <string name="mode_groups_only">Only group messages</string>
+    <string name="mode_direct_only">Only direct messages</string>
+    <string name="mode_all_notifications_description">Echoing all notifications</string>
+    <string name="mode_groups_only_description">Echoing group messages only</string>
+    <string name="mode_direct_only_description">Echoing direct messages only</string>
 </resources>

app/src/main/res/xml/preferences.xml

@@ -16,6 +16,12 @@
         android:icon="@drawable/ic_baseline_apps_24"
         app:title="@string/select_apps_title" />
 
+    <DropDownPreference
+        app:key="mode"
+        android:icon="@drawable/ic_baseline_build_24"
+        app:title="@string/select_mode_title"
+        app:summary="@string/mode_all_notifications_description" />
+
     <CheckBoxPreference
         app:key="clear_notifications_on_unlock"
         android:icon="@drawable/ic_baseline_clear_all_24"