From ff04fa7c0bafb0b4c8caa18c6ac783195978e3b2 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 21 Nov 2014 12:39:37 -0800
Subject: [PATCH] Updates for new Widgets

---
 Superuser/AndroidManifest.xml       |  4 ----
 Superuser/Superuser-Superuser.iml   | 36 +++++++++++++++++++++++------
 Superuser/jni/su/daemon.c           |  6 +++++
 Superuser/jni/su/su.c               | 12 ++++++----
 Superuser/res/layout/log_item.xml   |  4 ++--
 Superuser/res/values-v14/dimens.xml |  2 --
 Superuser/res/values-v16/styles.xml | 15 ------------
 Superuser/res/values/styles.xml     |  4 ++++
 8 files changed, 48 insertions(+), 35 deletions(-)
 delete mode 100644 Superuser/res/values-v14/dimens.xml
 delete mode 100644 Superuser/res/values-v16/styles.xml

diff --git a/Superuser/AndroidManifest.xml b/Superuser/AndroidManifest.xml
index 1adf1000..18dc2027 100644
--- a/Superuser/AndroidManifest.xml
+++ b/Superuser/AndroidManifest.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.koushikdutta.superuser"
     android:versionCode="1030"
     android:versionName="1.0.3.0" >
 
-    <uses-sdk
-            tools:node="replace" />
-
     <permission
         android:name="android.permission.REQUEST_SUPERUSER"
         android:protectionLevel="signature" />
diff --git a/Superuser/Superuser-Superuser.iml b/Superuser/Superuser-Superuser.iml
index 11ad0ec4..2ed1ea53 100644
--- a/Superuser/Superuser-Superuser.iml
+++ b/Superuser/Superuser-Superuser.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="Gradle.Superuser" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -10,9 +10,10 @@
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
       </configuration>
@@ -27,37 +28,58 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.0-rc1" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
     <orderEntry type="module" module-name="Widgets-Widgets" exported="" />
   </component>
 </module>
diff --git a/Superuser/jni/su/daemon.c b/Superuser/jni/su/daemon.c
index 9f75fff8..c75a5ea6 100644
--- a/Superuser/jni/su/daemon.c
+++ b/Superuser/jni/su/daemon.c
@@ -444,6 +444,9 @@ int run_daemon() {
     int previous_umask = umask(027);
     mkdir(REQUESTOR_DAEMON_PATH, 0777);
 
+    memset(sun.sun_path, 0, sizeof(sun.sun_path));
+    memcpy(sun.sun_path, "\0" "SUPERUSER", strlen("SUPERUSER") + 1);
+
     if (bind(fd, (struct sockaddr*)&sun, sizeof(sun)) < 0) {
         PLOGE("daemon bind");
         goto err;
@@ -551,6 +554,9 @@ int connect_daemon(int argc, char *argv[], int ppid) {
     sun.sun_family = AF_LOCAL;
     sprintf(sun.sun_path, "%s/server", REQUESTOR_DAEMON_PATH);
 
+    memset(sun.sun_path, 0, sizeof(sun.sun_path));
+    memcpy(sun.sun_path, "\0" "SUPERUSER", strlen("SUPERUSER") + 1);
+
     if (0 != connect(socketfd, (struct sockaddr*)&sun, sizeof(sun))) {
         PLOGE("connect");
         exit(-1);
diff --git a/Superuser/jni/su/su.c b/Superuser/jni/su/su.c
index ee88065a..e16baff2 100644
--- a/Superuser/jni/su/su.c
+++ b/Superuser/jni/su/su.c
@@ -179,11 +179,13 @@ static int from_init(struct su_initiator *from) {
     /* If this isn't app_process, use the real path instead of argv[0] */
     snprintf(path, sizeof(path), "/proc/%u/exe", from->pid);
     len = readlink(path, exe, sizeof(exe));
-    if (len >= 0) {
-      exe[len] = '\0';
-      if (strcmp(exe, "/system/bin/app_process")) {
-          argv0 = exe;
-      }
+    if (len < 0) {
+        PLOGE("Getting exe path");
+        return -1;
+    }
+    exe[len] = '\0';
+    if (strcmp(exe, "/system/bin/app_process")) {
+        argv0 = exe;
     }
 
     strncpy(from->bin, argv0, sizeof(from->bin));
diff --git a/Superuser/res/layout/log_item.xml b/Superuser/res/layout/log_item.xml
index e2fc9c9f..73022f9d 100644
--- a/Superuser/res/layout/log_item.xml
+++ b/Superuser/res/layout/log_item.xml
@@ -3,8 +3,8 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingLeft="?attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?attr/listPreferredItemPaddingRight"
+    android:paddingLeft="?attr/listPreferredItemPaddingLeft_"
+    android:paddingRight="?attr/listPreferredItemPaddingRight_"
     android:paddingBottom="@dimen/log_item_padding"
     android:paddingTop="@dimen/log_item_padding" >
 
diff --git a/Superuser/res/values-v14/dimens.xml b/Superuser/res/values-v14/dimens.xml
deleted file mode 100644
index e5f8fdc2..00000000
--- a/Superuser/res/values-v14/dimens.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<resources>
-</resources>
\ No newline at end of file
diff --git a/Superuser/res/values-v16/styles.xml b/Superuser/res/values-v16/styles.xml
deleted file mode 100644
index 4005216d..00000000
--- a/Superuser/res/values-v16/styles.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="AndroidTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
-        <item name="android:textViewStyle">@style/RobotoTextViewStyle</item>
-        <item name="android:buttonStyle">@style/RobotoButtonStyle</item>
-    </style>
-
-    <style name="RobotoTextViewStyle" parent="android:Widget.TextView">
-        <item name="android:fontFamily">sans-serif-light</item>
-    </style>
-
-    <style name="RobotoButtonStyle" parent="android:Widget.Holo.Button">
-        <item name="android:fontFamily">sans-serif-light</item>
-    </style>
-</resources>
diff --git a/Superuser/res/values/styles.xml b/Superuser/res/values/styles.xml
index 39ca7f2f..728da58b 100644
--- a/Superuser/res/values/styles.xml
+++ b/Superuser/res/values/styles.xml
@@ -35,6 +35,10 @@
     </style>
 
     <style name="SuperuserLight" parent="@style/AppTheme">
+        <item name="colorPrimary">#4CAF50</item>
+        <item name="colorPrimaryDark">#4CAF50</item>
+        <item name="colorAccent">#F44336</item>
+
         <item name="bottomButtonBar">@color/background_dark</item>
         <item name="bottomButtonBarText">?android:attr/textColorPrimaryInverse</item>