- Update address verification to support Panthera

- Update XLA donation address

Author: Mas7erMind

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "io.scalaproject.androidminer"
         minSdkVersion 19
         targetSdkVersion 28 // to avoid an error 13 when running exe in assets folder (sdk 29 gives the error)
-        versionCode 6
-        versionName "2.0.0"
+        versionCode 7
+        versionName "2.1.0"
         buildConfigField "long", "BUILD_TIME", System.currentTimeMillis() + "L"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -32,8 +32,6 @@ android {
 dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.1.0'
-    //noinspection GradleDynamicVersion,GradleDependency
-    implementation 'com.google.android.gms:play-services-vision:9.4.0+'
     implementation 'com.github.KingsMentor:MobileVisionBarcodeScanner:2.0.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'

app/src/main/java/io/scalaproject/androidminer/Config.java

@@ -21,7 +21,7 @@ public class Config {
     static final int DefaultPoolIndex = 1;
     public static final Long statsDelay = 30000L;
     static final String miner_xlarig = "xlarig";
-    static final String algo = "defyx";
+    static final String algo = "panthera";
 
     public static final String version = "4";
     static final Integer logMaxLength = 50000;

app/src/main/java/io/scalaproject/androidminer/MainActivity.java

@@ -120,7 +120,7 @@ public class MainActivity extends BaseActivity
 {
     private static final String LOG_TAG = "MainActivity";
 
-    private TextView tvHashrate, tvStatus, tvNbCores, tvCPUTemperature, tvBatteryTemperature, tvAcceptedShares, tvDifficulty, tvConnection, tvLog;
+    private TextView tvHashrate, tvStatus, tvNbCores, tvCPUTemperature, tvBatteryTemperature, tvAcceptedShares, tvDifficulty, tvConnection, tvLog, tvStatusProgess;
     private TubeSpeedometer meterCores, meterHashrate, meterHashrate_avg, meterHashrate_max;
     private SeekBar sbCores = null;
 
@@ -273,6 +273,8 @@ protected void onCreate(Bundle savedInstanceState) {
         pbStatus.setMax(MAX_HASHRATE_TIMER * 2);
         pbStatus.setProgress(0);
 
+        tvStatusProgess = findViewById(R.id.hr_progress);
+
         // Log
         tvLog = findViewById(R.id.output);
         tvLog.setMovementMethod(new ScrollingMovementMethod());
@@ -1086,15 +1088,17 @@ else if(status == STATE_MINING) {
                 tvStatus.setText(getResources().getString(R.string.paused));
                 stopTimerStatusHashrate();
 
-                pbStatus.setIndeterminate(false);
+                pbStatus.setIndeterminate(true);
                 pbStatus.setProgress(0);
+                tvStatusProgess.setVisibility(View.INVISIBLE);
             } else if (status == STATE_COOLING && isDeviceMining()) {
                 tvStatus.setText(getResources().getString(R.string.cooling));
                 stopTimerStatusHashrate();
 
                 pbStatus.setIndeterminate(true);
             } else if (status == STATE_CALCULATING) {
                 tvStatus.setText(getResources().getString(R.string.processing));
+                tvStatusProgess.setVisibility(View.VISIBLE);
 
                 pbStatus.setIndeterminate(false);
                 startTimerStatusHashrate();
@@ -1134,8 +1138,9 @@ public void stopTimerStatusHashrate() {
             timerTaskHashrate = null;
 
             pbStatus.setProgress(0);
-            TextView tvHrProgess = findViewById(R.id.hr_progress);
-            tvHrProgess.setText("0%");
+
+            tvStatusProgess.setVisibility(View.VISIBLE);
+            tvStatusProgess.setText("0%");
         }
     }
 
@@ -1171,10 +1176,8 @@ private void updateHashrateTicks(float fMax) {
     private void incrementProgressHashrate() {
         pbStatus.setProgress(pbStatus.getProgress() + 1);
 
-        TextView tvHrProgess = findViewById(R.id.hr_progress);
-
         String sProgessPercent = String.valueOf(Math.round((float)pbStatus.getProgress() / (float)pbStatus.getMax() *100.0f));
-        tvHrProgess.setText(String.format("%s%%", sProgessPercent));
+        tvStatusProgess.setText(String.format("%s%%", sProgessPercent));
     }
 
     private boolean isDeviceMining() {

app/src/main/java/io/scalaproject/androidminer/Utils.java

@@ -39,19 +39,13 @@ final class Utils {
 
     static String SCALA_BTC_ADDRESS = "1XTLY5LqdBXRW6hcHtnuMU7c68mAyW6qm";
     static String SCALA_ETH_ADDRESS = "0x133a15dF7177823Dd407ca87A190bbE4585a379e";
-    static String SCALA_XLA_ADDRESS = "SEiTBcLGpfm3uj5b5RaZDGSUoAGnLCyG5aJjAwko67jqRwWEH26NFPd26EUpdL1zh4RTmTdRWLz8WCmk5F4umYaFByMtJT6RLjD6vzApQJWfi";
+    static String SCALA_XLA_ADDRESS = "SvkFLjR4DST5bAG8SSHWfta4MsCzRrDEPNx72cTetqcoPfkwi7cFA2sYGG2Tf51rQ9EMSPHVuzxeoS4Y7ieicg5A1M24A8TTW";
     static String SCALA_LTC_ADDRESS = "LeLK5hopvfArVyKtkZBzF3B5wj6rGrNUGk";
 
     static boolean verifyAddress(String input) {
-        Pattern p = Pattern.compile("^Se[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{95}$");
+        Pattern p = Pattern.compile("^S[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{96}$");
         Matcher m = p.matcher(input.trim());
-        boolean b = m.matches();
-        if(b) {
-            return b;
-        }
-        Pattern p1 = Pattern.compile("^SE[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{107}$");
-        Matcher m2 = p1.matcher(input.trim());
-        return m2.matches();
+        return m.matches();
     }
 
     static float convertStringToFloat(String sNumber) {

app/src/main/java/io/scalaproject/androidminer/miner/Workers.java

@@ -11,10 +11,8 @@ public class Workers extends AsyncTask<String, Integer, String> {
 
     public Workers(){
         data.hashes =0;
-
     }
 
-
     @Override
     protected void onPreExecute() {
         //Setup precondition to execute some task
@@ -28,7 +26,6 @@ protected String doInBackground(String... params) {
 
     @Override
     protected void onProgressUpdate(Integer... values) {
-
         //Update the progress of current task
     }
 

app/src/main/java/io/scalaproject/androidminer/miner/algo/DefyxAlgo.java renamed to app/src/main/java/io/scalaproject/androidminer/miner/algo/PantheraAlgo.java

@@ -4,5 +4,5 @@
 
 package io.scalaproject.androidminer.miner.algo;
 
-public class DefyxAlgo extends AlgoAbstract {
+public class PantheraAlgo extends AlgoAbstract {
 }

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
 
         // NOTE: Do not place your application dependencies here; they belong