Fixed bug in native ping (added proc.destroy) Bumped version to 0.4.4…

… #PLAY_BETA
stealthcopter · Nov 3, 2019 · 1149262 · 1149262
1 parent 42302cd
commit 1149262
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,8 +32,8 @@ android {
     applicationId "com.stealthcotper.networktools"
     minSdkVersion minSdkVer
     targetSdkVersion targetSdkVer
-    versionName appVersionName
-    versionCode appVersionCode
+    versionName "0.4.4"
+    versionCode 18
     archivesBaseName = "AndroidNetworkTools"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }

diff --git a/app/src/main/java/com/stealthcotper/networktools/ANTApplication.java b/app/src/main/java/com/stealthcotper/networktools/ANTApplication.java
@@ -1,7 +1,6 @@
 package com.stealthcotper.networktools;
 
 import android.app.Application;
-import android.os.StrictMode;
 
 public class ANTApplication extends Application {
 
@@ -16,17 +15,17 @@ private void initStrictMode() {
 
             // Let's be super strict so that we can discover bugs during testing
 
-            StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
-                    .detectAll()
-                    .penaltyLog()
-                    .penaltyDeath()
-                    .build());
-
-            StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
-                    .detectAll()
-                    .penaltyLog()
-                    .penaltyDeath()
-                    .build());
+//            StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
+//                    .detectAll()
+//                    .penaltyLog()
+////                    .penaltyDeath()
+//                    .build());
+//
+//            StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
+//                    .detectAll()
+//                    .penaltyLog()
+////                    .penaltyDeath()
+//                    .build());
         }
     }
 

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.1.4'
+    classpath 'com.android.tools.build:gradle:3.5.1'
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
   }
@@ -24,12 +24,13 @@ task clean(type: Delete) {
 }
 
 subprojects {
-  ext.compileSdkVer = 27
-  ext.buildToolsVer = "27.0.3"
+  ext.compileSdkVer = 29
+  ext.buildToolsVer = "29.0.1"
   ext.minSdkVer = 14
-  ext.targetSdkVer = 27
+  ext.targetSdkVer = 29
   ext.supportLibVer = "27.1.1"
 
-  ext.appVersionName = "0.4.3"
-  ext.appVersionCode = 17
+  // When updating these, remember to update the vars in app/build.gradle (for FDroid comptability)
+  ext.appVersionName = "0.4.4"
+  ext.appVersionCode = 18
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 01 19:31:51 BST 2018
+#Sun Nov 03 10:39:47 GMT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/library/src/main/java/com/stealthcopter/networktools/ping/PingNative.java b/library/src/main/java/com/stealthcopter/networktools/ping/PingNative.java
@@ -67,6 +67,7 @@ public static PingResult ping(InetAddress host, PingOptions pingOptions) throws
                 break;
         }
         pingResult.error = pingError;
+        proc.destroy();
         return pingResult;
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     break;
             }
             pingResult.error = pingError;
+            proc.destroy();
             return pingResult;
         }
@@ Expand Down @@