Improved Extra detection, refactoring of function names, minor bug fixes

exploitAPKs/qark/app/build.gradle

@@ -1,8 +1,95 @@
 apply plugin: 'com.android.application'
 
+import org.codehaus.groovy.runtime.StackTraceUtils
+
+int[] sdksAvailable() {
+
+    def sdks = new ByteArrayOutputStream()
+    exec {
+        commandLine androidSDKDir()+'tools/android', 'list'
+        standardOutput = sdks
+    }
+    sdks = sdks
+            // get the output
+            .toString()
+            // split to strings
+            .split('\n')
+            // leave only strings with API levels
+            .findAll { it ==~ /\s*API level:.*/ }
+            // extract the API levels
+            .collect { (it =~ /\s*API level:\s*(\d+).*/)[0][1].toInteger() }
+            // sort from highest to lowest
+            .sort( { a, b -> b <=> a } )
+    sdks
+}
+
+int highestSdkAvailable(int defaultSdk) {
+    try {
+        def sdks = sdksAvailable()
+        def highestSdk = sdks[0]
+        if (highestSdk != null) {
+            println "Using highest found SDK " + highestSdk
+            highestSdk
+        } else {
+            println "No installed SDKs found. Using default SDK " + defaultSdk
+            defaultSdk
+        }
+    } catch (any) {
+        println "Exception while determining highest SDK. Using default SDK " +
+                defaultSdk
+        StackTraceUtils.sanitize(any).printStackTrace()
+        defaultSdk
+    }
+}
+
+String androidSDKDir() {
+    def androidExecPath = new ByteArrayOutputStream()
+    exec {
+        commandLine 'pwd'
+        standardOutput = androidExecPath
+    }
+
+    def path = androidExecPath.toString().substring(0, androidExecPath.toString().lastIndexOf('/build/qark/app'))
+    println path + "/settings.properties"
+
+    Properties properties = new Properties()
+    File propertiesFile = new File(path + '/settings.properties')
+    propertiesFile.withInputStream {
+        properties.load(it)
+    }
+    println properties.AndroidSDKPath
+
+    return properties.AndroidSDKPath
+}
+
+String[] buildToolsAvailable() {
+    def buildToolsDir = new File(androidSDKDir(), "build-tools")
+    buildToolsDir.list().sort { a, b -> b <=> a }
+}
+
+String latestBuildToolsAvailable(String defaultBuildTools) {
+    try {
+        def buildToolsVersions = buildToolsAvailable()
+        def latestBuildTools = buildToolsVersions[0]
+        if (latestBuildTools != null) {
+            println "Using latest found build tools " + latestBuildTools
+            latestBuildTools
+        } else {
+            println "No installed build tools found. Using default build tools " +
+                    defaultBuildTools
+            defaultBuildTools
+        }
+    } catch (any) {
+        println "Exception while determining latest build tools. Using default build tools " +
+                defaultBuildTools
+        StackTraceUtils.sanitize(any).printStackTrace()
+        defaultBuildTools
+    }
+}
+
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion highestSdkAvailable(21)
+    buildToolsVersion latestBuildToolsAvailable("21.1.2")
     defaultConfig {
         applicationId 'com.secbro.qark'
         minSdkVersion 7

exploitAPKs/qark/app/src/main/java/com/secbro/qark/intentsniffer/BroadcastIntentSnifferActivity.java

@@ -28,7 +28,7 @@ protected void onCreate(Bundle savedInstanceState) {
         SharedPreferences prefs = this.getSharedPreferences(
                 getPackageName(), Context.MODE_PRIVATE);
         TextView textview = (TextView) findViewById(R.id.activity_broadcast_stealer_text_view);
-        textview.setText(prefs.getString("foo", "default" ));
+        textview.setText(prefs.getString("foo", "Listening..." ));
         Intent msgIntent = new Intent(this, BroadcastStealerService.class);
         msgIntent.setAction("Start");
         startService(msgIntent);

exploitAPKs/qark/app/src/main/java/com/secbro/qark/intentsniffer/BroadcastIntentSnifferFragment.java

@@ -39,7 +39,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
                 getActivity().getPackageName(), Context.MODE_PRIVATE);
         TextView textview = (TextView) retVal.findViewById(R.id.activity_broadcast_stealer_text_view);
 
-        textview.setText(prefs.getString("foo", "default" ));
+        textview.setText(prefs.getString("foo", "Listening..." ));
         Intent msgIntent = new Intent(this.getActivity(), BroadcastStealerService.class);
         msgIntent.setAction("Start");
         this.getActivity().startService(msgIntent);
@@ -53,7 +53,7 @@ public void onResume() {
                 getActivity().getPackageName(), Context.MODE_PRIVATE);
         TextView textview = (TextView) this.getActivity().findViewById(R.id.activity_broadcast_stealer_text_view);
 
-        textview.setText(prefs.getString("foo", "default" ));
+        textview.setText(prefs.getString("foo", "Listening..." ));
         super.onResume();
     }
 

exploitAPKs/qark/app/src/main/java/com/secbro/qark/intentsniffer/services/BroadcastStealerService.java

@@ -47,7 +47,7 @@ public void onReceive(Context context, Intent intent) {
                         Object value = bundle.get(key);
                         SharedPreferences prefs = getSharedPreferences(
                                 getPackageName(), Context.MODE_PRIVATE);
-                        prefs.edit().putString("foo", prefs.getString("foo", "default") + "\n " + "KEY: " + key + "VALUE: " + value.toString()).apply();
+                        prefs.edit().putString("foo", prefs.getString("foo", "Listening...") + "\n " + "KEY: " + key + "VALUE: " + value.toString()).apply();
                     }
                     Log.i("BroadcastStealerService", "intent received");
                 }