Skip to content

Commit 1149262

Browse files
author
mat
committed
Fixed bug in native ping (added proc.destroy) Bumped version to 0.4.4 #PLAY_BETA
1 parent 42302cd commit 1149262

File tree

5 files changed

+23
-22
lines changed

5 files changed

+23
-22
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ android {
3232
applicationId "com.stealthcotper.networktools"
3333
minSdkVersion minSdkVer
3434
targetSdkVersion targetSdkVer
35-
versionName appVersionName
36-
versionCode appVersionCode
35+
versionName "0.4.4"
36+
versionCode 18
3737
archivesBaseName = "AndroidNetworkTools"
3838
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3939
}

app/src/main/java/com/stealthcotper/networktools/ANTApplication.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.stealthcotper.networktools;
22

33
import android.app.Application;
4-
import android.os.StrictMode;
54

65
public class ANTApplication extends Application {
76

@@ -16,17 +15,17 @@ private void initStrictMode() {
1615

1716
// Let's be super strict so that we can discover bugs during testing
1817

19-
StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
20-
.detectAll()
21-
.penaltyLog()
22-
.penaltyDeath()
23-
.build());
24-
25-
StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
26-
.detectAll()
27-
.penaltyLog()
28-
.penaltyDeath()
29-
.build());
18+
// StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
19+
// .detectAll()
20+
// .penaltyLog()
21+
//// .penaltyDeath()
22+
// .build());
23+
//
24+
// StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
25+
// .detectAll()
26+
// .penaltyLog()
27+
//// .penaltyDeath()
28+
// .build());
3029
}
3130
}
3231

build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.4'
9+
classpath 'com.android.tools.build:gradle:3.5.1'
1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
1212
}
@@ -24,12 +24,13 @@ task clean(type: Delete) {
2424
}
2525

2626
subprojects {
27-
ext.compileSdkVer = 27
28-
ext.buildToolsVer = "27.0.3"
27+
ext.compileSdkVer = 29
28+
ext.buildToolsVer = "29.0.1"
2929
ext.minSdkVer = 14
30-
ext.targetSdkVer = 27
30+
ext.targetSdkVer = 29
3131
ext.supportLibVer = "27.1.1"
3232

33-
ext.appVersionName = "0.4.3"
34-
ext.appVersionCode = 17
33+
// When updating these, remember to update the vars in app/build.gradle (for FDroid comptability)
34+
ext.appVersionName = "0.4.4"
35+
ext.appVersionCode = 18
3536
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue May 01 19:31:51 BST 2018
1+
#Sun Nov 03 10:39:47 GMT 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

library/src/main/java/com/stealthcopter/networktools/ping/PingNative.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public static PingResult ping(InetAddress host, PingOptions pingOptions) throws
6767
break;
6868
}
6969
pingResult.error = pingError;
70+
proc.destroy();
7071
return pingResult;
7172
}
7273

0 commit comments

Comments
 (0)