termux · Epictek · Nov 17, 2018 · Nov 17, 2018 · Nov 17, 2018 · Nov 19, 2018
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -50,6 +50,7 @@
         android:supportsRtl="true"
         android:theme="@android:style/Theme.Material.Light"
         tools:ignore="GoogleAppIndexingWarning">
+        <service android:name="com.termux.api.TermuxApiService"/>
         <receiver android:name="com.termux.api.TermuxApiReceiver"/>
         <activity android:name="com.termux.api.DialogActivity" android:theme="@style/DialogTheme" android:noHistory="true" android:excludeFromRecents="true" android:exported="false"/>
         <activity android:name=".FingerprintAPI$FingerprintActivity" android:theme="@android:style/Theme.NoDisplay"

diff --git a/app/src/main/java/com/termux/api/AudioAPI.java b/app/src/main/java/com/termux/api/AudioAPI.java
@@ -12,7 +12,7 @@
 
 public class AudioAPI {
 
-    static void onReceive(TermuxApiReceiver apiReceiver, final Context context, Intent intent) {
+    static void onReceive(final Context context) {
         AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         final String SampleRate = am.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE);
         final String framesPerBuffer = am.getProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER);
@@ -65,7 +65,7 @@ static void onReceive(TermuxApiReceiver apiReceiver, final Context context, Inte
             nosr = AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC);
         }
 
-        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultJsonWriter() {
+        ResultReturner.returnData(context, new ResultReturner.ResultJsonWriter() {
             public void writeJson(JsonWriter out) throws Exception {
                 out.beginObject();
                 out.name("PROPERTY_OUTPUT_SAMPLE_RATE").value(SampleRate);

diff --git a/app/src/main/java/com/termux/api/BatteryStatusAPI.java b/app/src/main/java/com/termux/api/BatteryStatusAPI.java
@@ -12,8 +12,8 @@
 
 public class BatteryStatusAPI {
 
-    public static void onReceive(TermuxApiReceiver apiReceiver, final Context context, Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultJsonWriter() {
+    public static void onReceive(final Context context) {
+        ResultReturner.returnData(context, new ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws Exception {
                 Intent batteryStatus = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));

diff --git a/app/src/main/java/com/termux/api/BrightnessAPI.java b/app/src/main/java/com/termux/api/BrightnessAPI.java
@@ -7,12 +7,14 @@
 
 import com.termux.api.util.ResultReturner;
 
+import org.json.JSONObject;
+
 public class BrightnessAPI {
 
-    public static void onReceive(final TermuxApiReceiver receiver, final Context context, final Intent intent) {
+    public static void onReceive(final Context context, JSONObject opts) {
         final ContentResolver contentResolver = context.getContentResolver();
 
-        int brightness = intent.getIntExtra("brightness", 0);
+        int brightness = opts.optInt("brightness", 0);
 
         if (brightness <= 0) {
             brightness = 0;
@@ -21,6 +23,6 @@ public static void onReceive(final TermuxApiReceiver receiver, final Context con
         }
 
         Settings.System.putInt(contentResolver, Settings.System.SCREEN_BRIGHTNESS, brightness);
-        ResultReturner.noteDone(receiver, intent);
+        ResultReturner.noteDone(context);
     }
-}
+}
diff --git a/app/src/main/java/com/termux/api/CallLogAPI.java b/app/src/main/java/com/termux/api/CallLogAPI.java
@@ -9,6 +9,8 @@
 
 import com.termux.api.util.ResultReturner;
 
+import org.json.JSONObject;
+
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -20,11 +22,11 @@
  */
 public class CallLogAPI {
 
-    static void onReceive(final Context context, final Intent intent) {
-        final int offset = intent.getIntExtra("offset", 0);
-        final int limit = intent.getIntExtra("limit", 50);
+    static void onReceive(final Context context, final JSONObject opts) {
+        final int offset = opts.optInt("offset");
+        final int limit = opts.optInt("limit", 50);
 
-        ResultReturner.returnData(context, intent, new ResultReturner.ResultJsonWriter() {
+        ResultReturner.returnData(context, new ResultReturner.ResultJsonWriter() {
             public void writeJson(JsonWriter out) throws Exception {
                 getCallLogs(context, out, offset, limit);
             }

diff --git a/app/src/main/java/com/termux/api/CameraInfoAPI.java b/app/src/main/java/com/termux/api/CameraInfoAPI.java
@@ -1,7 +1,6 @@
 package com.termux.api;
 
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.ImageFormat;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraManager;
@@ -16,8 +15,8 @@
 
 public class CameraInfoAPI {
 
-    static void onReceive(TermuxApiReceiver apiReceiver, final Context context, Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultJsonWriter() {
+    static void onReceive(final Context context) {
+        ResultReturner.returnData(context, new ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws Exception {
                 final CameraManager manager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);

diff --git a/app/src/main/java/com/termux/api/ClipboardAPI.java b/app/src/main/java/com/termux/api/ClipboardAPI.java
@@ -10,19 +10,21 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.ResultReturner.ResultWriter;
 
+import org.json.JSONObject;
+
 import java.io.PrintWriter;
 
 public class ClipboardAPI {
 
-    static void onReceive(TermuxApiReceiver apiReceiver, final Context context, Intent intent) {
+    static void onReceive(final Context context, final JSONObject opts) {
         final ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
         final ClipData clipData = clipboard.getPrimaryClip();
 
-        boolean version2 = "2".equals(intent.getStringExtra("api_version"));
+        boolean version2 = "2".equals(opts.optString("api_version"));
         if (version2) {
-            boolean set = intent.getBooleanExtra("set", false);
+            boolean set = opts.optBoolean("set", false);
             if (set) {
-                ResultReturner.returnData(apiReceiver, intent, new ResultReturner.WithStringInput() {
+                ResultReturner.returnData(context, new ResultReturner.WithStringInput() {
                     @Override
                     protected boolean trimInput() {
                         return false;
@@ -34,7 +36,7 @@ public void writeResult(PrintWriter out) {
                     }
                 });
             } else {
-                ResultReturner.returnData(apiReceiver, intent, new ResultWriter() {
+                ResultReturner.returnData(context, new ResultWriter() {
                     @Override
                     public void writeResult(PrintWriter out) {
                         if (clipData == null) {
@@ -53,13 +55,13 @@ public void writeResult(PrintWriter out) {
                 });
             }
         } else {
-            final String newClipText = intent.getStringExtra("text");
+            final String newClipText = opts.optString("text");
             if (newClipText != null) {
                 // Set clip.
                 clipboard.setPrimaryClip(ClipData.newPlainText("", newClipText));
             }
 
-            ResultReturner.returnData(apiReceiver, intent, new ResultWriter() {
+            ResultReturner.returnData(context, new ResultWriter() {
                 @Override
                 public void writeResult(PrintWriter out) {
                     if (newClipText == null) {

diff --git a/app/src/main/java/com/termux/api/ContactListAPI.java b/app/src/main/java/com/termux/api/ContactListAPI.java
@@ -15,8 +15,8 @@
 
 public class ContactListAPI {
 
-    static void onReceive(TermuxApiReceiver apiReceiver, final Context context, Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultJsonWriter() {
+    static void onReceive(final Context context) {
+        ResultReturner.returnData(context, new ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws Exception {
                 listContacts(context, out);