- Modified pool hostname to always use IP address

- Updated version - Updated fastlane changelog
scala-network · Apr 8, 2020 · aa3dac4 · aa3dac4
1 parent 148950a
commit aa3dac4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "io.scalaproject.androidminer"
         minSdkVersion 17
         targetSdkVersion 28
-        versionCode 3
-        versionName "1.2.0"
+        versionCode 4
+        versionName "1.3.0"
         buildConfigField "long", "BUILD_TIME", System.currentTimeMillis() + "L"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/io/scalaproject/androidminer/MiningService.java b/app/src/main/java/io/scalaproject/androidminer/MiningService.java
@@ -218,25 +218,30 @@ public void stopMining() {
     }
 
     public static String getIpByHost(PoolItem pi) {
-        String hostName = pi.getPool() + ":" + pi.getPort();
+        return pi.getPoolIP();
+
+        /*String hostName = pi.getPool() + ":" + pi.getPort();
+
 
         try {
             Log.i(LOG_TAG, hostName);
             InetAddress inetAddress = Inet4Address.getByName(hostName);
 
+            return inetAddress.getHostAddress();
+
             if(!inetAddress.isLoopbackAddress()) {
                 if (inetAddress instanceof Inet6Address) {
                     return pi.getPoolIP(); // workaround for IPv6
                 } else if (inetAddress instanceof Inet4Address) {
-                    return inetAddress.getHostAddress().toString();
+                    return inetAddress.getHostAddress();
                 }
             }
         } catch (UnknownHostException e) {
             Log.i(LOG_TAG, e.toString());
             return hostName;
         }
 
-        return hostName;
+        return hostName;*/
     }
 
     public void startMining(MiningConfig config) {

diff --git a/app/src/main/java/io/scalaproject/androidminer/Tools.java b/app/src/main/java/io/scalaproject/androidminer/Tools.java
@@ -119,7 +119,6 @@ static void copyDirectoryContents(Context context, String assetFilePath, String
                 copyDirectoryContents(context, assetFilePath + "/" + f, localFilePath + "/" + f);
             }
         }
-
     }
 
     static String getDeviceName() {

diff --git a/app/src/main/java/io/scalaproject/androidminer/api/PoolItem.java b/app/src/main/java/io/scalaproject/androidminer/api/PoolItem.java
@@ -123,7 +123,6 @@ public String getPort() {
             return custom_port;
         }
 
-
         if(custom_port.equals("") || custom_port.equals(this.mPort)) {
             return this.mPort;
         }

diff --git a/fastlane/metadata/android/en-US/changelog/4.txt b/fastlane/metadata/android/en-US/changelog/4.txt
@@ -0,0 +1 @@
+- Improved greatly miner's performance
-Original file line number
+Diff line change
@@ Expand Up @@
                     copyDirectoryContents(context, assetFilePath + "/" + f, localFilePath + "/" + f);
                 }
             }
         }
         static String getDeviceName() {
@@ Expand Down @@