Sorted whitelist entries

Refs #1375
M66B · Feb 21, 2014 · 3a9dbfd · 3a9dbfd
1 parent 675c7d3
commit 3a9dbfd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@ Changelog
 
 **Next release**
 
+* Localized whitelist names ([issue](/../../issues/1375))
+* Sorted whitelist entries ([issue](/../../issues/1375))
 * Updated Dutch translation
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)

diff --git a/src/biz/bokhorst/xprivacy/ActivityApp.java b/src/biz/bokhorst/xprivacy/ActivityApp.java
@@ -851,7 +851,7 @@ public void onClick(DialogInterface dialog, int which) {
 
 	private class WhitelistsTask extends AsyncTask<Object, Object, Object> {
 		private WhitelistAdapter mWhitelistAdapter;
-		private Map<String, Map<String, Boolean>> mListWhitelist;
+		private Map<String, TreeMap<String, Boolean>> mListWhitelist;
 
 		@Override
 		protected Object doInBackground(Object... params) {
@@ -929,10 +929,10 @@ public void onClick(DialogInterface dialog, int which) {
 	@SuppressLint("DefaultLocale")
 	private class WhitelistAdapter extends ArrayAdapter<String> {
 		private String mSelectedType;
-		private Map<String, Map<String, Boolean>> mMapWhitelists;
+		private Map<String, TreeMap<String, Boolean>> mMapWhitelists;
 		private LayoutInflater mInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
-		public WhitelistAdapter(Context context, int resource, Map<String, Map<String, Boolean>> mapWhitelists) {
+		public WhitelistAdapter(Context context, int resource, Map<String, TreeMap<String, Boolean>> mapWhitelists) {
 			super(context, resource, new ArrayList<String>());
 			mMapWhitelists = mapWhitelists;
 		}

diff --git a/src/biz/bokhorst/xprivacy/PrivacyManager.java b/src/biz/bokhorst/xprivacy/PrivacyManager.java
@@ -445,8 +445,8 @@ public static void setWhitelisted(int uid, String type, String name, Boolean whi
 		PrivacyManager.setSetting(uid, type + "." + name, value);
 	}
 
-	public static HashMap<String, Map<String, Boolean>> listWhitelisted(int uid) {
-		HashMap<String, Map<String, Boolean>> mapWhitelisted = new HashMap<String, Map<String, Boolean>>();
+	public static Map<String, TreeMap<String, Boolean>> listWhitelisted(int uid) {
+		Map<String, TreeMap<String, Boolean>> mapWhitelisted = new HashMap<String, TreeMap<String, Boolean>>();
 		for (PSetting setting : getSettingList(uid)) {
 			// Grok the setting to see if it fits the bill
 			if (setting.name.startsWith("Whitelist")) {
@@ -458,7 +458,7 @@ public static HashMap<String, Map<String, Boolean>> listWhitelisted(int uid) {
 
 				// If we get here, add it to the list
 				if (!mapWhitelisted.containsKey(type))
-					mapWhitelisted.put(type, new HashMap<String, Boolean>());
+					mapWhitelisted.put(type, new TreeMap<String, Boolean>());
 				mapWhitelisted.get(type).put(name, Boolean.parseBoolean(setting.value));
 			}
 		}