version 1.6

app/build.gradle

@@ -9,16 +9,15 @@ android {
         targetCompatibility '1.8'
     }
 
-
     defaultConfig {
         applicationId "m2g.mine2gether.androidminer"
         minSdkVersion 19
         targetSdkVersion 26
         versionCode 1
-        versionName "1.5.1"
+        versionName "1.6"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
+
     buildTypes {
         release {
             minifyEnabled false

app/src/main/assets/ninjarig/config.json

@@ -0,0 +1,42 @@
+{
+    "algo": "$algo$",
+    "api": {
+        "port": 10000,
+        "access-token": null,
+        "id": null,
+        "worker-id": null,
+        "ipv6": false,
+        "restricted": true
+    },
+    "autosave": true,
+    "background": false,
+    "colors": false,
+    "cpu-threads": $legacythreads$,
+    "cpu-optimization": null,
+    "cpu-affinity": null,
+    "priority": 3,
+    "donate-level": 1,
+    "log-file": null,
+    "pools": [
+        {
+            "url": "stratum+tcp://$url$",
+            "user": "$username$",
+            "pass": "$pass$",
+            "rig-id": null,
+            "nicehash": false,
+            "keepalive": true,
+            "variant": -1,
+            "enabled": true,
+            "tls": false,
+            "tls-fingerprint": null
+        }
+    ],
+    "print-time": 30,
+    "retries": 5000,
+    "retry-pause": 5,
+    "user-agent": null,
+    "watch": true,
+    "use-gpu": [],
+    "gpu-intensity": [],
+    "gpu-filter": []
+}

app/src/main/assets/violetminer/config.json

@@ -0,0 +1,31 @@
+{
+    "hardwareConfiguration": {
+        "cpu": {
+            "enabled": true,
+            "optimizationMethod": "Auto",
+            "threadCount": $legacythreads$
+        },
+        "nvidia": {
+            "devices": [
+                {
+                    "enabled": false,
+                    "id": 0,
+                    "name": ""
+                }
+            ]
+        }
+    },
+    "pools": [
+        {
+            "agent": "",
+            "algorithm": "$algo$",
+            "host": "$urlhost$",
+            "niceHash": false,
+            "password": "$pass$",
+            "port": $urlport$,
+            "priority": 0,
+            "rigID": "",
+            "username": "$username$"
+        }
+    ]
+}

app/src/main/assets/xmrig-upx/config.json

@@ -0,0 +1,27 @@
+{
+  "algo": "$algo$",
+  "av": 0,
+  "background": false,
+  "colors": false,
+  "cpu-affinity": null,
+  "cpu-priority": 3,
+  "donate-level": 1,
+  "low-power-mode": $legacyintensity$,
+  "log-file": null,
+  "max-cpu-usage": null,
+  "print-time": 30,
+  "retries": 5000,
+  "retry-pause": 5,
+  "safe": false,
+  "syslog": false,
+  "threads": $legacythreads$,
+  "pools": [
+    {
+      "url": "$url$",
+      "user": "$username$",
+      "pass": "$pass$",
+      "keepalive": true,
+      "nicehash": false
+    }
+  ]
+}

app/src/main/assets/config.json → app/src/main/assets/xmrig/config.json

@@ -50,9 +50,5 @@
   "retry-pause": 5,
   "syslog": false,
   "user-agent": null,
-  "watch": true,
-  "threads": $legacythreads$,
-  "algo": "$legacyalgo$",
-  "cpu-priority": 3,
-  "low-power-mode": $legacyintensity$
+  "watch": true
 }

app/src/main/java/m2g/mine2gether/androidminer/AlgoItem.java

@@ -4,16 +4,20 @@
 
 package m2g.mine2gether.androidminer;
 
+import java.util.ArrayList;
+
 public class AlgoItem {
 
     private int mId = 0;
     private String mAlgo = "";
-    private String mAssetExtenstion = "";
+    private ArrayList<MinerItem> mMiners;
+    private String mDefaultMiner  = "";
 
-    public AlgoItem(String algo, String assetExtension) {
+    public AlgoItem(String algo, String defaultMiner, ArrayList<MinerItem> miners) {
         this.mAlgo = algo;
-        this.mAssetExtenstion = assetExtension;
         this.mId = 0;
+        mMiners = miners;
+        mDefaultMiner = defaultMiner;
     }
 
     public void setId(int id){
@@ -28,8 +32,11 @@ public String getAlgo() {
         return this.mAlgo;
     }
 
-    public String getAssetExtension() {
-        return this.mAssetExtenstion;
+    public String getDefaultMiner() {
+        return this.mDefaultMiner;
     }
 
+    public ArrayList<MinerItem> getMiners() {
+        return this.mMiners;
+    }
 }

app/src/main/java/m2g/mine2gether/androidminer/Config.java

@@ -19,37 +19,169 @@ public class Config {
 
     public Config() {
 
-        mAlgos.add(new AlgoItem("argon2/chukwa", ""));
-        mAlgos.add(new AlgoItem("argon2/wrkz", ""));
-        mAlgos.add(new AlgoItem("rx/test", ""));
-        mAlgos.add(new AlgoItem("rx/0", ""));
-        mAlgos.add(new AlgoItem("rx/wow", ""));
-        mAlgos.add(new AlgoItem("rx/loki", ""));
-        mAlgos.add(new AlgoItem("cn/fast", ""));
-        mAlgos.add(new AlgoItem("cn/rwz", ""));
-        mAlgos.add(new AlgoItem("cn/zls", ""));
-        mAlgos.add(new AlgoItem("cn/double", ""));
-        mAlgos.add(new AlgoItem("cn/r", ""));
-        mAlgos.add(new AlgoItem("cn/wow", ""));
-        mAlgos.add(new AlgoItem("cn/gpu", ""));
-        mAlgos.add(new AlgoItem("cn-pico/trtl", ""));
-        mAlgos.add(new AlgoItem("cn/half", ""));
-        mAlgos.add(new AlgoItem("cn/2", ""));
-        mAlgos.add(new AlgoItem("cn/xao", ""));
-        mAlgos.add(new AlgoItem("cn/rto", ""));
-        mAlgos.add(new AlgoItem("cn-heavy/tube", ""));
-        mAlgos.add(new AlgoItem("cn-heavy/xhv", ""));
-        mAlgos.add(new AlgoItem("cn-heavy/0", ""));
-        mAlgos.add(new AlgoItem("cn/1", ""));
-        mAlgos.add(new AlgoItem("cn-lite/1", ""));
-        mAlgos.add(new AlgoItem("cn-lite/0", ""));
-        mAlgos.add(new AlgoItem("cn/0", ""));
-        mAlgos.add(new AlgoItem("cryptonight-upx/2", "-upx"));
+        mAlgos.add(new AlgoItem("argon2/chukwa", "NinjaRig",  new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("NinjaRig", "argon2/chukwa","ninjarig"));
+                add(new MinerItem("violetminer", "chukwa","violetminer"));
+                add(new MinerItem("XMRig", "argon2/chukwa","xmrig"));
 
-        //User Defined
-        mPools.add(new PoolItem("custom", "custom", "", "", "", "", "", "", ""));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("argon2/wrkz", "NinjaRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("NinjaRig", "chukwa/wrkz","ninjarig"));
+                add(new MinerItem("violetminer", "chukwa_wrkz","violetminer"));
+                add(new MinerItem("XMRig", "argon2/wrkz","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("rx/test", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "rx/test","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("rx/0", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "rx/0","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("rx/wow", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "rx/wow","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("rx/loki", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "rx/loki","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn/fast", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn/fast","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn/rwz", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn/rwz","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn/zls", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn/zls","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn/double","XMRig",  new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn/double","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn/r", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn/r","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn/wow", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn/wow","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn/gpu","XMRig",  new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn/gpu","xmrig"));
+            }
+        }));
 
+        mAlgos.add(new AlgoItem("cn-pico/trtl","XMRig",  new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "rx/test","xmrig"));
+            }
+        }));
 
+        mAlgos.add(new AlgoItem("cn/half", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn/half","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn/2", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn/2","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn/xao", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn/xao","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn/rto","XMRig",  new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn/rto","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn-heavy/tube", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn-heavy/tube","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn-heavy/xhv", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn-heavy/xhv","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn-heavy/0", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn-heavy/0","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn/1", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn/1","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn-lite/1", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn-lite/1","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn-lite/0","XMRig",  new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn-lite/0","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cn/0", "XMRig", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig", "cn/0","xmrig"));
+            }
+        }));
+
+        mAlgos.add(new AlgoItem("cryptonight-upx/2", "XMRig-UPX", new ArrayList<MinerItem>(){
+            {
+                add(new MinerItem("XMRig-UPX", "cryptonight-upx/2","xmrig-upx"));
+            }
+        }));
+
+        //User Defined
+        mPools.add(new PoolItem("custom", "custom", "", "", "", "", "", "", ""));
 
         // Turtlecoin (TRTL)|trtl.pool.mine2gether.com:2225|argon2/chukwa
         mPools.add(new PoolItem(

app/src/main/java/m2g/mine2gether/androidminer/MainActivity.java

@@ -92,7 +92,7 @@ public static Context getContextOfApplication() {
     protected void onCreate(Bundle savedInstanceState) {
         preferences = getSharedPreferences(getPackageName() + "_preferences", MODE_PRIVATE);
 
-        // PreferenceHelper.clear();
+         //PreferenceHelper.clear();
 
         contextOfApplication = getApplicationContext();
 
@@ -159,7 +159,7 @@ protected void onCreate(Bundle savedInstanceState) {
         startService(intent);
     }
 
-    private void updateUI() {
+    public void updateUI() {
 
         String status = "";
         if (PreferenceHelper.getName("address").equals("")) {
@@ -254,7 +254,7 @@ private void startMining(View view) {
         String pool = PreferenceHelper.getName("pool");
         String pass = PreferenceHelper.getName("pass");
         String address = PreferenceHelper.getName("address");
-        String algo = PreferenceHelper.getName("algo");
+        String algo = PreferenceHelper.getName("minerAlgo");
         String assetExtension = PreferenceHelper.getName("assetExtension");
 
         int cores = Integer.parseInt(PreferenceHelper.getName("cores"));