Added modular capability

Added shortcut methods for sending strings
Added wrappers for hid_keyboard and hid_mouse devices
Added listeners for keyboard lights
Bugfixes

Author: Netdex

app/src/main/java/cf/netdex/hidfuzzer/FuzzerTask.java

@@ -1,35 +1,51 @@
 package cf.netdex.hidfuzzer;
 
-import android.content.DialogInterface;
+import android.content.Context;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.widget.CompoundButton;
+import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.ToggleButton;
 
+import cf.netdex.hidfuzzer.hid.HID;
+import cf.netdex.hidfuzzer.task.FuzzerTask;
+import cf.netdex.hidfuzzer.task.HIDTask;
+import cf.netdex.hidfuzzer.task.TestTask;
+import cf.netdex.hidfuzzer.util.Func;
+
 public class MainActivity extends AppCompatActivity {
 
     public static String TAG = "tag_hidfuzzer";
-    private FuzzerTask RUNNING_TASK;
+    private HIDTask RUNNING_TASK;
 
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
         final TextView txtStatus = (TextView) findViewById(R.id.txtStatus);
         final ToggleButton btnPoll = (ToggleButton) findViewById(R.id.btnPoll);
+        final Spinner spnTask = (Spinner) findViewById(R.id.spnTask);
+
+        final Func<HIDTask.RunState> updatef = new Func<HIDTask.RunState>() {
+            @Override
+            public void run(HIDTask.RunState... s) {
+                txtStatus.setText(s[0].name());
+            }
+        };
         btnPoll.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (isChecked) {
-                    RUNNING_TASK = new FuzzerTask(MainActivity.this) {
-                        @Override
-                        protected void onProgressUpdate(FuzzState... s) {
-                            super.onProgressUpdate(s);
-                            txtStatus.setText(s[0].name());
-                        }
-                    };
+                    String stask = (String) spnTask.getSelectedItem();
+                    switch(stask){
+                        case "Fuzzer":
+                            RUNNING_TASK = new FuzzerTask(MainActivity.this, updatef);
+                            break;
+                        case "Test":
+                            RUNNING_TASK = new TestTask(MainActivity.this, updatef);
+                            break;
+                    }
                     RUNNING_TASK.execute();
                 } else {
                     if (RUNNING_TASK != null)

app/src/main/java/cf/netdex/hidfuzzer/MainActivity.java

@@ -1,4 +1,6 @@
-package cf.netdex.hidfuzzer;
+package cf.netdex.hidfuzzer.hid;
+
+import android.util.Log;
 
 import java.util.concurrent.CountDownLatch;
 
@@ -8,25 +10,48 @@
  * Created by netdex on 1/15/2017.
  */
 
-class HID {
-    static int hid_mouse(Shell.Interactive sh, String dev, byte... offset) {
+public class HID {
+    /**
+     * A        B        C        D
+     * XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX
+     * <p>
+     * A: Mouse button mask
+     * B: Mouse X-offset
+     * C: Mouse Y-offset
+     * D: Mouse wheel offset
+     *
+     * @param sh     SU shell
+     * @param dev    Mouse device (/dev/hidg1)
+     * @param offset HID mouse bytes
+     * @return error code
+     */
+    public static int hid_mouse(Shell.Interactive sh, String dev, byte... offset) {
         if (offset.length > 4)
             throw new IllegalArgumentException("Your mouse can only move in two dimensions");
-        // for some odd reason, 4-byte padding is required
-        byte[] buf = new byte[8];
+        byte[] buf = new byte[4];
         System.arraycopy(offset, 0, buf, 0, offset.length);
         return write_bytes(sh, dev, buf);
     }
 
-
-    static int hid_keyboard(Shell.Interactive sh, String dev, byte... keys) {
-        if (keys.length > 8)
-            throw new IllegalArgumentException("Cannot send more than 7 keys");
-        // for some odd reason, every odd byte has to be blank
-        byte[] buf = new byte[16];
-        for (int i = 0; i < keys.length; i++) {
-            buf[2 * i] = keys[i];
-        }
+    /**
+     * A        B        C        D        E        F        G        H
+     * XXXXXXXX 00000000 XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX
+     * <p>
+     * A: Key modifier mask
+     * B: Reserved
+     * C: Key 1; D: Key 2; E: Key 3; F: Key 4; G: Key 5; H: Key 6;
+     *
+     * @param sh   SU shell
+     * @param dev  Keyboard device (/dev/hidg0)
+     * @param keys HID keyboard bytes
+     * @return error code
+     */
+    public static int hid_keyboard(Shell.Interactive sh, String dev, byte... keys) {
+        if (keys.length > 7)
+            throw new IllegalArgumentException("Cannot send more than 6 keys");
+        byte[] buf = new byte[8];
+        if (keys.length > 0) buf[0] = keys[0];
+        if (keys.length > 1) System.arraycopy(keys, 1, buf, 2, keys.length - 1);
         return write_bytes(sh, dev, buf);
     }
 
@@ -39,7 +64,8 @@ private static int write_bytes(Shell.Interactive sh, String dev, byte[] arr) {
         try {
             // run echo command to write to device as root
             final CountDownLatch latch = new CountDownLatch(1);
-            String c = String.format("echo -n -e \"%s\" > %s", bt, dev);
+            String c = "echo -n -e \"" + bt + "\" > " + dev;
+//            Log.d("A", c);
             sh.addCommand(c, 0, new Shell.OnCommandLineListener() {
                 @Override
                 public void onLine(String line) {
@@ -73,4 +99,6 @@ private static String escapeBytes(byte[] arr) {
         }
         return sb.toString();
     }
+
+
 }