Skip to content

Commit 6a8111d

Browse files
Merge branch 'feature'
2 parents be96f5b + 1c16ea7 commit 6a8111d

File tree

6 files changed

+5
-75
lines changed

6 files changed

+5
-75
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ android {
3939

4040
defaultConfig {
4141
applicationId "com.vrem.wifianalyzer"
42-
minSdkVersion 16
42+
minSdkVersion 19
4343
targetSdkVersion 28
4444
versionCode
4545
versionName

app/build.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Build Properties
2-
#Sat Nov 10 12:21:36 EST 2018
2+
#Sun Nov 11 11:12:34 EST 2018
33
version_minor=0
4-
version_build=0
4+
version_build=2
55
version_patch=2
66
version_store=43
77
version_major=2

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
2525
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
26-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
26+
<uses-permission-sdk-23 android:name="android.permission.ACCESS_COARSE_LOCATION"/>
2727

2828
<application
2929
android:allowBackup="true"

app/src/main/java/com/vrem/util/FileUtils.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ private FileUtils() {
3333

3434
@NonNull
3535
public static String readFile(@NonNull Resources resources, @RawRes int id) {
36-
InputStream inputStream = null;
37-
try {
38-
inputStream = resources.openRawResource(id);
36+
try (InputStream inputStream = resources.openRawResource(id)) {
3937
int size = inputStream.available();
4038
byte[] bytes = new byte[size];
4139
int count = inputStream.read(bytes);
@@ -46,14 +44,6 @@ public static String readFile(@NonNull Resources resources, @RawRes int id) {
4644
} catch (Exception e) {
4745
// file is corrupted
4846
return StringUtils.EMPTY;
49-
} finally {
50-
if (inputStream != null) {
51-
try {
52-
inputStream.close();
53-
} catch (Exception e) {
54-
// do nothing
55-
}
56-
}
5747
}
5848
}
5949
}

app/src/main/res/layout/scan_interval_dialog.xml

Lines changed: 0 additions & 30 deletions
This file was deleted.

app/src/main/res/layout/setting_content.xml

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)