10 files changed, 207 insertions, 27 deletions

diff --git a/app/build.gradle b/app/build.gradle
index f98f370..8590326 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,6 +18,9 @@ android {
         lintOptions {
                 abortOnError false
         }
+        defaultConfig {
+                vectorDrawables.useSupportLibrary = true
+        }
 }
 
 repositories {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bfc3c5e..76a7b24 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,16 +1,26 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
-    package="org.eu.zajc.xheadset">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="org.eu.zajc.xheadset">
 
-    <application android:label="Headset Enforcer">
-        <meta-data
-            android:name="xposedmodule"
-            android:value="true" />
-        <meta-data
-            android:name="xposeddescription"
-            android:value="This Xposed module allows you to manually override the headphone jack detection of an Android device." />
-        <meta-data
-            android:name="xposedminversion"
-            android:value="53" />
-    </application>
+        <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
+        <application android:label="Headset Enforcer">
+
+                <meta-data android:name="xposedmodule"                                  android:value="true" />
+                <meta-data android:name="xposeddescription"                             android:value="An Xposed module that fixes broken headphone detection using software" />
+                <meta-data android:name="xposedminversion"                              android:value="53" />
+                <meta-data android:name="android.service.quicksettings.TOGGLEABLE_TILE" android:value="true" />
+
+                <service android:name=".XHeadsetTile" android:icon="@drawable/headset" android:label="Headset" android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+                        <intent-filter>
+                                <action android:name="android.service.quicksettings.action.QS_TILE" />
+                        </intent-filter>
+                </service>
+
+                <service android:name=".XHeadsetStateService" android:exported="true">
+                        <intent-filter>
+                                <action android:name="org.eu.zajc.xheadset.XHeadsetStateService.BIND" />
+                                <category android:name="android.intent.category.DEFAULT" />
+                        </intent-filter>
+                </service>
+
+        </application>
 </manifest>
diff --git a/app/src/main/aidl/org/eu/zajc/xheadset/IXHeadsetStateService.aidl b/app/src/main/aidl/org/eu/zajc/xheadset/IXHeadsetStateService.aidl
new file mode 100644
index 0000000..ca556bb
--- /dev/null
+++ b/app/src/main/aidl/org/eu/zajc/xheadset/IXHeadsetStateService.aidl
@@ -0,0 +1,5 @@
+package org.eu.zajc.xheadset;
+interface IXHeadsetStateService {
+        boolean isEnabled();
+        boolean setEnabled(boolean enabled);
+} 
diff --git a/app/src/main/assets/xposed_init b/app/src/main/assets/xposed_init
index 18c2324..a00c3e8 100644
--- a/app/src/main/assets/xposed_init
+++ b/app/src/main/assets/xposed_init
@@ -1 +1 @@
-org.eu.zajc.xheadset.XHeadset
+org.eu.zajc.xheadset.XHeadsetModule
diff --git a/app/src/main/java/org/eu/zajc/xheadset/XHeadset.java b/app/src/main/java/org/eu/zajc/xheadset/XHeadsetModule.java
index 19eddc4..4889aa7 100644
--- a/app/src/main/java/org/eu/zajc/xheadset/XHeadset.java
+++ b/app/src/main/java/org/eu/zajc/xheadset/XHeadsetModule.java
@@ -1,25 +1,29 @@
 package org.eu.zajc.xheadset;
 
-import android.graphics.Color;
-import android.widget.TextView;
+import android.util.*;
+import android.app.*;
+import android.widget.*;
 
 import static de.robv.android.xposed.XposedHelpers.findAndHookMethod;
-import de.robv.android.xposed.IXposedHookLoadPackage;
-import de.robv.android.xposed.XC_MethodHook;
+import de.robv.android.xposed.*;
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam;
-import android.util.Log;
 
-public class XHeadset implements IXposedHookLoadPackage extends TileService {
+public class XHeadsetModule implements IXposedHookLoadPackage {
 
         @Override
         public void handleLoadPackage(LoadPackageParam lpparam) throws Throwable {
-                
+                final XHeadsetStateCommunicator comm = new XHeadsetStateCommunicator();
                 if (lpparam.packageName.equals("android")) {
                         findAndHookMethod("com.android.server.WiredAccessoryManager", lpparam.classLoader, "updateLocked", String.class, int.class, new XC_MethodHook() {
                                 @Override
                                 protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                                        Log.e("XHeadsetYHRTG", "params: " + param.args[0] + " " + param.args[1]);
-                                        param.args[1] = (int) (1 << 1);
+                                        comm.bind(AndroidAppHelper.currentApplication());       
+                                        if (comm.isEnabled()) {
+                                                Log.e("XHeadset", "Spoofing headphone state");
+                                                param.args[1] = (int) (1 << 1);
+                                        } else {
+                                                Log.e("XHeadset", "Not spoofing headphone state");
+                                        }
                                 }
                         });
                 } else if (lpparam.packageName.equals("com.android.systemui")) {
@@ -34,8 +38,4 @@ public class XHeadset implements IXposedHookLoadPackage extends TileService {
                 }
         }
 
-        @Override
-        public void onClick() {
-                Log.e("XHeadsetYHRTG", "clicked");
-        }
 }
diff --git a/app/src/main/java/org/eu/zajc/xheadset/XHeadsetStateCommunicator.java b/app/src/main/java/org/eu/zajc/xheadset/XHeadsetStateCommunicator.java
new file mode 100644
index 0000000..b028b8d
--- /dev/null
+++ b/app/src/main/java/org/eu/zajc/xheadset/XHeadsetStateCommunicator.java
@@ -0,0 +1,57 @@
+package org.eu.zajc.xheadset;
+
+import java.io.*;
+import android.os.*;
+import android.util.*;
+import android.content.*;
+import android.app.*;
+
+public class XHeadsetStateCommunicator {
+
+        protected IXHeadsetStateService service = null;
+
+        public void bind(Context context) {
+                if (service == null)
+                        context.bindService(createIntent(), connection, Context.BIND_AUTO_CREATE);
+        }
+
+        public static Intent createIntent() { 
+                return new Intent("org.eu.zajc.xheadset.XHeadsetStateService.BIND").setPackage("org.eu.zajc.xheadset");
+        }
+
+        public void unbind(Context context) {
+                if (service != null)
+                        context.unbindService(connection);
+        }
+
+        public boolean setEnabled(boolean enabled) {
+                try {
+                        return service.setEnabled(enabled);
+                } catch (RemoteException e) {
+                        Log.e("XHeadset", "An exception has occurred", e);
+                        return false;
+                }
+        }
+
+        public boolean isEnabled() {
+                try {
+                        return service.isEnabled();
+                } catch (RemoteException e) {
+                        Log.e("XHeadset", "An exception has occurred", e);
+                        return XHeadsetStateService.DEFAULT_STATE;
+                }
+        }
+
+        private ServiceConnection connection = new ServiceConnection() {
+                @Override
+                public void onServiceConnected(ComponentName name, IBinder service) {
+                        XHeadsetStateCommunicator.this.service = IXHeadsetStateService.Stub.asInterface(service);
+                }
+
+                @Override
+                public void onServiceDisconnected(ComponentName name) {
+                        XHeadsetStateCommunicator.this.service = null;
+                }
+   };
+
+}
diff --git a/app/src/main/java/org/eu/zajc/xheadset/XHeadsetStateService.java b/app/src/main/java/org/eu/zajc/xheadset/XHeadsetStateService.java
new file mode 100644
index 0000000..d4410f8
--- /dev/null
+++ b/app/src/main/java/org/eu/zajc/xheadset/XHeadsetStateService.java
@@ -0,0 +1,45 @@
+package org.eu.zajc.xheadset;
+
+import java.io.*;
+import android.os.*;
+import android.util.*;
+import android.content.*;
+import android.app.*;
+
+public class XHeadsetStateService extends Service {
+
+        public static final boolean DEFAULT_STATE = false;
+        private static final String PREFS_FILE = "xheadset";
+
+        public SharedPreferences getPrefs() {
+                return this.getPrefs(this);
+        }
+
+        public static SharedPreferences getPrefs(Context context) {
+                return context.getSharedPreferences(PREFS_FILE, MODE_PRIVATE);
+        }
+
+        public static boolean isEnabled(SharedPreferences prefs) {
+                return prefs.getBoolean("state", DEFAULT_STATE);
+        }
+
+        public static boolean setEnabled(SharedPreferences prefs, boolean enabled) {
+                return prefs.edit().putBoolean("state", enabled).commit();
+        }
+
+        @Override
+        public IBinder onBind(Intent intent) {
+                return binder;
+        }
+
+        private final IXHeadsetStateService.Stub binder = new  IXHeadsetStateService.Stub() {
+                public boolean isEnabled() {
+                        return XHeadsetStateService.isEnabled(getPrefs());
+                }
+
+                public boolean setEnabled(boolean enabled) {
+                        return XHeadsetStateService.setEnabled(getPrefs(), enabled);
+                }
+        };
+
+}
diff --git a/app/src/main/java/org/eu/zajc/xheadset/XHeadsetTile.java b/app/src/main/java/org/eu/zajc/xheadset/XHeadsetTile.java
new file mode 100644
index 0000000..b6efe4a
--- /dev/null
+++ b/app/src/main/java/org/eu/zajc/xheadset/XHeadsetTile.java
@@ -0,0 +1,31 @@
+package org.eu.zajc.xheadset;
+
+import android.content.*;
+import android.service.quicksettings.*;
+import android.graphics.drawable.*;
+import android.util.*;
+
+public class XHeadsetTile extends TileService {
+
+        @Override
+        public void onStartListening() {
+                setEnabled(XHeadsetStateService.isEnabled(XHeadsetStateService.getPrefs(this)));
+        }
+
+        @Override
+        public void onClick() {
+                SharedPreferences prefs = XHeadsetStateService.getPrefs(this);
+                boolean oldState = XHeadsetStateService.isEnabled(prefs);
+                if (XHeadsetStateService.setEnabled(prefs, !oldState)) {
+                        setEnabled(!oldState);
+                }
+                        
+        }
+
+        public void setEnabled(boolean enabled) {
+                Tile tile = getQsTile();
+                tile.setIcon(Icon.createWithResource(this, enabled ? R.drawable.headset : R.drawable.speaker));
+                tile.setState(enabled ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE);
+                tile.updateTile();
+        }
+}
diff --git a/app/src/main/res/drawable/headset.xml b/app/src/main/res/drawable/headset.xml
new file mode 100644
index 0000000..bfcbe0d
--- /dev/null
+++ b/app/src/main/res/drawable/headset.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillAlpha=".1"
+        android:strokeAlpha=".1"
+        android:strokeWidth="1"
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12 1c-4.97 0-9 4.03-9 9v7c0 1.66 1.34 3 3 3h3v-8H5v-2c0-3.87 3.13-7 7-7s7 3.13 7 7v2h-4v8h3c1.66 0 3-1.34 3-3v-7c0-4.97-4.03-9-9-9z" />
+</vector>
diff --git a/app/src/main/res/drawable/speaker.xml b/app/src/main/res/drawable/speaker.xml
new file mode 100644
index 0000000..4185aef
--- /dev/null
+++ b/app/src/main/res/drawable/speaker.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M17 2H7c-1.1 0-2 0.9-2 2v16c0 1.1 0.9 1.99 2 1.99L17 22c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm-5 2c1.1 0 2 0.9 2 2s-0.9 2-2 2c-1.11 0-2-0.9-2-2s0.89-2 2-2zm0 16c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5zm0-8c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z" />
+</vector>