From 1416aeba05bca6927c1373734bfb9d22592b24d9 Mon Sep 17 00:00:00 2001
From: Kieran Coldron <kieran@coldron.com>
Date: Sat, 17 Nov 2018 16:15:08 +0000
Subject: [PATCH 1/5] change majority of app to use sockets with json instead
 of intents

---
 .idea/gradle.xml                              |   4 +-
 app/src/main/AndroidManifest.xml              |   2 +
 .../main/java/com/termux/api/AudioAPI.java    |   4 +-
 .../java/com/termux/api/BatteryStatusAPI.java |   4 +-
 .../java/com/termux/api/BrightnessAPI.java    |  10 +-
 .../main/java/com/termux/api/CallLogAPI.java  |  10 +-
 .../java/com/termux/api/CameraInfoAPI.java    |   5 +-
 .../java/com/termux/api/ClipboardAPI.java     |  16 +-
 .../java/com/termux/api/ContactListAPI.java   |   4 +-
 .../java/com/termux/api/DialogActivity.java   |  84 ++---
 .../main/java/com/termux/api/DownloadAPI.java |  12 +-
 .../java/com/termux/api/FingerprintAPI.java   |  20 +-
 .../main/java/com/termux/api/InfraredAPI.java |  21 +-
 .../main/java/com/termux/api/KeystoreAPI.java |  79 +++--
 .../main/java/com/termux/api/LocationAPI.java |  10 +-
 .../java/com/termux/api/MediaPlayerAPI.java   |  12 +-
 .../java/com/termux/api/MediaScannerAPI.java  |  15 +-
 .../java/com/termux/api/MicRecorderAPI.java   |   8 +-
 .../java/com/termux/api/NotificationAPI.java  |  62 ++--
 .../com/termux/api/NotificationListAPI.java   |   4 +-
 .../main/java/com/termux/api/PhotoAPI.java    |  10 +-
 .../main/java/com/termux/api/SensorAPI.java   |   8 +-
 .../main/java/com/termux/api/ShareAPI.java    |  18 +-
 .../main/java/com/termux/api/SmsInboxAPI.java |  12 +-
 .../main/java/com/termux/api/SmsSendAPI.java  |  16 +-
 .../java/com/termux/api/SpeechToTextAPI.java  |   8 +-
 .../java/com/termux/api/StorageGetAPI.java    |   8 +-
 .../java/com/termux/api/TelephonyAPI.java     |  18 +-
 .../com/termux/api/TermuxApiReceiver.java     | 183 +----------
 .../java/com/termux/api/TermuxApiService.java | 294 ++++++++++++++++++
 .../java/com/termux/api/TextToSpeechAPI.java  |   8 +-
 .../main/java/com/termux/api/ToastAPI.java    |  25 +-
 .../main/java/com/termux/api/TorchAPI.java    |   8 +-
 .../main/java/com/termux/api/VibrateAPI.java  |  10 +-
 .../main/java/com/termux/api/VolumeAPI.java   |  32 +-
 .../java/com/termux/api/WallpaperAPI.java     |  14 +-
 app/src/main/java/com/termux/api/WifiAPI.java |  16 +-
 .../com/termux/api/util/ResultReturner.java   |  27 +-
 .../api/util/TermuxApiPermissionActivity.java |   6 +-
 build.gradle                                  |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   3 +-
 41 files changed, 659 insertions(+), 453 deletions(-)
 create mode 100644 app/src/main/java/com/termux/api/TermuxApiService.java

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cde9d869b..f43d42846 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,7 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="disableWrapperSourceDistributionNotification" value="true" />
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 497e51d47..dd1a50ac1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,7 @@
     <permission android:name="com.termux.sharedfiles.READ" android:protectionLevel="signature" />
 
     <application
+        android:largeHeap="true"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
@@ -50,6 +51,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
index ebb4c2dee..54a05ee31 100644
--- 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
index bcc2fc27f..ba7ebf433 100644
--- 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
index 3780e900d..7ff9b03dd 100644
--- 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);
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/termux/api/CallLogAPI.java b/app/src/main/java/com/termux/api/CallLogAPI.java
index 10f7d00b8..6fb5eb2d0 100644
--- 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
index 93088c0ae..c961d433c 100644
--- 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
index 7f3399894..c3f06f807 100644
--- 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
index 12df9393c..482c8dd38 100644
--- 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);
diff --git a/app/src/main/java/com/termux/api/DialogActivity.java b/app/src/main/java/com/termux/api/DialogActivity.java
index f43223f10..9f43a1b03 100644
--- a/app/src/main/java/com/termux/api/DialogActivity.java
+++ b/app/src/main/java/com/termux/api/DialogActivity.java
@@ -42,8 +42,13 @@
 import android.widget.Toast;
 
 import com.termux.api.util.ResultReturner;
+import com.termux.api.util.TermuxApiLogger;
 import com.termux.api.util.TermuxApiPermissionActivity;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -57,6 +62,7 @@
 public class DialogActivity extends AppCompatActivity {
 
     private boolean resultReturned = false;
+    public static JSONObject opts = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -64,8 +70,13 @@ protected void onCreate(Bundle savedInstanceState) {
         final Intent intent = getIntent();
         final Context context = this;
 
+        try {
+            opts = new JSONObject(intent.getStringExtra("data"));
+        } catch (JSONException e) {
+            TermuxApiLogger.error("Not valid JSON in intent extra.");
+        }
 
-        String methodType = intent.hasExtra("input_method") ? intent.getStringExtra("input_method") : "";
+        String methodType = opts.optString("input_method", "");
 
         InputMethod method = InputMethodFactory.get(methodType, this);
         method.create(this, new InputResultListener() {
@@ -93,20 +104,13 @@ protected void onDestroy() {
     }
 
     /**
-     * Extract value extras from intent into String array
+     * Extract values from jsonArray into String array
      */
-    static String[] getInputValues(Intent intent) {
-        String[] items = new String[] { };
-
-        if (intent != null && intent.hasExtra("input_values")) {
-            String[] temp = intent.getStringExtra("input_values").split(",");
-            items = new String[temp.length];
 
-            // remove possible whitespace from strings in temp array
-            for (int j = 0; j < temp.length; ++j) {
-                String s = temp[j];
-                items[j] = s.trim();
-            }
+    static String[] getInputValues(JSONArray jsonArray) {
+        String[] items = new String[jsonArray.length()];
+        for(int i = 0; i < jsonArray.length(); i++){
+            items[i] = jsonArray.optString(i).trim();
         }
         return items;
     }
@@ -115,7 +119,7 @@ static String[] getInputValues(Intent intent) {
      * Writes the InputResult to the console
      */
     protected void postResult(final Context context, final InputResult result) {
-        ResultReturner.returnData(context, getIntent(), new ResultReturner.ResultJsonWriter() {
+        ResultReturner.returnData(context, new ResultReturner.ResultJsonWriter() {
 
             @Override
             public void writeJson(JsonWriter out) throws Exception {
@@ -250,7 +254,7 @@ LinearLayout createWidgetView(AppCompatActivity activity) {
             layoutParams.topMargin = 32;
             layoutParams.bottomMargin = 32;
 
-            String[] values = getInputValues(activity.getIntent());
+            String[] values = getInputValues(opts.optJSONArray("input_values"));
 
             for (int j = 0; j < values.length; ++j) {
                 String value = values[j];
@@ -311,9 +315,8 @@ InputResult onDialogClick(int button) {
         @Override
         TextView createWidgetView(AppCompatActivity activity) {
             TextView textView = new TextView(activity);
-            final Intent intent = activity.getIntent();
 
-            String text = intent.hasExtra("input_hint") ? intent.getStringExtra("input_hint") : "Confirm";
+            String text = opts.optString("input_hint", "Confirm");
             textView.setText(text);
             return textView;
         }
@@ -375,10 +378,14 @@ public void onClick(View view) {
         }
 
         void updateCounterRange() {
-            final Intent intent = activity.getIntent();
+            if (!opts.isNull("input_range")) {
+                JSONArray valuesJson = opts.optJSONArray("input_range");
+
+                int[] values = new int[valuesJson.length()];
+                for(int i = 0; i < valuesJson.length(); i++){
+                    values[i] = valuesJson.optInt(i);
+                }
 
-            if (intent.hasExtra("input_range")) {
-                int[] values = intent.getIntArrayExtra("input_range");
                 if (values.length != RANGE_LENGTH) {
                     inputResult.error = "Invalid range! Must be 3 int values!";
                     postCanceledResult();
@@ -442,9 +449,8 @@ String getResult() {
             Calendar calendar = Calendar.getInstance();
             calendar.set(year, month, day, 0, 0, 0);
 
-            final Intent intent = activity.getIntent();
-            if (intent.hasExtra("date_format")) {
-                String date_format = intent.getStringExtra("date_format");
+            if (!opts.isNull("date_format")) {
+                String date_format = opts.optString("date_format");
                 try {
                     SimpleDateFormat dateFormat = new SimpleDateFormat(date_format);
                     dateFormat.setTimeZone(calendar.getTimeZone());
@@ -481,16 +487,15 @@ String getResult() {
 
         @Override
         EditText createWidgetView(AppCompatActivity activity) {
-            final Intent intent = activity.getIntent();
             EditText editText = new EditText(activity);
 
-            if (intent.hasExtra("input_hint")) {
-                editText.setHint(intent.getStringExtra("input_hint"));
+            if (!opts.isNull("input_hint")) {
+                editText.setHint(opts.optString("input_hint"));
             }
 
-            boolean multiLine = intent.getBooleanExtra("multiple_lines", false);
-            boolean numeric = intent.getBooleanExtra("numeric", false);
-            boolean password = intent.getBooleanExtra("password", false);
+            boolean multiLine = opts.optBoolean("multiple_lines", false);
+            boolean numeric = opts.optBoolean("numeric", false);
+            boolean password = opts.optBoolean("password", false);
 
             int flags = InputType.TYPE_CLASS_TEXT;
 
@@ -564,7 +569,7 @@ RadioGroup createWidgetView(AppCompatActivity activity) {
             layoutParams.topMargin = 32;
             layoutParams.bottomMargin = 32;
 
-            String[] values = getInputValues(activity.getIntent());
+            String[] values = getInputValues(opts.optJSONArray("input_values"));
 
             for (int j = 0; j < values.length; ++j) {
                 String value = values[j];
@@ -640,12 +645,12 @@ public void setupDialog(final Dialog dialog, int style) {
             layout.setOrientation(LinearLayout.VERTICAL);
 
             NestedScrollView scrollView = new NestedScrollView(getContext());
-            final String[] values = getInputValues(Objects.requireNonNull(getActivity()).getIntent());
+            final JSONArray values =  opts.optJSONArray("input_values");
 
-            for (int i = 0; i < values.length; ++i) {
+            for (int i = 0; i < values.length(); ++i) {
                 final int j = i;
                 final TextView textView = new TextView(getContext());
-                textView.setText(values[j]);
+                textView.setText(values.optString(j));
                 textView.setTextSize(20);
                 textView.setPadding(56, 56, 56, 56);
                 textView.setOnClickListener(new View.OnClickListener() {
@@ -653,7 +658,7 @@ public void setupDialog(final Dialog dialog, int style) {
                     @Override
                     public void onClick(View view) {
                         InputResult result = new InputResult();
-                        result.text = values[j];
+                        result.text = values.optString(j);
                         result.index = j;
                         dialog.dismiss();
                         resultListener.onResult(result);
@@ -732,8 +737,7 @@ String getResult() {
         Spinner createWidgetView(AppCompatActivity activity) {
             Spinner spinner = new Spinner(activity);
 
-            final Intent intent = activity.getIntent();
-            final String[] items = getInputValues(intent);
+            final String[] items = getInputValues(opts.optJSONArray("input_values"));
             final ArrayAdapter<String> adapter = new ArrayAdapter<>(activity, R.layout.spinner_item, items);
 
             spinner.setAdapter(adapter);
@@ -755,9 +759,8 @@ static class SpeechInputMethod extends InputDialog<TextView> {
         @Override
         TextView createWidgetView(AppCompatActivity activity) {
             TextView textView = new TextView(activity);
-            final Intent intent = activity.getIntent();
 
-            String text = intent.hasExtra("input_hint") ? intent.getStringExtra("input_hint") : "Listening for speech...";
+            String text = !opts.isNull("input_hint") ? opts.optString("input_hint") : "Listening for speech...";
 
             textView.setText(text);
             textView.setTextSize(20);
@@ -767,7 +770,7 @@ TextView createWidgetView(AppCompatActivity activity) {
         @Override
         public void create(final AppCompatActivity activity, final InputResultListener resultListener) {
             // Since we're using the microphone, we need to make sure we have proper permission
-            if (!TermuxApiPermissionActivity.checkAndRequestPermissions(activity, activity.getIntent(), Manifest.permission.RECORD_AUDIO)) {
+            if (!TermuxApiPermissionActivity.checkAndRequestPermissions(activity, Manifest.permission.RECORD_AUDIO)) {
                 activity.finish();
             }
 
@@ -991,11 +994,10 @@ public void onDismiss(DialogInterface dialogInterface) {
          * Creates a dialog builder to initialize a dialog w/ a view and button click listeners
          */
         AlertDialog.Builder getDialogBuilder(AppCompatActivity activity, DialogInterface.OnClickListener clickListener) {
-            final Intent intent = activity.getIntent();
             final View layoutView = getLayoutView(activity, widgetView);
 
             return new AlertDialog.Builder(activity)
-                    .setTitle(intent.hasExtra("input_title") ? intent.getStringExtra("input_title") : "")
+                    .setTitle(opts.optString("input_title", ""))
                     .setNegativeButton(getNegativeButtonText(), clickListener)
                     .setPositiveButton(getPositiveButtonText(), clickListener)
                     .setOnDismissListener(getDismissListener())
diff --git a/app/src/main/java/com/termux/api/DownloadAPI.java b/app/src/main/java/com/termux/api/DownloadAPI.java
index 6485d132a..cca2bc591 100644
--- a/app/src/main/java/com/termux/api/DownloadAPI.java
+++ b/app/src/main/java/com/termux/api/DownloadAPI.java
@@ -9,22 +9,24 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.ResultReturner.ResultWriter;
 
+import org.json.JSONObject;
+
 import java.io.PrintWriter;
 
 public class DownloadAPI {
 
-    static void onReceive(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultWriter() {
+    static void onReceive(final Context context, final JSONObject opts) {
+        ResultReturner.returnData(context, new ResultWriter() {
             @Override
             public void writeResult(PrintWriter out) {
-                final Uri downloadUri = intent.getData();
+                final Uri downloadUri = Uri.parse(opts.optString("url"));
                 if (downloadUri == null) {
                     out.println("No download URI specified");
                     return;
                 }
 
-                String title = intent.getStringExtra("title");
-                String description = intent.getStringExtra("description");
+                String title = opts.optString("title");
+                String description = opts.optString("description");
 
                 DownloadManager manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
                 Request req = new Request(downloadUri);
diff --git a/app/src/main/java/com/termux/api/FingerprintAPI.java b/app/src/main/java/com/termux/api/FingerprintAPI.java
index 2809edf1e..14c534e96 100644
--- a/app/src/main/java/com/termux/api/FingerprintAPI.java
+++ b/app/src/main/java/com/termux/api/FingerprintAPI.java
@@ -18,6 +18,8 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONObject;
+
 import java.security.KeyStore;
 import java.util.ArrayList;
 import java.util.List;
@@ -67,7 +69,7 @@ public class FingerprintAPI {
     /**
      * Handles setup of fingerprint sensor and writes Fingerprint result to console
      */
-    static void onReceive(final Context context, final Intent intent) {
+    static void onReceive(final Context context, JSONObject opts) {
         resetFingerprintResult();
 
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
@@ -76,23 +78,23 @@ static void onReceive(final Context context, final Intent intent) {
             // make sure we have a valid fingerprint sensor before attempting to launch Fingerprint activity
             if (validateFingerprintSensor(context, fingerprintManager)) {
                 Intent fingerprintIntent = new Intent(context, FingerprintActivity.class);
-                fingerprintIntent.putExtras(intent.getExtras());
+                fingerprintIntent.putExtra("opts", opts.optString("opts"));
                 context.startActivity(fingerprintIntent);
             } else {
-                postFingerprintResult(context, intent, fingerprintResult);
+                postFingerprintResult(context, fingerprintResult);
             }
         } else {
             // pre-marshmallow is unsupported
             appendFingerprintError(ERROR_UNSUPPORTED_OS_VERSION);
-            postFingerprintResult(context, intent, fingerprintResult);
+            postFingerprintResult(context, fingerprintResult);
         }
     }
 
     /**
      * Writes the result of our fingerprint result to the console
      */
-    protected static void postFingerprintResult(Context context, Intent intent, final FingerprintResult result) {
-        ResultReturner.returnData(context, intent, new ResultReturner.ResultJsonWriter() {
+    protected static void postFingerprintResult(Context context, final FingerprintResult result) {
+        ResultReturner.returnData(context, new ResultReturner.ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws Exception {
                 out.beginObject();
@@ -193,14 +195,14 @@ public void onAuthenticationError(int errorCode, CharSequence errString) {
                         }
                     }
                     setAuthResult(AUTH_RESULT_FAILURE);
-                    postFingerprintResult(context, intent, fingerprintResult);
+                    postFingerprintResult(context, fingerprintResult);
                     TermuxApiLogger.error(errString.toString());
                 }
 
                 @Override
                 public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
                     setAuthResult(AUTH_RESULT_SUCCESS);
-                    postFingerprintResult(context, intent, fingerprintResult);
+                    postFingerprintResult(context, fingerprintResult);
                 }
 
                 @Override
@@ -235,7 +237,7 @@ public void run() {
                     if (!postedResult) {
                         appendFingerprintError(ERROR_TIMEOUT);
                         cancellationSignal.cancel();
-                        postFingerprintResult(context, intent, fingerprintResult);
+                        postFingerprintResult(context, fingerprintResult);
                     }
                 }
             }, SENSOR_TIMEOUT);
diff --git a/app/src/main/java/com/termux/api/InfraredAPI.java b/app/src/main/java/com/termux/api/InfraredAPI.java
index 42d8ffcaa..8b5214d5e 100644
--- a/app/src/main/java/com/termux/api/InfraredAPI.java
+++ b/app/src/main/java/com/termux/api/InfraredAPI.java
@@ -7,13 +7,16 @@
 
 import com.termux.api.util.ResultReturner;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 /**
  * Exposing {@link ConsumerIrManager}.
  */
 public class InfraredAPI {
 
-    static void onReceiveCarrierFrequency(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultJsonWriter() {
+    static void onReceiveCarrierFrequency(final Context context) {
+        ResultReturner.returnData(context, new ResultReturner.ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws Exception {
                 ConsumerIrManager irManager = (ConsumerIrManager) context.getSystemService(Context.CONSUMER_IR_SERVICE);
@@ -40,14 +43,20 @@ public void writeJson(JsonWriter out) throws Exception {
     }
 
 
-    static void onReceiveTransmit(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultJsonWriter() {
+    static void onReceiveTransmit(final Context context, final JSONObject opts) {
+        ResultReturner.returnData(context, new ResultReturner.ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws Exception {
                 ConsumerIrManager irManager = (ConsumerIrManager) context.getSystemService(Context.CONSUMER_IR_SERVICE);
 
-                int carrierFrequency = intent.getIntExtra("frequency", -1);
-                int[] pattern = intent.getIntArrayExtra("pattern");
+                int carrierFrequency = opts.optInt("frequency", -1);
+                JSONArray jsonArray = opts.getJSONArray("pattern");
+
+                int[] pattern = new int[jsonArray.length()];
+
+                for(int i = 0; i < jsonArray.length(); i++){
+                    pattern[i] = jsonArray.optInt(i);
+                }
 
                 String error = null;
                 if (!irManager.hasIrEmitter()) {
diff --git a/app/src/main/java/com/termux/api/KeystoreAPI.java b/app/src/main/java/com/termux/api/KeystoreAPI.java
index 4237b5102..67ae225ca 100644
--- a/app/src/main/java/com/termux/api/KeystoreAPI.java
+++ b/app/src/main/java/com/termux/api/KeystoreAPI.java
@@ -1,6 +1,7 @@
 package com.termux.api;
 
 import android.annotation.SuppressLint;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.security.keystore.KeyGenParameterSpec;
@@ -15,6 +16,10 @@
 import com.termux.api.util.ResultReturner.ResultWriter;
 import com.termux.api.util.ResultReturner.WithInput;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -41,28 +46,28 @@ class KeystoreAPI {
     private static final String PROVIDER = "AndroidKeyStore";
 
     @SuppressLint("NewApi")
-    static void onReceive(TermuxApiReceiver apiReceiver, Intent intent) {
+    static void onReceive(final Context context, final JSONObject opts) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             // most of the keystore features were added in Android 6
-            printErrorMessage(apiReceiver, intent);
+            printErrorMessage(context);
             return;
         }
 
-        switch (intent.getStringExtra("command")) {
+        switch (opts.optString("command")) {
             case "list":
-                listKeys(apiReceiver, intent);
+                listKeys(context, opts);
                 break;
             case "generate":
-                generateKey(apiReceiver, intent);
+                generateKey(context, opts);
                 break;
             case "delete":
-                deleteKey(apiReceiver, intent);
+                deleteKey(context, opts);
                 break;
             case "sign":
-                signData(apiReceiver, intent);
+                signData(context, opts);
                 break;
             case "verify":
-                verifyData(apiReceiver, intent);
+                verifyData(context, opts);
                 break;
         }
     }
@@ -75,13 +80,13 @@ static void onReceive(TermuxApiReceiver apiReceiver, Intent intent) {
      * </ul>
      */
     @RequiresApi(api = Build.VERSION_CODES.M)
-    private static void listKeys(TermuxApiReceiver apiReceiver, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultJsonWriter() {
+    private static void listKeys(final Context context, final JSONObject opts) {
+        ResultReturner.returnData(context, new ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws GeneralSecurityException, IOException {
                 KeyStore keyStore = getKeyStore();
                 Enumeration<String> aliases = keyStore.aliases();
-                boolean detailed = intent.getBooleanExtra("detailed", false);
+                boolean detailed = opts.optBoolean("detailed", false);
 
                 out.beginArray();
                 while (aliases.hasMoreElements()) {
@@ -154,11 +159,11 @@ private static void printPrivateKey(JsonWriter out, PrivateKeyEntry entry, boole
      *     <li>alias: key alias</li>
      * </ul>
      */
-    private static void deleteKey(TermuxApiReceiver apiReceiver, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultWriter() {
+    private static void deleteKey(final Context context, final JSONObject opts) {
+        ResultReturner.returnData(context, new ResultWriter() {
             @Override
             public void writeResult(PrintWriter out) throws IOException, GeneralSecurityException {
-                String alias = intent.getStringExtra("alias");
+                String alias = opts.optString("alias");
                 // unfortunately this statement does not return anything
                 // nor does it throw an exception if the alias does not exist
                 getKeyStore().deleteEntry(alias);
@@ -197,17 +202,23 @@ public void writeResult(PrintWriter out) throws IOException, GeneralSecurityExce
      */
     @RequiresApi(api = Build.VERSION_CODES.M)
     @SuppressLint("WrongConstant")
-    private static void generateKey(TermuxApiReceiver apiReceiver, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultWriter() {
+    private static void generateKey(final Context context, final JSONObject opts) {
+        ResultReturner.returnData(context, new ResultWriter() {
             @Override
             public void writeResult(PrintWriter out) throws GeneralSecurityException {
-                String alias = intent.getStringExtra("alias");
-                String algorithm = intent.getStringExtra("algorithm");
-                int purposes = intent.getIntExtra("purposes", 0);
-                String[] digests = intent.getStringArrayExtra("digests");
-                int size = intent.getIntExtra("size", 2048);
-                String curve = intent.getStringExtra("curve");
-                int userValidity = intent.getIntExtra("validity", 0);
+                String alias = opts.optString("alias");
+                String algorithm = opts.optString("algorithm");
+                int purposes = opts.optInt("purposes", 0);
+
+                JSONArray digestsJson = opts.optJSONArray("digests");
+                String[] digests = new String[digestsJson.length()];
+                for(int i = 0; i < digestsJson.length(); i++){
+                    digests[i] = digestsJson.optString(i);
+                }
+
+                int size = opts.optInt("size", 2048);
+                String curve = opts.optString("curve");
+                int userValidity = opts.optInt("validity", 0);
 
                 KeyGenParameterSpec.Builder builder =
                         new KeyGenParameterSpec.Builder(alias, purposes);
@@ -250,12 +261,12 @@ public void writeResult(PrintWriter out) throws GeneralSecurityException {
      *     </li>
      * </ul>
      */
-    private static void signData(TermuxApiReceiver apiReceiver, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new WithInput() {
+    private static void signData(final Context context, final JSONObject opts) {
+        ResultReturner.returnData(context, new WithInput() {
             @Override
             public void writeResult(PrintWriter out) throws Exception {
-                String alias = intent.getStringExtra("alias");
-                String algorithm = intent.getStringExtra("algorithm");
+                String alias = opts.optString("alias");
+                String algorithm = opts.optString("algorithm");
                 byte[] input = readStream(in);
 
                 PrivateKeyEntry key = (PrivateKeyEntry) getKeyStore().getEntry(alias, null);
@@ -286,14 +297,14 @@ public void writeResult(PrintWriter out) throws Exception {
      *     <li>signature: path of the signature file</li>
      * </ul>
      */
-    private static void verifyData(TermuxApiReceiver apiReceiver, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new WithInput() {
+    private static void verifyData(final Context context, final JSONObject opts) {
+        ResultReturner.returnData(context, new WithInput() {
             @Override
             public void writeResult(PrintWriter out) throws GeneralSecurityException, IOException {
-                String alias = intent.getStringExtra("alias");
-                String algorithm = intent.getStringExtra("algorithm");
+                String alias = opts.optString("alias");
+                String algorithm = opts.optString("algorithm");
                 byte[] input = readStream(in);
-                File signatureFile = new File(intent.getStringExtra("signature"));
+                File signatureFile = new File(opts.optString("signature"));
 
                 byte[] signatureData = new byte[(int) signatureFile.length()];
                 int read = new FileInputStream(signatureFile).read(signatureData);
@@ -332,8 +343,8 @@ private static byte[] readStream(InputStream stream) throws IOException {
         return byteStream.toByteArray();
     }
 
-    private static void printErrorMessage(TermuxApiReceiver apiReceiver, Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultWriter() {
+    private static void printErrorMessage(final Context context) {
+        ResultReturner.returnData(context, new ResultWriter() {
             @Override
             public void writeResult(PrintWriter out) {
                 out.println("termux-keystore requires at least Android 6.0 (Marshmallow).");
diff --git a/app/src/main/java/com/termux/api/LocationAPI.java b/app/src/main/java/com/termux/api/LocationAPI.java
index 11ea2ef9c..59556fd83 100644
--- a/app/src/main/java/com/termux/api/LocationAPI.java
+++ b/app/src/main/java/com/termux/api/LocationAPI.java
@@ -15,6 +15,8 @@
 import com.termux.api.util.ResultReturner.ResultJsonWriter;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONObject;
+
 import java.io.IOException;
 
 public class LocationAPI {
@@ -23,13 +25,13 @@ public class LocationAPI {
     private static final String REQUEST_ONCE = "once";
     private static final String REQUEST_UPDATES = "updates";
 
-    static void onReceive(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultJsonWriter() {
+    static void onReceive(final Context context, final JSONObject opts) {
+        ResultReturner.returnData(context, new ResultJsonWriter() {
             @Override
             public void writeJson(final JsonWriter out) throws Exception {
                 LocationManager manager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
 
-                String provider = intent.getStringExtra("provider");
+                String provider = opts.optString("provider");
                 if (provider == null)
                     provider = LocationManager.GPS_PROVIDER;
                 if (!(provider.equals(LocationManager.GPS_PROVIDER) || provider.equals(LocationManager.NETWORK_PROVIDER) || provider
@@ -41,7 +43,7 @@ public void writeJson(final JsonWriter out) throws Exception {
                     return;
                 }
 
-                String request = intent.getStringExtra("request");
+                String request = opts.optString("request");
                 if (request == null)
                     request = REQUEST_ONCE;
                 switch (request) {
diff --git a/app/src/main/java/com/termux/api/MediaPlayerAPI.java b/app/src/main/java/com/termux/api/MediaPlayerAPI.java
index a1abf0f7b..bd2d536ff 100644
--- a/app/src/main/java/com/termux/api/MediaPlayerAPI.java
+++ b/app/src/main/java/com/termux/api/MediaPlayerAPI.java
@@ -10,6 +10,8 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONObject;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -23,12 +25,12 @@ public class MediaPlayerAPI {
     /**
      * Starts our PlayerService
      */
-    static void onReceive(final Context context, final Intent intent) {
+    static void onReceive(final Context context, JSONObject opts) {
         // Create intent for starting our player service and make sure
         // we retain all relevant info from this intent
         Intent playerService = new Intent(context, PlayerService.class);
-        playerService.setAction(intent.getAction());
-        playerService.putExtras(intent.getExtras());
+        playerService.setAction(opts.optString("action"));
+        playerService.putExtra("opts", opts.toString());
 
         context.startService(playerService);
     }
@@ -82,7 +84,7 @@ protected MediaPlayer getMediaPlayer() {
         }
 
         /**
-         * What we received from TermuxApiReceiver but now within this service
+         * What we received from TermuxApiService but now within this service
          */
         public int onStartCommand(Intent intent, int flags, int startId) {
             String command = intent.getAction();
@@ -161,7 +163,7 @@ public MediaCommandResult handle(MediaPlayer player, Context context, Intent int
         protected static void postMediaCommandResult(final Context context, final Intent intent,
                                                      final MediaCommandResult result) {
 
-            ResultReturner.returnData(context, intent, new ResultReturner.ResultWriter() {
+            ResultReturner.returnData(context, new ResultReturner.ResultWriter() {
                 @Override
                 public void writeResult(PrintWriter out) {
                     out.append(result.message + "\n");
diff --git a/app/src/main/java/com/termux/api/MediaScannerAPI.java b/app/src/main/java/com/termux/api/MediaScannerAPI.java
index 6d76dbb79..28f3545e0 100644
--- a/app/src/main/java/com/termux/api/MediaScannerAPI.java
+++ b/app/src/main/java/com/termux/api/MediaScannerAPI.java
@@ -8,22 +8,27 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 import java.io.File;
 import java.io.PrintWriter;
 import java.util.Stack;
 
 public class MediaScannerAPI {
 
-    static void onReceive(TermuxApiReceiver apiReceiver, final Context context, Intent intent) {
-        final String[] filePaths = intent.getStringArrayExtra("paths");
-        final Boolean recursive = intent.getBooleanExtra("recursive", false);
+    static void onReceive(final Context context, JSONObject opts) {
+        final JSONArray filePathsJson = opts.optJSONArray("paths");
+        final String[] filePaths = new String[filePathsJson.length()];
+
+        final Boolean recursive = opts.optBoolean("recursive", false);
         final Integer[] totalScanned = {0};
-        final Boolean verbose = intent.getBooleanExtra("verbose", false);
+        final Boolean verbose = opts.optBoolean("verbose", false);
         for (int i = 0; i < filePaths.length; i++) {
             filePaths[i] = filePaths[i].replace("\\,", ",");
         }
 
-        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultWriter() {
+        ResultReturner.returnData(context, new ResultReturner.ResultWriter() {
             @Override
             public void writeResult(PrintWriter out) {
                 scanFiles(out, context, filePaths, totalScanned, verbose);
diff --git a/app/src/main/java/com/termux/api/MicRecorderAPI.java b/app/src/main/java/com/termux/api/MicRecorderAPI.java
index ddb01eb2a..9be997c9a 100644
--- a/app/src/main/java/com/termux/api/MicRecorderAPI.java
+++ b/app/src/main/java/com/termux/api/MicRecorderAPI.java
@@ -31,10 +31,10 @@ public class MicRecorderAPI {
     /**
      * Starts our MicRecorder service
      */
-    static void onReceive(final Context context, final Intent intent) {
+    static void onReceive(final Context context, JSONObject opts) {
         Intent recorderService = new Intent(context, MicRecorderService.class);
-        recorderService.setAction(intent.getAction());
-        recorderService.putExtras(intent.getExtras());
+        recorderService.setAction(opts.optString("action"));
+        recorderService.putExtra("opts", opts.toString());
         context.startService(recorderService);
     }
 
@@ -92,7 +92,7 @@ public RecorderCommandResult handle(MediaRecorder recorder, Context context, Int
         protected static void postRecordCommandResult(final Context context, final Intent intent,
                                                       final RecorderCommandResult result) {
 
-            ResultReturner.returnData(context, intent, new ResultReturner.ResultWriter() {
+            ResultReturner.returnData(context, new ResultReturner.ResultWriter() {
                 @Override
                 public void writeResult(PrintWriter out) {
                     out.append(result.message + "\n");
diff --git a/app/src/main/java/com/termux/api/NotificationAPI.java b/app/src/main/java/com/termux/api/NotificationAPI.java
index 4851c073d..fae7fd5ba 100644
--- a/app/src/main/java/com/termux/api/NotificationAPI.java
+++ b/app/src/main/java/com/termux/api/NotificationAPI.java
@@ -16,6 +16,9 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 import java.io.File;
 import java.io.PrintWriter;
 import java.util.Arrays;
@@ -35,8 +38,8 @@ public class NotificationAPI {
     /**
      * Show a notification. Driven by the termux-show-notification script.
      */
-    static void onReceiveShowNotification(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        String priorityExtra = intent.getStringExtra("priority");
+    static void onReceiveShowNotification(final Context context, JSONObject opts) {
+        String priorityExtra = opts.optString("priority");
         if (priorityExtra == null) priorityExtra = "default";
         int priority;
         switch (priorityExtra) {
@@ -57,9 +60,9 @@ static void onReceiveShowNotification(TermuxApiReceiver apiReceiver, final Conte
                 break;
         }
 
-        String title = intent.getStringExtra("title");
+        String title = opts.optString("title");
 
-        String lightsArgbExtra = intent.getStringExtra("led-color");
+        String lightsArgbExtra = opts.optString("led-color");
 
         int ledColor = 0;
 
@@ -71,21 +74,28 @@ static void onReceiveShowNotification(TermuxApiReceiver apiReceiver, final Conte
             }
         }
 
-        int ledOnMs = intent.getIntExtra("led-on", 800);
-        int ledOffMs = intent.getIntExtra("led-off", 800);
+        int ledOnMs = opts.optInt("led-on", 800);
+        int ledOffMs = opts.optInt("led-off", 800);
+
+
+        JSONArray vibratePatternJson = opts.optJSONArray("vibrate");
+        long[] vibratePattern = new long[vibratePatternJson.length()];
+
+        for(int i = 0; i < vibratePatternJson.length(); i++){
+            vibratePattern[i] = vibratePatternJson.optLong(i);
+        }
 
-        long[] vibratePattern = intent.getLongArrayExtra("vibrate");
-        boolean useSound = intent.getBooleanExtra("sound", false);
-        boolean ongoing = intent.getBooleanExtra("ongoing", false);
-        boolean alertOnce = intent.getBooleanExtra("alert-once", true);
+        boolean useSound = opts.optBoolean("sound", false);
+        boolean ongoing = opts.optBoolean("ongoing", false);
+        boolean alertOnce = opts.optBoolean("alert-once", true);
 
-        String actionExtra = intent.getStringExtra("action");
+        String actionExtra = opts.optString("action");
 
-        String id = intent.getStringExtra("id");
+        String id = opts.optString("id");
         if (id == null) id = UUID.randomUUID().toString();
         final String notificationId = id;
 
-        String groupKey = intent.getStringExtra("group");
+        String groupKey = opts.optString("group");
 
         final Notification.Builder notification = new Notification.Builder(context);
         notification.setSmallIcon(R.drawable.ic_event_note_black_24dp);
@@ -98,7 +108,7 @@ static void onReceiveShowNotification(TermuxApiReceiver apiReceiver, final Conte
 
 
 
-        String ImagePath = intent.getStringExtra("image-path");
+        String ImagePath = opts.optString("image-path");
 
         if(ImagePath != null){
             File imgFile = new  File(ImagePath);
@@ -111,12 +121,12 @@ static void onReceiveShowNotification(TermuxApiReceiver apiReceiver, final Conte
             }
         }
 
-        String styleType = intent.getStringExtra("type");
+        String styleType = opts.optString("type");
         if(Objects.equals(styleType, "media")) {
-            String mediaPrevious = intent.getStringExtra("media-previous");
-            String mediaPause = intent.getStringExtra("media-pause");
-            String mediaPlay = intent.getStringExtra("media-play");
-            String mediaNext = intent.getStringExtra("media-next");
+            String mediaPrevious = opts.optString("media-previous");
+            String mediaPause = opts.optString("media-pause");
+            String mediaPlay = opts.optString("media-play");
+            String mediaNext = opts.optString("media-next");
 
             if (mediaPrevious != null && mediaPause != null && mediaPlay != null && mediaNext != null) {
                 notification.setSmallIcon(android.R.drawable.ic_media_play);
@@ -164,21 +174,21 @@ static void onReceiveShowNotification(TermuxApiReceiver apiReceiver, final Conte
         }
 
         for (int button = 1; button <= 3; button++) {
-            String buttonText = intent.getStringExtra("button_text_" + button);
-            String buttonAction = intent.getStringExtra("button_action_" + button);
+            String buttonText = opts.optString("button_text_" + button);
+            String buttonAction = opts.optString("button_action_" + button);
             if (buttonText != null && buttonAction != null) {
                 PendingIntent pi = createAction(context, buttonAction);
                 notification.addAction(new Notification.Action(android.R.drawable.ic_input_add, buttonText, pi));
             }
         }
 
-        String onDeleteActionExtra = intent.getStringExtra("on_delete_action");
+        String onDeleteActionExtra = opts.optString("on_delete_action");
         if (onDeleteActionExtra != null) {
             PendingIntent pi = createAction(context, onDeleteActionExtra);
             notification.setDeleteIntent(pi);
         }
 
-        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.WithStringInput() {
+        ResultReturner.returnData(context, new ResultReturner.WithStringInput() {
             @Override
             public void writeResult(PrintWriter out) {
                 NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
@@ -205,9 +215,9 @@ public void writeResult(PrintWriter out) {
         });
     }
 
-    static void onReceiveRemoveNotification(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        ResultReturner.noteDone(apiReceiver, intent);
-        String notificationId = intent.getStringExtra("id");
+    static void onReceiveRemoveNotification(final Context context, JSONObject opts) {
+        ResultReturner.noteDone(context);
+        String notificationId = opts.optString("id");
         if (notificationId != null) {
             NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
             manager.cancel(notificationId, 0);
diff --git a/app/src/main/java/com/termux/api/NotificationListAPI.java b/app/src/main/java/com/termux/api/NotificationListAPI.java
index 9b32bb9fe..5ad637fd5 100644
--- a/app/src/main/java/com/termux/api/NotificationListAPI.java
+++ b/app/src/main/java/com/termux/api/NotificationListAPI.java
@@ -12,9 +12,9 @@
 
 public class NotificationListAPI {
 
-    public static void onReceive(TermuxApiReceiver apiReceiver, final Context context, Intent intent) {
+    public static void onReceive(final Context context) {
 
-        ResultReturner.returnData(apiReceiver, intent, new ResultJsonWriter() {
+        ResultReturner.returnData(context, new ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws Exception {
                 listNotifications(context, out);
diff --git a/app/src/main/java/com/termux/api/PhotoAPI.java b/app/src/main/java/com/termux/api/PhotoAPI.java
index ca768f1d8..dc14dc514 100644
--- a/app/src/main/java/com/termux/api/PhotoAPI.java
+++ b/app/src/main/java/com/termux/api/PhotoAPI.java
@@ -22,6 +22,8 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONObject;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.PrintWriter;
@@ -35,13 +37,13 @@
 
 public class PhotoAPI {
 
-    static void onReceive(TermuxApiReceiver apiReceiver, final Context context, Intent intent) {
-        final String filePath = intent.getStringExtra("file");
+    static void onReceive(final Context context, JSONObject opts) {
+        final String filePath = opts.optString("file");
         final File outputFile = new File(filePath);
         final File outputDir = outputFile.getParentFile();
-        final String cameraId = Objects.toString(intent.getStringExtra("camera"), "0");
+        final String cameraId = Objects.toString(opts.optString("camera"), "0");
 
-        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultWriter() {
+        ResultReturner.returnData(context, new ResultReturner.ResultWriter() {
             @Override
             public void writeResult(PrintWriter stdout) {
                 if (!(outputDir.isDirectory() || outputDir.mkdirs())) {
diff --git a/app/src/main/java/com/termux/api/SensorAPI.java b/app/src/main/java/com/termux/api/SensorAPI.java
index 332fb4fbf..d92daa478 100644
--- a/app/src/main/java/com/termux/api/SensorAPI.java
+++ b/app/src/main/java/com/termux/api/SensorAPI.java
@@ -32,10 +32,10 @@ public class SensorAPI {
     /**
      * Starts our SensorReader service
      */
-    public static void onReceive(final Context context, final Intent intent) {
+    public static void onReceive(final Context context, final JSONObject opts) {
         Intent serviceIntent = new Intent(context, SensorReaderService.class);
-        serviceIntent.setAction(intent.getAction());
-        serviceIntent.putExtras(intent.getExtras());
+        serviceIntent.setAction(opts.optString("action"));
+        serviceIntent.putExtra("opts", opts.toString());
         context.startService(serviceIntent);
     }
 
@@ -161,7 +161,7 @@ public SensorCommandResult handle(SensorManager sensorManager, Context context,
         private void postSensorCommandResult(final Context context, final Intent intent,
                                              final SensorCommandResult result) {
 
-            ResultReturner.returnData(context, intent, new ResultReturner.ResultWriter() {
+            ResultReturner.returnData(context, new ResultReturner.ResultWriter() {
                 @Override
                 public void writeResult(PrintWriter out) {
                     out.append(result.message + "\n");
diff --git a/app/src/main/java/com/termux/api/ShareAPI.java b/app/src/main/java/com/termux/api/ShareAPI.java
index de1111740..3c4e69fd8 100644
--- a/app/src/main/java/com/termux/api/ShareAPI.java
+++ b/app/src/main/java/com/termux/api/ShareAPI.java
@@ -14,18 +14,20 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONObject;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
 
 public class ShareAPI {
 
-    static void onReceive(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        final String fileExtra = intent.getStringExtra("file");
-        final String titleExtra = intent.getStringExtra("title");
-        final String contentTypeExtra = intent.getStringExtra("content-type");
-        final boolean defaultReceiverExtra = intent.getBooleanExtra("default-receiver", false);
-        final String actionExtra = intent.getStringExtra("action");
+    static void onReceive(final Context context, JSONObject opts) {
+        final String fileExtra = opts.optString("file");
+        final String titleExtra = opts.optString("title");
+        final String contentTypeExtra = opts.optString("content-type");
+        final boolean defaultReceiverExtra = opts.optBoolean("default-receiver", false);
+        final String actionExtra = opts.optString("action");
 
         String intentAction = null;
         if (actionExtra == null) {
@@ -50,7 +52,7 @@ static void onReceive(TermuxApiReceiver apiReceiver, final Context context, fina
 
         if (fileExtra == null) {
             // Read text to share from stdin.
-            ResultReturner.returnData(apiReceiver, intent, new ResultReturner.WithStringInput() {
+            ResultReturner.returnData(context, new ResultReturner.WithStringInput() {
                 @Override
                 public void writeResult(PrintWriter out) {
                     if (TextUtils.isEmpty(inputString)) {
@@ -72,7 +74,7 @@ public void writeResult(PrintWriter out) {
             });
         } else {
             // Share specified file.
-            ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultWriter() {
+            ResultReturner.returnData(context, new ResultReturner.ResultWriter() {
                 @Override
                 public void writeResult(PrintWriter out) {
                     final File fileToShare = new File(fileExtra);
diff --git a/app/src/main/java/com/termux/api/SmsInboxAPI.java b/app/src/main/java/com/termux/api/SmsInboxAPI.java
index 4f018d5b9..a414700df 100644
--- a/app/src/main/java/com/termux/api/SmsInboxAPI.java
+++ b/app/src/main/java/com/termux/api/SmsInboxAPI.java
@@ -14,6 +14,8 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.ResultReturner.ResultJsonWriter;
 
+import org.json.JSONObject;
+
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -24,12 +26,12 @@ public class SmsInboxAPI {
 
     private static final String[] DISPLAY_NAME_PROJECTION = {PhoneLookup.DISPLAY_NAME};
 
-    static void onReceive(TermuxApiReceiver apiReceiver, final Context context, Intent intent) {
-        final int offset = intent.getIntExtra("offset", 0);
-        final int limit = intent.getIntExtra("limit", 50);
-        final Uri contentURI = typeToContentURI(intent.getIntExtra("type", TextBasedSmsColumns.MESSAGE_TYPE_INBOX));
+    static void onReceive(final Context context, JSONObject opts) {
+        final int offset = opts.optInt("offset", 0);
+        final int limit = opts.optInt("limit", 50);
+        final Uri contentURI = typeToContentURI(opts.optInt("type", TextBasedSmsColumns.MESSAGE_TYPE_INBOX));
 
-        ResultReturner.returnData(apiReceiver, intent, new ResultJsonWriter() {
+        ResultReturner.returnData(context, new ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws Exception {
                 getAllSms(context, out, offset, limit, contentURI);
diff --git a/app/src/main/java/com/termux/api/SmsSendAPI.java b/app/src/main/java/com/termux/api/SmsSendAPI.java
index 0b5bf2461..5fa37b102 100644
--- a/app/src/main/java/com/termux/api/SmsSendAPI.java
+++ b/app/src/main/java/com/termux/api/SmsSendAPI.java
@@ -1,26 +1,34 @@
 package com.termux.api;
 
+import android.content.Context;
 import android.content.Intent;
 import android.telephony.SmsManager;
 
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 import java.io.PrintWriter;
 import java.util.ArrayList;
 
 public class SmsSendAPI {
 
-    static void onReceive(TermuxApiReceiver apiReceiver, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.WithStringInput() {
+    static void onReceive(Context context, final JSONObject opts) {
+        ResultReturner.returnData(context, new ResultReturner.WithStringInput() {
             @Override
             public void writeResult(PrintWriter out) {
                 final SmsManager smsManager = SmsManager.getDefault();
-                String[] recipients = intent.getStringArrayExtra("recipients");
+                JSONArray recipientsJson = opts.optJSONArray("recipients");
+                String[] recipients = new String[recipientsJson.length()];
+                for(int i = 0; i < recipientsJson.length(); i++){
+                    recipients[i] = recipientsJson.optString(i);
+                }
 
                 if (recipients == null) {
                     // Used by old versions of termux-send-sms.
-                    String recipient = intent.getStringExtra("recipient");
+                    String recipient = opts.optString("recipient");
                     if (recipient != null) recipients = new String[]{recipient};
                 }
 
diff --git a/app/src/main/java/com/termux/api/SpeechToTextAPI.java b/app/src/main/java/com/termux/api/SpeechToTextAPI.java
index 606addbce..c0202ae7a 100644
--- a/app/src/main/java/com/termux/api/SpeechToTextAPI.java
+++ b/app/src/main/java/com/termux/api/SpeechToTextAPI.java
@@ -17,6 +17,8 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONObject;
+
 import java.io.PrintWriter;
 import java.util.List;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -156,7 +158,7 @@ public void onDestroy() {
         @Override
         protected void onHandleIntent(final Intent intent) {
             TermuxApiLogger.error("onHandleIntent");
-            ResultReturner.returnData(this, intent, new ResultReturner.WithInput() {
+            ResultReturner.returnData(this, new ResultReturner.WithInput() {
                 @Override
                 public void writeResult(PrintWriter out) throws Exception {
                     while (true) {
@@ -173,8 +175,8 @@ public void writeResult(PrintWriter out) throws Exception {
         }
     }
 
-    public static void onReceive(final Context context, Intent intent) {
-        context.startService(new Intent(context, SpeechToTextService.class).putExtras(intent.getExtras()));
+    public static void onReceive(final Context context, JSONObject opts) {
+        context.startService(new Intent(context, SpeechToTextService.class).putExtra("opts", opts.toString()));
     }
 
     public static void runFromActivity(final Activity context) {
diff --git a/app/src/main/java/com/termux/api/StorageGetAPI.java b/app/src/main/java/com/termux/api/StorageGetAPI.java
index b9c182dbe..76d86f4ac 100644
--- a/app/src/main/java/com/termux/api/StorageGetAPI.java
+++ b/app/src/main/java/com/termux/api/StorageGetAPI.java
@@ -8,6 +8,8 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONObject;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -19,11 +21,11 @@ public class StorageGetAPI {
 
     private static final String FILE_EXTRA = "com.termux.api.storage.file";
 
-    static void onReceive(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultWriter() {
+    static void onReceive(final Context context, final JSONObject opts) {
+        ResultReturner.returnData(context, new ResultReturner.ResultWriter() {
             @Override
             public void writeResult(PrintWriter out) {
-                final String fileExtra = intent.getStringExtra("file");
+                final String fileExtra = opts.optString("file");
                 if (fileExtra == null || !new File(fileExtra).getParentFile().canWrite()) {
                     out.println("ERROR: Not a writable folder: " + fileExtra);
                     return;
diff --git a/app/src/main/java/com/termux/api/TelephonyAPI.java b/app/src/main/java/com/termux/api/TelephonyAPI.java
index 6a998c324..afff6350a 100644
--- a/app/src/main/java/com/termux/api/TelephonyAPI.java
+++ b/app/src/main/java/com/termux/api/TelephonyAPI.java
@@ -16,6 +16,8 @@
 
 import com.termux.api.util.ResultReturner;
 
+import org.json.JSONObject;
+
 import java.io.IOException;
 
 /**
@@ -27,8 +29,8 @@ private static void writeIfKnown(JsonWriter out, String name, int value) throws
         if (value != Integer.MAX_VALUE) out.name(name).value(value);
     }
 
-    static void onReceiveTelephonyCellInfo(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultJsonWriter() {
+    static void onReceiveTelephonyCellInfo(final Context context) {
+        ResultReturner.returnData(context, new ResultReturner.ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws Exception {
                 TelephonyManager manager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
@@ -109,8 +111,8 @@ public void writeJson(JsonWriter out) throws Exception {
     }
 
 
-    static void onReceiveTelephonyDeviceInfo(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultJsonWriter() {
+    static void onReceiveTelephonyDeviceInfo(final Context context) {
+        ResultReturner.returnData(context, new ResultReturner.ResultJsonWriter() {
             @SuppressLint("HardwareIds")
             @Override
             public void writeJson(JsonWriter out) throws Exception {
@@ -295,11 +297,11 @@ public void writeJson(JsonWriter out) throws Exception {
         });
     }
 
-    static void onReceiveTelephonyCall(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        String numberExtra = intent.getStringExtra("number");
+    static void onReceiveTelephonyCall(final Context context, JSONObject opts) {
+        String numberExtra = opts.optString("number");
         if (numberExtra == null) {
             Log.e("termux-api", "No 'number extra");
-            ResultReturner.noteDone(apiReceiver, intent);
+            ResultReturner.noteDone(context);
         }
 
         Uri data = Uri.parse("tel:" + numberExtra);
@@ -314,7 +316,7 @@ static void onReceiveTelephonyCall(TermuxApiReceiver apiReceiver, final Context
             Log.e("termux-api", "Exception in phone call", e);
         }
 
-        ResultReturner.noteDone(apiReceiver, intent);
+        ResultReturner.noteDone(context);
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/termux/api/TermuxApiReceiver.java b/app/src/main/java/com/termux/api/TermuxApiReceiver.java
index 379b4fd2a..959651b56 100644
--- a/app/src/main/java/com/termux/api/TermuxApiReceiver.java
+++ b/app/src/main/java/com/termux/api/TermuxApiReceiver.java
@@ -1,194 +1,21 @@
 package com.termux.api;
 
-import android.Manifest;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.provider.Settings;
-import android.widget.Toast;
-
-import com.termux.api.util.TermuxApiLogger;
-import com.termux.api.util.TermuxApiPermissionActivity;
 
 public class TermuxApiReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        String apiMethod = intent.getStringExtra("api_method");
-        if (apiMethod == null) {
-            TermuxApiLogger.error("Missing 'api_method' extra");
-            return;
-        }
 
-        switch (apiMethod) {
-            case "AudioInfo":
-                AudioAPI.onReceive(this, context, intent);
-                break;
-            case "BatteryStatus":
-                BatteryStatusAPI.onReceive(this, context, intent);
-                break;
-            case "Brightness":
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    if (!Settings.System.canWrite(context)) {
-                        TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.WRITE_SETTINGS);
-                        Toast.makeText(context, "Please enable permission for Termux:API", Toast.LENGTH_LONG).show();
+        Intent myService = new Intent(context, TermuxApiService.class);
 
-                        // user must enable WRITE_SETTINGS permission this special way
-                        Intent settingsIntent = new Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS);
-                        context.startActivity(settingsIntent);
-                        return;
-                    }
-                }
-                BrightnessAPI.onReceive(this, context, intent);
-                break;
-            case "CameraInfo":
-                CameraInfoAPI.onReceive(this, context, intent);
-                break;
-            case "CameraPhoto":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.CAMERA)) {
-                    PhotoAPI.onReceive(this, context, intent);
-                }
-                break;
-            case "CallLog":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.READ_CALL_LOG)) {
-                    CallLogAPI.onReceive(context, intent);
-                }
-                break;
-            case "Clipboard":
-                ClipboardAPI.onReceive(this, context, intent);
-                break;
-            case "ContactList":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.READ_CONTACTS)) {
-                    ContactListAPI.onReceive(this, context, intent);
-                }
-                break;
-            case "Dialog":
-                context.startActivity(new Intent(context, DialogActivity.class).putExtras(intent.getExtras()).addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK));
-                break;
-            case "Download":
-                DownloadAPI.onReceive(this, context, intent);
-                break;
-            case "Fingerprint":
-                FingerprintAPI.onReceive(context, intent);
-                break;
-            case "InfraredFrequencies":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.TRANSMIT_IR)) {
-                    InfraredAPI.onReceiveCarrierFrequency(this, context, intent);
-                }
-                break;
-            case "InfraredTransmit":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.TRANSMIT_IR)) {
-                    InfraredAPI.onReceiveTransmit(this, context, intent);
-                }
-                break;
-            case "Keystore":
-                KeystoreAPI.onReceive(this, intent);
-                break;
-            case "Location":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.ACCESS_FINE_LOCATION)) {
-                    LocationAPI.onReceive(this, context, intent);
-                }
-                break;
-            case "MediaPlayer":
-                MediaPlayerAPI.onReceive(context, intent);
-                break;
-            case "MediaScanner":
-                MediaScannerAPI.onReceive(this, context, intent);
-                break;
-            case "MicRecorder":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.RECORD_AUDIO)) {
-                    MicRecorderAPI.onReceive(context, intent);
-                }
-                break;
-            case "NotificationList":
-                ComponentName cn = new ComponentName(context, NotificationService.class);
-                String flat = Settings.Secure.getString(context.getContentResolver(), "enabled_notification_listeners");
-                final boolean NotificationServiceEnabled = flat != null && flat.contains(cn.flattenToString());
-                if (!NotificationServiceEnabled) {
-                    Toast.makeText(context,"Please give Termux:API Notification Access", Toast.LENGTH_LONG).show();
-                    context.startActivity(new Intent("android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS"));
-                } else {
-                    NotificationListAPI.onReceive(this, context, intent);
-                }
-                break;
-            case "Notification":
-                NotificationAPI.onReceiveShowNotification(this, context, intent);
-                break;
-            case "NotificationRemove":
-                NotificationAPI.onReceiveRemoveNotification(this, context, intent);
-                break;
-            case "Sensor":
-                SensorAPI.onReceive(context, intent);
-                break;
-            case "Share":
-                ShareAPI.onReceive(this, context, intent);
-                break;
-            case "SmsInbox":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.READ_SMS, Manifest.permission.READ_CONTACTS)) {
-                    SmsInboxAPI.onReceive(this, context, intent);
-                }
-                break;
-            case "SmsSend":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.SEND_SMS)) {
-                    SmsSendAPI.onReceive(this, intent);
-                }
-                break;
-            case "StorageGet":
-                StorageGetAPI.onReceive(this, context, intent);
-                break;
-            case "SpeechToText":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.RECORD_AUDIO)) {
-                    SpeechToTextAPI.onReceive(context, intent);
-                }
-                break;
-            case "TelephonyCall":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.CALL_PHONE)) {
-                    TelephonyAPI.onReceiveTelephonyCall(this, context, intent);
-                }
-                break;
-            case "TelephonyCellInfo":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.ACCESS_COARSE_LOCATION)) {
-                    TelephonyAPI.onReceiveTelephonyCellInfo(this, context, intent);
-                }
-                break;
-            case "TelephonyDeviceInfo":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.READ_PHONE_STATE)) {
-                    TelephonyAPI.onReceiveTelephonyDeviceInfo(this, context, intent);
-                }
-                break;
-            case "TextToSpeech":
-                TextToSpeechAPI.onReceive(context, intent);
-                break;
-            case "Toast":
-                ToastAPI.onReceive(context, intent);
-                break;
-            case "Torch":
-                TorchAPI.onReceive(this, context, intent);
-                break;
-            case "Vibrate":
-                VibrateAPI.onReceive(this, context, intent);
-                break;
-            case "Volume":
-                VolumeAPI.onReceive(this, context, intent);
-                break;
-            case "Wallpaper":
-                WallpaperAPI.onReceive(context, intent);
-                break;
-            case "WifiConnectionInfo":
-                WifiAPI.onReceiveWifiConnectionInfo(this, context, intent);
-                break;
-            case "WifiScanInfo":
-                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, intent, Manifest.permission.ACCESS_FINE_LOCATION)) {
-                    WifiAPI.onReceiveWifiScanInfo(this, context, intent);
-                }
-                break;
-            case "WifiEnable":
-                WifiAPI.onReceiveWifiEnable(this, context, intent);
-                break;
-            default:
-                TermuxApiLogger.error("Unrecognized 'api_method' extra: '" + apiMethod + "'");
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            context.startForegroundService(myService);
+        } else {
+            context.startService(myService);
         }
     }
 
diff --git a/app/src/main/java/com/termux/api/TermuxApiService.java b/app/src/main/java/com/termux/api/TermuxApiService.java
new file mode 100644
index 000000000..32eceec58
--- /dev/null
+++ b/app/src/main/java/com/termux/api/TermuxApiService.java
@@ -0,0 +1,294 @@
+package com.termux.api;
+
+import android.Manifest;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.net.LocalServerSocket;
+import android.net.LocalSocket;
+import android.os.Build;
+import android.os.IBinder;
+import android.provider.Settings;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.termux.api.util.TermuxApiLogger;
+import com.termux.api.util.TermuxApiPermissionActivity;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class TermuxApiService extends Service {
+    private static final String CHANNEL_ID = "termux-notification";
+    private static final String CHANNEL_TITLE = "Termux API notification channel";
+
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        final String SOCKET_INPUT_ADDRESS = "termux-input";
+
+
+        final Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                while (true) {
+                    try (LocalServerSocket inputSocket = new LocalServerSocket(SOCKET_INPUT_ADDRESS)) {
+                        LocalSocket receiver = inputSocket.accept();
+                        if (receiver != null) {
+                            InputStream input = receiver.getInputStream();
+                            int readed = input.read();
+                            int size = 0;
+                            int capacity = 0;
+                            byte[] bytes = new byte[capacity];
+
+                            while (readed != -1) {
+                                capacity = (capacity * 3) / 2 + 1;
+                                byte[] copy = new byte[capacity];
+                                System.arraycopy(bytes, 0, copy, 0, bytes.length);
+                                bytes = copy;
+                                bytes[size++] = (byte) readed;
+                                readed = input.read();
+                            }
+
+                            String recievedData = new String(bytes, 0, size);
+                            receiver.close();
+                            Log.d("DERP", "onStartCommand: " + recievedData);
+                            JSONObject data = new JSONObject(recievedData);
+                            runApiMethod(getApplicationContext(), data);
+                        }
+                    } catch(IOException e){
+                        e.printStackTrace();
+                    } catch(JSONException e){
+                        TermuxApiLogger.error("Not valid JSON");
+                    }
+                }
+            }
+        };
+
+        new Thread(runnable).start();
+        super.onCreate();
+    }
+
+    public void runApiMethod(final Context context, JSONObject data) {
+        String apiMethod = data.optString("api_method");
+
+        if (apiMethod == null) {
+            TermuxApiLogger.error("Missing 'api_method' extra");
+            return;
+        }
+
+        switch (apiMethod) {
+            case "AudioInfo":
+                AudioAPI.onReceive(context);
+                break;
+            case "BatteryStatus":
+                BatteryStatusAPI.onReceive(context);
+                break;
+            case "Brightness":
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    if (!Settings.System.canWrite(context)) {
+                        TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.WRITE_SETTINGS);
+                        Toast.makeText(context, "Please enable permission for Termux:API", Toast.LENGTH_LONG).show();
+
+                        //user must enable WRITE_SETTINGS permission this special way
+                        Intent settingsIntent = new Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS);
+                        context.startActivity(settingsIntent);
+                        return;
+                    }
+                }
+                BrightnessAPI.onReceive(context, data);
+                break;
+            case "CameraInfo":
+                CameraInfoAPI.onReceive(context);
+                break;
+            case "CameraPhoto":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.CAMERA)) {
+                    PhotoAPI.onReceive(context, data);
+                }
+                break;
+            case "CallLog":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.READ_CALL_LOG)) {
+                    CallLogAPI.onReceive(context, data);
+                }
+                break;
+            case "Clipboard":
+                ClipboardAPI.onReceive(context, data);
+                break;
+            case "ContactList":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.READ_CONTACTS)) {
+                    ContactListAPI.onReceive(context);
+                }
+                break;
+            case "Dialog":
+                context.startActivity(new Intent(context, DialogActivity.class).putExtra("data", data.toString()).addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK));
+                break;
+            case "Download":
+                DownloadAPI.onReceive(context, data);
+                break;
+            case "Fingerprint":
+                FingerprintAPI.onReceive(context, data);
+                break;
+            case "InfraredFrequencies":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.TRANSMIT_IR)) {
+                    InfraredAPI.onReceiveCarrierFrequency(context);
+                }
+                break;
+            case "InfraredTransmit":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.TRANSMIT_IR)) {
+                    InfraredAPI.onReceiveTransmit(context, data);
+                }
+                break;
+            case "Keystore":
+                KeystoreAPI.onReceive(this, data);
+                break;
+            case "Location":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.ACCESS_FINE_LOCATION)) {
+                    LocationAPI.onReceive(context, data);
+                }
+                break;
+            case "MediaPlayer":
+                MediaPlayerAPI.onReceive(context, data);
+                break;
+            case "MediaScanner":
+                MediaScannerAPI.onReceive(context, data);
+                break;
+            case "MicRecorder":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.RECORD_AUDIO)) {
+                    MicRecorderAPI.onReceive(context, data);
+                }
+                break;
+            case "NotificationList":
+                ComponentName cn = new ComponentName(context, NotificationService.class);
+                String flat = Settings.Secure.getString(context.getContentResolver(), "enabled_notification_listeners");
+                final boolean NotificationServiceEnabled = flat != null && flat.contains(cn.flattenToString());
+                if (!NotificationServiceEnabled) {
+                    Toast.makeText(context, "Please give Termux:API Notification Access", Toast.LENGTH_LONG).show();
+                    context.startActivity(new Intent("android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS"));
+                } else {
+                    NotificationListAPI.onReceive(context);
+                }
+                break;
+            case "Notification":
+                NotificationAPI.onReceiveShowNotification(context, data);
+                break;
+            case "NotificationRemove":
+                NotificationAPI.onReceiveRemoveNotification(context, data);
+                break;
+            case "Sensor":
+                SensorAPI.onReceive(context, data);
+                break;
+            case "Share":
+                ShareAPI.onReceive(context, data);
+                break;
+            case "SmsInbox":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.READ_SMS, android.Manifest.permission.READ_CONTACTS)) {
+                    SmsInboxAPI.onReceive(context, data);
+                }
+                break;
+            case "SmsSend":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.SEND_SMS)) {
+                    SmsSendAPI.onReceive(context, data);
+                }
+                break;
+            case "StorageGet":
+                StorageGetAPI.onReceive(context, data);
+                break;
+            case "SpeechToText":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.RECORD_AUDIO)) {
+                    SpeechToTextAPI.onReceive(context, data);
+                }
+                break;
+            case "TelephonyCall":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.CALL_PHONE)) {
+                    TelephonyAPI.onReceiveTelephonyCall(context, data);
+                }
+                break;
+            case "TelephonyCellInfo":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.ACCESS_COARSE_LOCATION)) {
+                    TelephonyAPI.onReceiveTelephonyCellInfo(context);
+                }
+                break;
+            case "TelephonyDeviceInfo":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.READ_PHONE_STATE)) {
+                    TelephonyAPI.onReceiveTelephonyDeviceInfo(context);
+                }
+                break;
+            case "TextToSpeech":
+                TextToSpeechAPI.onReceive(context, data);
+                break;
+            case "Toast":
+                ToastAPI.onReceive(context, data);
+                break;
+            case "Torch":
+                TorchAPI.onReceive(context, data);
+                break;
+            case "Vibrate":
+                VibrateAPI.onReceive(context, data);
+                break;
+            case "Volume":
+                VolumeAPI.onReceive(context, data);
+                break;
+            case "Wallpaper":
+                WallpaperAPI.onReceive(context, data);
+                break;
+            case "WifiConnectionInfo":
+                WifiAPI.onReceiveWifiConnectionInfo(context);
+                break;
+            case "WifiScanInfo":
+                if (TermuxApiPermissionActivity.checkAndRequestPermissions(context, Manifest.permission.ACCESS_FINE_LOCATION)) {
+                    WifiAPI.onReceiveWifiScanInfo(context);
+                }
+                break;
+            case "WifiEnable":
+                WifiAPI.onReceiveWifiEnable(context, data);
+                break;
+            default:
+                TermuxApiLogger.error("Unrecognized 'api_method' extra: '" + apiMethod + "'");
+        }
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            String NOTIFICATION_CHANNEL_ID = "Termux-Notification";
+            String channelName = "Termux";
+            NotificationChannel chan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_NONE);
+
+            NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+            assert manager != null;
+            manager.createNotificationChannel(chan);
+
+            Notification.Builder builder = new Notification.Builder(this, NOTIFICATION_CHANNEL_ID)
+                    .setContentTitle(getString(R.string.app_name))
+                    .setOngoing(true)
+                    .setPriority(Notification.PRIORITY_MIN)
+                    .setCategory(Notification.CATEGORY_SERVICE)
+                    .setAutoCancel(true);
+
+            Notification notification = builder.build();
+            startForeground(1, notification);
+        } else {
+            NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
+                    .setContentTitle(getString(R.string.app_name))
+                    .setContentText("TERNYX")
+                    .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                    .setAutoCancel(true);
+            Notification notification = builder.build();
+            startForeground(1, notification);
+        }
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+}
diff --git a/app/src/main/java/com/termux/api/TextToSpeechAPI.java b/app/src/main/java/com/termux/api/TextToSpeechAPI.java
index 452eb5298..96e1e36ca 100644
--- a/app/src/main/java/com/termux/api/TextToSpeechAPI.java
+++ b/app/src/main/java/com/termux/api/TextToSpeechAPI.java
@@ -15,6 +15,8 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONObject;
+
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
@@ -25,8 +27,8 @@
 
 public class TextToSpeechAPI {
 
-    public static void onReceive(final Context context, Intent intent) {
-        context.startService(new Intent(context, TextToSpeechService.class).putExtras(intent.getExtras()));
+    public static void onReceive(final Context context, JSONObject opts) {
+        context.startService(new Intent(context, TextToSpeechService.class).putExtra("opts", opts.toString()));
     }
 
     public static class TextToSpeechService extends IntentService {
@@ -92,7 +94,7 @@ public void onInit(int status) {
                 }
             }, speechEngine);
 
-            ResultReturner.returnData(this, intent, new ResultReturner.WithInput() {
+            ResultReturner.returnData(this, new ResultReturner.WithInput() {
                 @Override
                 public void writeResult(PrintWriter out) {
 
diff --git a/app/src/main/java/com/termux/api/ToastAPI.java b/app/src/main/java/com/termux/api/ToastAPI.java
index 6b149410e..e2ebdeebb 100644
--- a/app/src/main/java/com/termux/api/ToastAPI.java
+++ b/app/src/main/java/com/termux/api/ToastAPI.java
@@ -13,19 +13,21 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONObject;
+
 import java.io.PrintWriter;
 
 public class ToastAPI {
 
-    public static void onReceive(final Context context, Intent intent) {
-        final int durationExtra = intent.getBooleanExtra("short", false) ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG;
-        final int backgroundColor = getColorExtra(intent, "background", Color.GRAY);
-        final int textColor = getColorExtra(intent, "text_color", Color.WHITE);
-        final int gravity = getGravityExtra(intent);
+    public static void onReceive(final Context context, JSONObject opts) {
+        final int durationExtra = opts.optBoolean("short", false) ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG;
+        final int backgroundColor = getColor(opts, "background", Color.GRAY);
+        final int textColor = getColor(opts, "text_color", Color.WHITE);
+        final int gravity = getGravity(opts);
 
         final Handler handler = new Handler();
 
-        ResultReturner.returnData(context, intent, new ResultReturner.WithStringInput() {
+        ResultReturner.returnData(context, new ResultReturner.WithStringInput() {
             @Override
             public void writeResult(PrintWriter out) {
                 handler.post(new Runnable() {
@@ -48,11 +50,11 @@ public void run() {
         });
     }
 
-    protected static int getColorExtra(Intent intent, String extra, int defaultColor) {
+    protected static int getColor(JSONObject opts, String extra, int defaultColor) {
         int color = defaultColor;
 
-        if (intent.hasExtra(extra)) {
-            String colorExtra = intent.getStringExtra(extra);
+        if (!opts.isNull(extra)) {
+            String colorExtra = opts.optString(extra);
 
             try {
                 color = Color.parseColor(colorExtra);
@@ -63,8 +65,8 @@ protected static int getColorExtra(Intent intent, String extra, int defaultColor
         return color;
     }
 
-    protected static int getGravityExtra(Intent intent) {
-        String extraGravity = intent.getStringExtra("gravity");
+    protected static int getGravity(JSONObject opts) {
+        String extraGravity = opts.optString("gravity");
 
         switch (extraGravity == null ? "" : extraGravity) {
             case "top": return Gravity.TOP;
@@ -74,4 +76,5 @@ protected static int getGravityExtra(Intent intent) {
         }
     }
 
+
 }
diff --git a/app/src/main/java/com/termux/api/TorchAPI.java b/app/src/main/java/com/termux/api/TorchAPI.java
index 4f9d9b707..492baee0e 100644
--- a/app/src/main/java/com/termux/api/TorchAPI.java
+++ b/app/src/main/java/com/termux/api/TorchAPI.java
@@ -13,13 +13,15 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONObject;
+
 public class TorchAPI {
     private static Camera legacyCamera;
 
 
     @TargetApi(Build.VERSION_CODES.M)
-    public static void onReceive(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        boolean enabled = intent.getBooleanExtra("enabled", false);
+    public static void onReceive(final Context context, final JSONObject opts) {
+        boolean enabled = opts.optBoolean("enabled", false);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             toggleTorch(context, enabled);
@@ -27,7 +29,7 @@ public static void onReceive(TermuxApiReceiver apiReceiver, final Context contex
             // use legacy api for pre-marshmallow
             legacyToggleTorch(enabled);
         }
-        ResultReturner.noteDone(apiReceiver, intent);
+        ResultReturner.noteDone(context);
     }
 
     @TargetApi(Build.VERSION_CODES.M)
diff --git a/app/src/main/java/com/termux/api/VibrateAPI.java b/app/src/main/java/com/termux/api/VibrateAPI.java
index 3c2cb88f5..bd049e48e 100644
--- a/app/src/main/java/com/termux/api/VibrateAPI.java
+++ b/app/src/main/java/com/termux/api/VibrateAPI.java
@@ -7,12 +7,14 @@
 
 import com.termux.api.util.ResultReturner;
 
+import org.json.JSONObject;
+
 public class VibrateAPI {
 
-    static void onReceive(TermuxApiReceiver apiReceiver, Context context, Intent intent) {
+    static void onReceive(Context context, JSONObject opts) {
         Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
-        int milliseconds = intent.getIntExtra("duration_ms", 1000);
-        boolean force = intent.getBooleanExtra("force", false);
+        int milliseconds = opts.optInt("duration_ms", 1000);
+        boolean force = opts.optBoolean("force", false);
 
         AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         if (am.getRingerMode() == AudioManager.RINGER_MODE_SILENT && !force) {
@@ -21,7 +23,7 @@ static void onReceive(TermuxApiReceiver apiReceiver, Context context, Intent int
             vibrator.vibrate(milliseconds);
         }
 
-        ResultReturner.noteDone(apiReceiver, intent);
+        ResultReturner.noteDone(context);
     }
 
 }
diff --git a/app/src/main/java/com/termux/api/VolumeAPI.java b/app/src/main/java/com/termux/api/VolumeAPI.java
index a9a4bec98..4d9b2460c 100644
--- a/app/src/main/java/com/termux/api/VolumeAPI.java
+++ b/app/src/main/java/com/termux/api/VolumeAPI.java
@@ -8,6 +8,8 @@
 
 import com.termux.api.util.ResultReturner;
 
+import org.json.JSONObject;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 
@@ -26,31 +28,32 @@ public class VolumeAPI {
     }
 
 
-    static void onReceive(final TermuxApiReceiver receiver, final Context context, final Intent intent) {
+    static void onReceive(final Context context, final JSONObject opts) {
         final AudioManager audioManager = (AudioManager)context.getSystemService(Context.AUDIO_SERVICE);
-        String action = intent.getAction();
+        String action = opts.optString("action");
 
         if ("set-volume".equals(action)) {
-            final String streamName = intent.getStringExtra("stream");
+            final String streamName = opts.optString("stream");
             final int stream = getAudioStream(streamName);
 
             if (stream == STREAM_UNKNOWN) {
                 String error = "ERROR: Unknown stream: " + streamName;
-                printError(context, intent, error);
+                printError(context, error);
             } else {
-                setStreamVolume(intent, audioManager, stream);
-                ResultReturner.noteDone(receiver, intent);
+                int volume = opts.optInt("volume", -1);
+                setStreamVolume(audioManager, stream, volume);
+                ResultReturner.noteDone(context);
             }
         } else {
-            printAllStreamInfo(context, intent, audioManager);
+            printAllStreamInfo(context, audioManager);
         }
     }
 
     /**
      * Prints error to console
      */
-    private static void printError(Context context, Intent intent, final String error) {
-        ResultReturner.returnData(context, intent, new ResultReturner.ResultWriter() {
+    private static void printError(Context context, final String error) {
+        ResultReturner.returnData(context, new ResultReturner.ResultWriter() {
             @Override
             public void writeResult(PrintWriter out) {
                 out.append(error + "\n");
@@ -63,10 +66,11 @@ public void writeResult(PrintWriter out) {
     /**
      * Set volume for the specified audio stream
      */
-    private static void setStreamVolume(Intent intent, AudioManager audioManager, int stream) {
-        int volume = intent.getIntExtra("volume", audioManager.getStreamVolume(stream));
+    private static void setStreamVolume(AudioManager audioManager, int stream, int volume ) {
         int maxVolume = audioManager.getStreamMaxVolume(stream);
-
+        if (volume == -1 ){
+            volume = audioManager.getStreamVolume(stream);
+        }
         if (volume <= 0) {
             volume = 0;
         } else if (volume >= maxVolume) {
@@ -78,8 +82,8 @@ private static void setStreamVolume(Intent intent, AudioManager audioManager, in
     /**
      * Print information about all available audio streams
      */
-    private static void printAllStreamInfo(Context context, Intent intent, final AudioManager audioManager) {
-        ResultReturner.returnData(context, intent, new ResultReturner.ResultJsonWriter() {
+    private static void printAllStreamInfo(Context context, final AudioManager audioManager) {
+        ResultReturner.returnData(context, new ResultReturner.ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws Exception {
                 getStreamsInfo(audioManager, out);
diff --git a/app/src/main/java/com/termux/api/WallpaperAPI.java b/app/src/main/java/com/termux/api/WallpaperAPI.java
index dc481adef..c96f29392 100644
--- a/app/src/main/java/com/termux/api/WallpaperAPI.java
+++ b/app/src/main/java/com/termux/api/WallpaperAPI.java
@@ -12,6 +12,8 @@
 import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 
+import org.json.JSONObject;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -26,9 +28,9 @@
 
 public class WallpaperAPI {
 
-    static void onReceive(final Context context, final Intent intent) {
+    static void onReceive(final Context context, JSONObject opts) {
         Intent wallpaperService = new Intent(context, WallpaperService.class);
-        wallpaperService.putExtras(intent.getExtras());
+        wallpaperService.putExtra("opts", opts.toString());
         context.startService(wallpaperService);
     }
 
@@ -49,7 +51,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             } else {
                 WallpaperResult result = new WallpaperResult();
                 result.error = "No args supplied for WallpaperAPI!";
-                postWallpaperResult(getApplicationContext(), intent, result);
+                postWallpaperResult(getApplicationContext(), result);
             }
 
             return Service.START_NOT_STICKY;
@@ -133,11 +135,11 @@ protected void onWallpaperResult(final Intent intent, WallpaperResult result) {
                     result.error = "Error setting wallpaper: " + e.getMessage();
                 }
             }
-            postWallpaperResult(context, intent, result);
+            postWallpaperResult(context, result);
         }
 
-        protected void postWallpaperResult(final Context context, final Intent intent, final WallpaperResult result) {
-            ResultReturner.returnData(context, intent, new ResultReturner.ResultWriter() {
+        protected void postWallpaperResult(final Context context, final WallpaperResult result) {
+            ResultReturner.returnData(context, new ResultReturner.ResultWriter() {
                 @Override
                 public void writeResult(PrintWriter out) {
                     out.append(result.message + "\n");
diff --git a/app/src/main/java/com/termux/api/WifiAPI.java b/app/src/main/java/com/termux/api/WifiAPI.java
index 8efe3dfa4..809c661fb 100644
--- a/app/src/main/java/com/termux/api/WifiAPI.java
+++ b/app/src/main/java/com/termux/api/WifiAPI.java
@@ -14,12 +14,14 @@
 
 import com.termux.api.util.ResultReturner;
 
+import org.json.JSONObject;
+
 import java.util.List;
 
 public class WifiAPI {
 
-    static void onReceiveWifiConnectionInfo(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultJsonWriter() {
+    static void onReceiveWifiConnectionInfo(final Context context) {
+        ResultReturner.returnData(context, new ResultReturner.ResultJsonWriter() {
             @SuppressLint("HardwareIds")
             @Override
             public void writeJson(JsonWriter out) throws Exception {
@@ -51,8 +53,8 @@ static boolean isLocationEnabled(Context context) {
         return lm.isProviderEnabled(LocationManager.GPS_PROVIDER);
     }
 
-    static void onReceiveWifiScanInfo(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultJsonWriter() {
+    static void onReceiveWifiScanInfo(final Context context) {
+        ResultReturner.returnData(context, new ResultReturner.ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws Exception {
                 WifiManager manager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
@@ -114,12 +116,12 @@ public void writeJson(JsonWriter out) throws Exception {
         });
     }
 
-    static void onReceiveWifiEnable(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
-        ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultJsonWriter() {
+    static void onReceiveWifiEnable(final Context context, final JSONObject opts) {
+        ResultReturner.returnData(context, new ResultReturner.ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) {
                 WifiManager manager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-                boolean state = intent.getBooleanExtra("enabled", false);
+                boolean state = opts.optBoolean("enabled", false);
                 manager.setWifiEnabled(state);
             }
         });
diff --git a/app/src/main/java/com/termux/api/util/ResultReturner.java b/app/src/main/java/com/termux/api/util/ResultReturner.java
index ec57d8f4e..72f870988 100644
--- a/app/src/main/java/com/termux/api/util/ResultReturner.java
+++ b/app/src/main/java/com/termux/api/util/ResultReturner.java
@@ -4,6 +4,7 @@
 import android.app.IntentService;
 import android.content.BroadcastReceiver;
 import android.content.BroadcastReceiver.PendingResult;
+import android.content.Context;
 import android.content.Intent;
 import android.net.LocalSocket;
 import android.net.LocalSocketAddress;
@@ -17,16 +18,15 @@
 public abstract class ResultReturner {
 
     /**
-     * An extra intent parameter which specifies a linux abstract namespace socket address where output from the API
+     * String which specifies a linux abstract namespace socket address where output from the API
      * call should be written.
      */
-    private static final String SOCKET_OUTPUT_EXTRA = "socket_output";
-
+    private static final String SOCKET_OUTPUT_ADDRESS = "termux-output";
     /**
-     * An extra intent parameter which specifies a linux abstract namespace socket address where input to the API call
+     * String which specifies a linux abstract namespace socket address where input to the API call
      * can be read from.
      */
-    private static final String SOCKET_INPUT_EXTRA = "socket_input";
+    private static final String SOCKET_INPUT_ADDRESS = "termux-input";
 
     public interface ResultWriter {
         void writeResult(PrintWriter out) throws Exception;
@@ -81,21 +81,14 @@ public final void writeResult(PrintWriter out) throws Exception {
     /**
      * Just tell termux-api.c that we are done.
      */
-    public static void noteDone(BroadcastReceiver receiver, final Intent intent) {
-        returnData(receiver, intent, null);
-    }
-
-    public static void copyIntentExtras(Intent origIntent, Intent newIntent) {
-        newIntent.putExtra("api_method", origIntent.getStringExtra("api_method"));
-        newIntent.putExtra(SOCKET_OUTPUT_EXTRA, origIntent.getStringExtra(SOCKET_OUTPUT_EXTRA));
-        newIntent.putExtra(SOCKET_INPUT_EXTRA, origIntent.getStringExtra(SOCKET_INPUT_EXTRA));
-
+    public static void noteDone(Context context) {
+        returnData(context,null);
     }
 
     /**
      * Run in a separate thread, unless the context is an IntentService.
      */
-    public static void returnData(Object context, final Intent intent, final ResultWriter resultWriter) {
+    public static void returnData(Object context, final ResultWriter resultWriter) {
         final PendingResult asyncResult = (context instanceof BroadcastReceiver) ? ((BroadcastReceiver) context)
                 .goAsync() : null;
         final Activity activity = (Activity) ((context instanceof Activity) ? context : null);
@@ -105,13 +98,13 @@ public static void returnData(Object context, final Intent intent, final ResultW
             public void run() {
                 try {
                     try (LocalSocket outputSocket = new LocalSocket()) {
-                        String outputSocketAdress = intent.getStringExtra(SOCKET_OUTPUT_EXTRA);
+                        String outputSocketAdress = SOCKET_OUTPUT_ADDRESS;
                         outputSocket.connect(new LocalSocketAddress(outputSocketAdress));
                         try (PrintWriter writer = new PrintWriter(outputSocket.getOutputStream())) {
                             if (resultWriter != null) {
                                 if (resultWriter instanceof WithInput) {
                                     try (LocalSocket inputSocket = new LocalSocket()) {
-                                        String inputSocketAdress = intent.getStringExtra(SOCKET_INPUT_EXTRA);
+                                        String inputSocketAdress = SOCKET_INPUT_ADDRESS;
                                         inputSocket.connect(new LocalSocketAddress(inputSocketAdress));
                                         ((WithInput) resultWriter).setInput(inputSocket.getInputStream());
                                         resultWriter.writeResult(writer);
diff --git a/app/src/main/java/com/termux/api/util/TermuxApiPermissionActivity.java b/app/src/main/java/com/termux/api/util/TermuxApiPermissionActivity.java
index d789e415d..ca661faae 100644
--- a/app/src/main/java/com/termux/api/util/TermuxApiPermissionActivity.java
+++ b/app/src/main/java/com/termux/api/util/TermuxApiPermissionActivity.java
@@ -23,7 +23,7 @@ public class TermuxApiPermissionActivity extends Activity {
      *
      * @return if all permissions were already granted
      */
-    public static boolean checkAndRequestPermissions(Context context, Intent intent, String... permissions) {
+    public static boolean checkAndRequestPermissions(Context context, String... permissions) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             final ArrayList<String> permissionsToRequest = new ArrayList<>();
             for (String permission : permissions) {
@@ -35,7 +35,7 @@ public static boolean checkAndRequestPermissions(Context context, Intent intent,
             if (permissionsToRequest.isEmpty()) {
                 return true;
             } else {
-                ResultReturner.returnData(context, intent, new ResultReturner.ResultJsonWriter() {
+                ResultReturner.returnData(context, new ResultReturner.ResultJsonWriter() {
                     @Override
                     public void writeJson(JsonWriter out) throws Exception {
                         String errorMessage = "Please grant the following permission"
@@ -49,7 +49,7 @@ public void writeJson(JsonWriter out) throws Exception {
                 Intent startIntent = new Intent(context, TermuxApiPermissionActivity.class)
                         .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                         .putStringArrayListExtra(TermuxApiPermissionActivity.PERMISSIONS_EXTRA, permissionsToRequest);
-                ResultReturner.copyIntentExtras(intent, startIntent);
+                //ResultReturner.copyIntentExtras(intent, startIntent);
                 context.startActivity(startIntent);
                 return false;
             }
diff --git a/build.gradle b/build.gradle
index 2bf6a4e7d..caad3dd8b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.3.0-alpha08'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 16d28051c..822adf846 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sat Nov 17 13:35:29 GMT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

From 82f4e953885fb4b853a0390e31d38b7ca1b01c7b Mon Sep 17 00:00:00 2001
From: Kieran Coldron <kieran@coldron.com>
Date: Sat, 17 Nov 2018 21:02:02 +0000
Subject: [PATCH 2/5] rewrite socket recieve

---
 .../java/com/termux/api/NotificationAPI.java  | 13 +--
 .../com/termux/api/NotificationListAPI.java   | 87 +++++++++----------
 .../java/com/termux/api/TermuxApiService.java | 22 ++---
 3 files changed, 59 insertions(+), 63 deletions(-)

diff --git a/app/src/main/java/com/termux/api/NotificationAPI.java b/app/src/main/java/com/termux/api/NotificationAPI.java
index fae7fd5ba..a3b98674f 100644
--- a/app/src/main/java/com/termux/api/NotificationAPI.java
+++ b/app/src/main/java/com/termux/api/NotificationAPI.java
@@ -62,7 +62,7 @@ static void onReceiveShowNotification(final Context context, JSONObject opts) {
 
         String title = opts.optString("title");
 
-        String lightsArgbExtra = opts.optString("led-color");
+        String lightsArgbExtra = opts.optString("led-color", null);
 
         int ledColor = 0;
 
@@ -79,10 +79,13 @@ static void onReceiveShowNotification(final Context context, JSONObject opts) {
 
 
         JSONArray vibratePatternJson = opts.optJSONArray("vibrate");
-        long[] vibratePattern = new long[vibratePatternJson.length()];
+        long[] vibratePattern = null;
+        if(vibratePatternJson != null) {
+            vibratePattern = new long[vibratePatternJson.length()];
 
-        for(int i = 0; i < vibratePatternJson.length(); i++){
-            vibratePattern[i] = vibratePatternJson.optLong(i);
+            for (int i = 0; i < vibratePatternJson.length(); i++) {
+                vibratePattern[i] = vibratePatternJson.optLong(i);
+            }
         }
 
         boolean useSound = opts.optBoolean("sound", false);
@@ -91,7 +94,7 @@ static void onReceiveShowNotification(final Context context, JSONObject opts) {
 
         String actionExtra = opts.optString("action");
 
-        String id = opts.optString("id");
+        String id = opts.optString("id", null);
         if (id == null) id = UUID.randomUUID().toString();
         final String notificationId = id;
 
diff --git a/app/src/main/java/com/termux/api/NotificationListAPI.java b/app/src/main/java/com/termux/api/NotificationListAPI.java
index 5ad637fd5..b048ca37a 100644
--- a/app/src/main/java/com/termux/api/NotificationListAPI.java
+++ b/app/src/main/java/com/termux/api/NotificationListAPI.java
@@ -17,53 +17,50 @@ public static void onReceive(final Context context) {
         ResultReturner.returnData(context, new ResultJsonWriter() {
             @Override
             public void writeJson(JsonWriter out) throws Exception {
-                listNotifications(context, out);
+                NotificationService notificationService = NotificationService.get();
+                StatusBarNotification[] notifications = notificationService.getActiveNotifications();
+
+                out.beginArray();
+                for (StatusBarNotification n : notifications) {
+                    int id = n.getId();
+                    String key = "";
+                    String title = "";
+                    String text = "";
+                    String packageName = "";
+                    String tag = "";
+                    String group = "";
+
+                    if (n.getNotification().extras.getCharSequence(Notification.EXTRA_TITLE) != null) {
+                        title = n.getNotification().extras.getCharSequence(Notification.EXTRA_TITLE).toString();
+                    }
+                    if (n.getNotification().extras.getCharSequence(Notification.EXTRA_TEXT) != null) {
+                        text = n.getNotification().extras.getCharSequence(Notification.EXTRA_TEXT).toString();
+                    }
+                    if (n.getTag() != null) {
+                        tag = n.getTag();
+                    }
+                    if (n.getNotification().getGroup() != null) {
+                        group = n.getNotification().getGroup();
+                    }
+                    if (n.getKey() != null) {
+                        key = n.getKey();
+                    }
+                    if (n.getPackageName() != null) {
+                        packageName = n.getPackageName();
+                    }
+                    out.beginObject()
+                            .name("id").value(id)
+                            .name("tag").value(tag)
+                            .name("key").value(key)
+                            .name("group").value(group)
+                            .name("packageName").value(packageName)
+                            .name("title").value(title)
+                            .name("content").value(text).endObject();
+                }
+                out.endArray();
             }
         });
     }
+}
 
 
-    static void listNotifications(Context context, JsonWriter out) throws Exception {
-        NotificationService notificationService = NotificationService.get();
-        StatusBarNotification[] notifications = notificationService.getActiveNotifications();
-
-        out.beginArray();
-        for (StatusBarNotification n : notifications) {
-            int id = n.getId();
-            String key = "";
-            String title = "";
-            String text = "";
-            String packageName = "";
-            String tag = "";
-            String group = "";
-
-            if (n.getNotification().extras.getCharSequence(Notification.EXTRA_TITLE) != null) {
-                title = n.getNotification().extras.getCharSequence(Notification.EXTRA_TITLE).toString();
-            }
-            if (n.getNotification().extras.getCharSequence(Notification.EXTRA_TEXT) != null) {
-                text = n.getNotification().extras.getCharSequence(Notification.EXTRA_TEXT).toString();
-            }
-            if (n.getTag() != null) {
-                tag = n.getTag();
-            }
-            if (n.getNotification().getGroup() != null) {
-                group = n.getNotification().getGroup();
-            }
-            if (n.getKey() != null) {
-                key = n.getKey();
-            }
-            if (n.getPackageName() != null) {
-                packageName = n.getPackageName();
-            }
-            out.beginObject()
-                    .name("id").value(id)
-                    .name("tag").value(tag)
-                    .name("key").value(key)
-                    .name("group").value(group)
-                    .name("packageName").value(packageName)
-                    .name("title").value(title)
-                    .name("content").value(text).endObject();
-        }
-        out.endArray();
-        }
-    }
diff --git a/app/src/main/java/com/termux/api/TermuxApiService.java b/app/src/main/java/com/termux/api/TermuxApiService.java
index 32eceec58..0a63ba252 100644
--- a/app/src/main/java/com/termux/api/TermuxApiService.java
+++ b/app/src/main/java/com/termux/api/TermuxApiService.java
@@ -24,8 +24,10 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 
 public class TermuxApiService extends Service {
     private static final String CHANNEL_ID = "termux-notification";
@@ -43,26 +45,20 @@ public void onCreate() {
         final Runnable runnable = new Runnable() {
             @Override
             public void run() {
+                String recievedData;
                 while (true) {
                     try (LocalServerSocket inputSocket = new LocalServerSocket(SOCKET_INPUT_ADDRESS)) {
                         LocalSocket receiver = inputSocket.accept();
                         if (receiver != null) {
                             InputStream input = receiver.getInputStream();
-                            int readed = input.read();
-                            int size = 0;
-                            int capacity = 0;
-                            byte[] bytes = new byte[capacity];
 
-                            while (readed != -1) {
-                                capacity = (capacity * 3) / 2 + 1;
-                                byte[] copy = new byte[capacity];
-                                System.arraycopy(bytes, 0, copy, 0, bytes.length);
-                                bytes = copy;
-                                bytes[size++] = (byte) readed;
-                                readed = input.read();
+                            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                            byte[] buffer = new byte[1024];
+                            int l;
+                            while ((l = input.read(buffer)) > 0) {
+                                baos.write(buffer, 0, l);
                             }
-
-                            String recievedData = new String(bytes, 0, size);
+                            recievedData = new String(baos.toByteArray(), StandardCharsets.UTF_8);
                             receiver.close();
                             Log.d("DERP", "onStartCommand: " + recievedData);
                             JSONObject data = new JSONObject(recievedData);

From 39b62d4a2280025287cb57a98d7f050990cbeb9e Mon Sep 17 00:00:00 2001
From: Kieran Coldron <kieran@coldron.com>
Date: Sat, 17 Nov 2018 21:02:13 +0000
Subject: [PATCH 3/5] remove derp

---
 app/src/main/java/com/termux/api/TermuxApiService.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/termux/api/TermuxApiService.java b/app/src/main/java/com/termux/api/TermuxApiService.java
index 0a63ba252..cd719ef66 100644
--- a/app/src/main/java/com/termux/api/TermuxApiService.java
+++ b/app/src/main/java/com/termux/api/TermuxApiService.java
@@ -60,7 +60,6 @@ public void run() {
                             }
                             recievedData = new String(baos.toByteArray(), StandardCharsets.UTF_8);
                             receiver.close();
-                            Log.d("DERP", "onStartCommand: " + recievedData);
                             JSONObject data = new JSONObject(recievedData);
                             runApiMethod(getApplicationContext(), data);
                         }

From dd59d48433a2e4853ef04906d603be9b40c9b14b Mon Sep 17 00:00:00 2001
From: Kieran Coldron <kieran@coldron.com>
Date: Mon, 19 Nov 2018 22:03:49 +0000
Subject: [PATCH 4/5] fix ToastAPI

---
 app/src/main/AndroidManifest.xml                 |  1 -
 .../java/com/termux/api/TermuxApiService.java    | 11 ++++-------
 app/src/main/java/com/termux/api/ToastAPI.java   | 16 +++++++---------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dd1a50ac1..dee2d06f1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,7 +43,6 @@
     <permission android:name="com.termux.sharedfiles.READ" android:protectionLevel="signature" />
 
     <application
-        android:largeHeap="true"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
diff --git a/app/src/main/java/com/termux/api/TermuxApiService.java b/app/src/main/java/com/termux/api/TermuxApiService.java
index cd719ef66..3f0f2b523 100644
--- a/app/src/main/java/com/termux/api/TermuxApiService.java
+++ b/app/src/main/java/com/termux/api/TermuxApiService.java
@@ -30,9 +30,6 @@
 import java.nio.charset.StandardCharsets;
 
 public class TermuxApiService extends Service {
-    private static final String CHANNEL_ID = "termux-notification";
-    private static final String CHANNEL_TITLE = "Termux API notification channel";
-
     public IBinder onBind(Intent intent) {
         return null;
     }
@@ -45,7 +42,7 @@ public void onCreate() {
         final Runnable runnable = new Runnable() {
             @Override
             public void run() {
-                String recievedData;
+                String receivedData;
                 while (true) {
                     try (LocalServerSocket inputSocket = new LocalServerSocket(SOCKET_INPUT_ADDRESS)) {
                         LocalSocket receiver = inputSocket.accept();
@@ -58,9 +55,9 @@ public void run() {
                             while ((l = input.read(buffer)) > 0) {
                                 baos.write(buffer, 0, l);
                             }
-                            recievedData = new String(baos.toByteArray(), StandardCharsets.UTF_8);
+                            receivedData = new String(baos.toByteArray(), StandardCharsets.UTF_8);
                             receiver.close();
-                            JSONObject data = new JSONObject(recievedData);
+                            JSONObject data = new JSONObject(receivedData);
                             runApiMethod(getApplicationContext(), data);
                         }
                     } catch(IOException e){
@@ -277,7 +274,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         } else {
             NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
                     .setContentTitle(getString(R.string.app_name))
-                    .setContentText("TERNYX")
+                    .setContentText("Termux")
                     .setPriority(NotificationCompat.PRIORITY_DEFAULT)
                     .setAutoCancel(true);
             Notification notification = builder.build();
diff --git a/app/src/main/java/com/termux/api/ToastAPI.java b/app/src/main/java/com/termux/api/ToastAPI.java
index e2ebdeebb..33b035e38 100644
--- a/app/src/main/java/com/termux/api/ToastAPI.java
+++ b/app/src/main/java/com/termux/api/ToastAPI.java
@@ -5,6 +5,8 @@
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
+import android.os.Looper;
+import android.support.v7.app.AppCompatActivity;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.TextView;
@@ -17,23 +19,20 @@
 
 import java.io.PrintWriter;
 
-public class ToastAPI {
-
+public class ToastAPI extends AppCompatActivity {
     public static void onReceive(final Context context, JSONObject opts) {
         final int durationExtra = opts.optBoolean("short", false) ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG;
         final int backgroundColor = getColor(opts, "background", Color.GRAY);
         final int textColor = getColor(opts, "text_color", Color.WHITE);
         final int gravity = getGravity(opts);
+        final String text = opts.optString("text");
 
-        final Handler handler = new Handler();
+        final Handler handler = new Handler(Looper.getMainLooper());
 
-        ResultReturner.returnData(context, new ResultReturner.WithStringInput() {
-            @Override
-            public void writeResult(PrintWriter out) {
                 handler.post(new Runnable() {
                     @Override
                     public void run() {
-                        Toast toast = Toast.makeText(context, inputString, durationExtra);
+                        Toast toast = Toast.makeText(context, text, durationExtra);
                         View toastView = toast.getView();
 
                         Drawable background = toastView.getBackground();
@@ -44,10 +43,9 @@ public void run() {
 
                         toast.setGravity(gravity, 0, 0);
                         toast.show();
+                        ResultReturner.noteDone(context);
                     }
                 });
-            }
-        });
     }
 
     protected static int getColor(JSONObject opts, String extra, int defaultColor) {

From 5de2a4a2d53220bcb21bfbef7ef49c89a94068eb Mon Sep 17 00:00:00 2001
From: Kieran Coldron <kieran@coldron.com>
Date: Mon, 19 Nov 2018 22:41:54 +0000
Subject: [PATCH 5/5] fix toasts in Service, fix notifcations

---
 .../java/com/termux/api/NotificationAPI.java  | 48 +++++++++----------
 .../java/com/termux/api/TermuxApiService.java |  6 ++-
 .../main/java/com/termux/api/ToastAPI.java    | 40 ++++++++++------
 3 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/com/termux/api/NotificationAPI.java b/app/src/main/java/com/termux/api/NotificationAPI.java
index a3b98674f..89ade5352 100644
--- a/app/src/main/java/com/termux/api/NotificationAPI.java
+++ b/app/src/main/java/com/termux/api/NotificationAPI.java
@@ -61,6 +61,7 @@ static void onReceiveShowNotification(final Context context, JSONObject opts) {
         }
 
         String title = opts.optString("title");
+        String content = opts.optString("content");
 
         String lightsArgbExtra = opts.optString("led-color", null);
 
@@ -111,7 +112,7 @@ static void onReceiveShowNotification(final Context context, JSONObject opts) {
 
 
 
-        String ImagePath = opts.optString("image-path");
+        String ImagePath = opts.optString("image-path", null);
 
         if(ImagePath != null){
             File imgFile = new  File(ImagePath);
@@ -191,31 +192,28 @@ static void onReceiveShowNotification(final Context context, JSONObject opts) {
             notification.setDeleteIntent(pi);
         }
 
-        ResultReturner.returnData(context, new ResultReturner.WithStringInput() {
-            @Override
-            public void writeResult(PrintWriter out) {
-                NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-
-                if (!TextUtils.isEmpty(inputString)) {
-                    if (inputString.contains("\n")) {
-                        Notification.BigTextStyle style = new Notification.BigTextStyle();
-                        style.bigText(inputString);
-                        notification.setStyle(style);
-                    } else {
-                        notification.setContentText(inputString);
-                    }
-                }
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    NotificationChannel channel = new NotificationChannel(CHANNEL_ID,
-                            CHANNEL_TITLE, NotificationManager.IMPORTANCE_DEFAULT);
-                    manager.createNotificationChannel(channel);
-                    notification.setChannelId(CHANNEL_ID);
-                }
-
-                manager.notify(notificationId, 0, notification.build());
+        NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+        if (!TextUtils.isEmpty(content)) {
+            if (content.contains("\n")) {
+                Notification.BigTextStyle style = new Notification.BigTextStyle();
+                style.bigText(content);
+                notification.setStyle(style);
+            } else {
+                notification.setContentText(content);
             }
-        });
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationChannel channel = new NotificationChannel(CHANNEL_ID,
+                    CHANNEL_TITLE, NotificationManager.IMPORTANCE_DEFAULT);
+            manager.createNotificationChannel(channel);
+            notification.setChannelId(CHANNEL_ID);
+        }
+
+        manager.notify(notificationId, 0, notification.build());
+        ResultReturner.noteDone(context);
+
     }
 
     static void onReceiveRemoveNotification(final Context context, JSONObject opts) {
diff --git a/app/src/main/java/com/termux/api/TermuxApiService.java b/app/src/main/java/com/termux/api/TermuxApiService.java
index 3f0f2b523..9a5495c27 100644
--- a/app/src/main/java/com/termux/api/TermuxApiService.java
+++ b/app/src/main/java/com/termux/api/TermuxApiService.java
@@ -18,6 +18,7 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import com.termux.api.util.ResultReturner;
 import com.termux.api.util.TermuxApiLogger;
 import com.termux.api.util.TermuxApiPermissionActivity;
 
@@ -92,7 +93,7 @@ public void runApiMethod(final Context context, JSONObject data) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                     if (!Settings.System.canWrite(context)) {
                         TermuxApiPermissionActivity.checkAndRequestPermissions(context, android.Manifest.permission.WRITE_SETTINGS);
-                        Toast.makeText(context, "Please enable permission for Termux:API", Toast.LENGTH_LONG).show();
+                        ToastAPI.makeText(context, "Please enable permission for Termux:API", Toast.LENGTH_LONG);
 
                         //user must enable WRITE_SETTINGS permission this special way
                         Intent settingsIntent = new Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS);
@@ -166,8 +167,9 @@ public void runApiMethod(final Context context, JSONObject data) {
                 String flat = Settings.Secure.getString(context.getContentResolver(), "enabled_notification_listeners");
                 final boolean NotificationServiceEnabled = flat != null && flat.contains(cn.flattenToString());
                 if (!NotificationServiceEnabled) {
-                    Toast.makeText(context, "Please give Termux:API Notification Access", Toast.LENGTH_LONG).show();
+                    ToastAPI.makeText(context, "Please give Termux:API Notification Access", Toast.LENGTH_LONG);
                     context.startActivity(new Intent("android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS"));
+                    ResultReturner.noteDone(context);
                 } else {
                     NotificationListAPI.onReceive(context);
                 }
diff --git a/app/src/main/java/com/termux/api/ToastAPI.java b/app/src/main/java/com/termux/api/ToastAPI.java
index 33b035e38..b6672acb6 100644
--- a/app/src/main/java/com/termux/api/ToastAPI.java
+++ b/app/src/main/java/com/termux/api/ToastAPI.java
@@ -27,25 +27,37 @@ public static void onReceive(final Context context, JSONObject opts) {
         final int gravity = getGravity(opts);
         final String text = opts.optString("text");
 
+        makeToast(context, durationExtra, backgroundColor, textColor, gravity, text);
+        ResultReturner.noteDone(context);
+    }
+
+    static void makeText(final Context context, final String text, final int durationExtra) {
+        final int backgroundColor = Color.GRAY;
+        final int textColor = Color.WHITE;
+        final int gravity = Gravity.BOTTOM;
+        makeToast(context, durationExtra, backgroundColor, textColor, gravity, text);
+    }
+
+        static void makeToast(final Context context, final int durationExtra, final int backgroundColor, final int textColor, final int gravity, final String text) {
         final Handler handler = new Handler(Looper.getMainLooper());
 
-                handler.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        Toast toast = Toast.makeText(context, text, durationExtra);
-                        View toastView = toast.getView();
+        handler.post(new Runnable() {
+            @Override
+            public void run() {
+                Toast toast = Toast.makeText(context, text, durationExtra);
+                View toastView = toast.getView();
+
+                Drawable background = toastView.getBackground();
+                background.setTint(backgroundColor);
 
-                        Drawable background = toastView.getBackground();
-                        background.setTint(backgroundColor);
+                TextView textView = toastView.findViewById(android.R.id.message);
+                textView.setTextColor(textColor);
 
-                        TextView textView = toastView.findViewById(android.R.id.message);
-                        textView.setTextColor(textColor);
+                toast.setGravity(gravity, 0, 0);
+                toast.show();
+            }
+        });
 
-                        toast.setGravity(gravity, 0, 0);
-                        toast.show();
-                        ResultReturner.noteDone(context);
-                    }
-                });
     }
 
     protected static int getColor(JSONObject opts, String extra, int defaultColor) {