Bump to 1.6.1; sort AppOps based on label

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="at.jclehner.appopsxposed"
-    android:versionCode="10"
-    android:versionName="1.6" >
+    android:versionCode="10601"
+    android:versionName="1.6.1" >
 
     <uses-sdk
         android:minSdkVersion="18"

src/at/jclehner/appopsxposed/AppOpsXposed.java

@@ -21,9 +21,12 @@
 import static de.robv.android.xposed.XposedBridge.log;
 import static de.robv.android.xposed.XposedHelpers.findAndHookMethod;
 
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
 import android.content.res.XModuleResources;
 import android.os.Build;
-
 import de.robv.android.xposed.IXposedHookLoadPackage;
 import de.robv.android.xposed.IXposedHookZygoteInit;
 import de.robv.android.xposed.XC_MethodHook;
@@ -91,6 +94,8 @@ public void handleLoadPackage(LoadPackageParam lpparam) throws Throwable
 				log(t);
 			}
 		}
+
+		hookLoaderLoadInBackground(lpparam);
 	}
 
 	private static void hookIsValidFragment(LoadPackageParam lpparam)
@@ -124,4 +129,29 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable
 				throw e;
 		}
 	}
+
+	// We can do this crude comparison since AppOpsEntry.toString() returns the app's
+	// label, which is exactly what we need. No reflection necessary here!
+
+	private static final Comparator<Object> TO_STRING_COMPARATOR = new Comparator<Object>() {
+		@Override
+		public int compare(Object lhs, Object rhs)
+		{
+			return lhs.toString().compareToIgnoreCase(rhs.toString());
+		}
+	};
+
+	private static void hookLoaderLoadInBackground(LoadPackageParam lpparam)
+	{
+		findAndHookMethod("com.android.settings.applications.AppOpsCategory$AppListLoader", lpparam.classLoader,
+				"loadInBackground", new XC_MethodHook() {
+
+					@Override
+					protected void afterHookedMethod(MethodHookParam param) throws Throwable
+					{
+						List<?> entries = (List<?>) param.getResult();
+						Collections.sort(entries, TO_STRING_COMPARATOR);
+					}
+		});
+	}
 }