From c425fd24ea04afb4bb24ac6450c7cb18403c28eb Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sat, 2 Jan 2016 17:18:05 +0100
Subject: [PATCH] sort blacklist by package name #195

---
 .../activities/AppBlacklistActivity.java            | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java
index c19f23499..630e9c047 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppBlacklistActivity.java
@@ -84,8 +84,17 @@ public class AppBlacklistActivity extends Activity {
                 Collections.sort(packageList, new Comparator<ApplicationInfo>() {
                     @Override
                     public int compare(ApplicationInfo ai1, ApplicationInfo ai2) {
-                        int retval = GBApplication.blacklist.contains(ai1.packageName) ? -1 : 0;
-                        return GBApplication.blacklist.contains(ai2.packageName) ? retval+=1 : retval;
+                        boolean blacklisted1 = GBApplication.blacklist.contains(ai1.packageName);
+                        boolean blacklisted2 = GBApplication.blacklist.contains(ai2.packageName);
+
+                        if ((blacklisted1 && blacklisted2) || (!blacklisted1 && !blacklisted2)) {
+                            // both blacklisted or both not blacklisted = sort by alphabet
+                            return ai1.packageName.compareTo(ai2.packageName);
+                        } else if (blacklisted1) {
+                            return -1;
+                        } else {
+                            return 1;
+                        }
                     }
                 });
                 return view;