Merge branch 'feature'

Author: VREMSoftwareDevelopment

.travis.yml

@@ -5,7 +5,7 @@ jdk: oraclejdk8
 android:
     components:
         - tools
-        - build-tools-28.0.2
+        - build-tools-28.0.3
         - android-27
         - extra-google-m2repository
         - extra-android-m2repository

app/build.gradle

@@ -16,27 +16,41 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-apply plugin: 'com.android.application'
-apply plugin: 'jacoco-android'
+apply plugin: "com.android.application"
+apply plugin: "jacoco-android"
+
+ext {
+    supportVersion = "28.0.0"
+    lang3Version = "3.8.1"
+    collections4Version = "4.2"
+    graphviewVersion = "4.2.2"
+    powermockVersion = "1.7.4"
+    robolectricVersion = "4.0"
+    junitVersion = "4.12"
+    junitToolboxVersion = "2.4"
+    shadowsVersion ="3.4-rc2"
+    espressoVersion = "3.0.2"
+    testVersion = "1.0.2"
+}
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '28.0.2'
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "com.vrem.wifianalyzer"
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 28
         versionCode
         versionName
-        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt')
+            proguardFiles getDefaultProguardFile("proguard-android.txt")
             signingConfig
         }
         debug {
@@ -63,82 +77,90 @@ android {
     }
 
     lintOptions {
-        disable 'GoogleAppIndexingWarning'
+        disable "GoogleAppIndexingWarning"
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 jacoco {
-    toolVersion = '0.8.1'
+    toolVersion = "0.8.2"
 }
 
 tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
 }
 
 jacocoAndroidUnitTestReport {
-    excludes += ['**/com/jjoe64/*']
+    excludes += ["**/com/jjoe64/*"]
     html.enabled true
     xml.enabled true
     csv.enabled false
 }
 
-if (project.hasProperty('keyAlias')) {
-    def propertiesFile = file('../../keystores/androidkeystore.properties')
+if (project.hasProperty("keyAlias")) {
+    def propertiesFile = file("../../keystores/androidkeystore.properties")
     Properties properties = readProperties(propertiesFile)
 
     System.out.println(">>> Signing Config " + properties)
-    android.buildTypes.release.signingConfig.keyAlias = properties['key_alias'].toString()
-    android.buildTypes.release.signingConfig.keyPassword = properties['key_password'].toString()
-    android.buildTypes.release.signingConfig.storeFile = file(properties['store_filename'].toString())
-    android.buildTypes.release.signingConfig.storePassword = properties['store_password'].toString()
+    android.buildTypes.release.signingConfig.keyAlias = properties["key_alias"].toString()
+    android.buildTypes.release.signingConfig.keyPassword = properties["key_password"].toString()
+    android.buildTypes.release.signingConfig.storeFile = file(properties["store_filename"].toString())
+    android.buildTypes.release.signingConfig.storePassword = properties["store_password"].toString()
 }
 
 dependencies {
     // Compile Build Dependencies
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'org.apache.commons:commons-lang3:3.8'
-    implementation 'org.apache.commons:commons-collections4:4.2'
-    implementation 'com.jjoe64:graphview:4.2.2'
+    implementation fileTree(include: ["*.jar"], dir: "libs")
+    implementation "com.android.support:design:$supportVersion"
+    implementation "com.android.support:preference-v7:$supportVersion"
+    implementation "com.android.support:support-v4:$supportVersion"
+    implementation "com.android.support:support-media-compat:$supportVersion"
+    implementation "org.apache.commons:commons-lang3:$lang3Version"
+    implementation "org.apache.commons:commons-collections4:$collections4Version"
+    implementation "com.jjoe64:graphview:$graphviewVersion"
     // Unit Test Dependencies
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.powermock:powermock-module-junit4:1.7.4'
-    testImplementation 'org.powermock:powermock-api-mockito2:1.7.4'
-    testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
-    testImplementation 'org.robolectric:robolectric:3.8'
-    testImplementation 'org.robolectric:shadows-support-v4:3.4-rc2'
+    testImplementation "junit:junit:$junitVersion"
+    testImplementation "org.powermock:powermock-module-junit4:$powermockVersion"
+    testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion"
+    testImplementation "com.googlecode.junit-toolbox:junit-toolbox:$junitToolboxVersion"
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+    testImplementation "org.robolectric:shadows-support-v4:$shadowsVersion"
     // Android Test Dependencies
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
+    androidTestImplementation "com.android.support.test:runner:$testVersion"
+    androidTestImplementation "com.android.support.test:rules:$testVersion"
 }
 
 updateVersion()
 
 def updateVersion() {
-    def propertiesFile = file('build.properties')
+    def propertiesFile = file("build.properties")
     Properties properties = readProperties(propertiesFile)
 
-    def versionMajor = properties['version_major'].toString().toInteger()
-    def versionMinor = properties['version_minor'].toString().toInteger()
-    def versionPatch = properties['version_patch'].toString().toInteger()
-    def versionBuild = properties['version_build'].toString().toInteger()
-    def versionStore = properties['version_store'].toString().toInteger()
+    def versionMajor = properties["version_major"].toString().toInteger()
+    def versionMinor = properties["version_minor"].toString().toInteger()
+    def versionPatch = properties["version_patch"].toString().toInteger()
+    def versionBuild = properties["version_build"].toString().toInteger()
+    def versionStore = properties["version_store"].toString().toInteger()
 
     if (isReleaseTask()) {
         System.out.println(">>> Building Release...")
         versionPatch++
         versionStore++
         versionBuild = 0
-        properties['version_patch'] = versionPatch.toString()
-        properties['version_store'] = versionStore.toString()
-        properties['version_build'] = versionBuild.toString()
+        properties["version_patch"] = versionPatch.toString()
+        properties["version_store"] = versionStore.toString()
+        properties["version_build"] = versionBuild.toString()
         writeProperties(propertiesFile, properties)
     }
     if (isCompileTask()) {
         System.out.println(">>> Compiling Source...")
         versionBuild++
-        properties['version_build'] = versionBuild.toString()
+        properties["version_build"] = versionBuild.toString()
         writeProperties(propertiesFile, properties)
     }
 
@@ -148,20 +170,20 @@ def updateVersion() {
         versionName = versionName + ".${versionBuild}"
         applicationId = applicationId + android.buildTypes.debug.applicationIdSuffix
     }
-    System.out.println(">>> " + project.parent.name + " " + versionName + " (" + versionStore + ") '" + applicationId + "'")
+    System.out.println(">>> " + project.parent.name + " " + versionName + " (" + versionStore + ") " + applicationId)
     android.defaultConfig.versionCode = versionStore
     android.defaultConfig.versionName = versionName
 }
 
 def isCompileTask() {
     def tasks = gradle.getStartParameter().getTaskNames()
-    return ':app:generateDebugSources' in tasks || ':app:generateReleaseSources' in tasks ||
-            'generateDebugSources' in tasks || 'generateReleaseSources' in tasks
+    return ":app:generateDebugSources" in tasks || ":app:generateReleaseSources" in tasks ||
+            "generateDebugSources" in tasks || "generateReleaseSources" in tasks
 }
 
 def isReleaseTask() {
     def tasks = gradle.getStartParameter().getTaskNames()
-    return ':app:assembleRelease' in tasks || 'assembleRelease' in tasks
+    return ":app:assembleRelease" in tasks || "assembleRelease" in tasks
 }
 
 static Properties readProperties(propertiesFile) {

app/build.properties

@@ -1,7 +1,7 @@
 #Build Properties
-#Sun Sep 09 08:19:20 EDT 2018
-version_minor=9
-version_build=9
-version_patch=3
-version_major=1
-version_store=41
+#Sun Nov 04 11:32:14 EST 2018
+version_minor=0
+version_build=11
+version_patch=1
+version_store=42
+version_major=2

app/src/androidTest/java/com/vrem/wifianalyzer/MainInstrumentedTest.java

@@ -19,9 +19,9 @@
 package com.vrem.wifianalyzer;
 
 
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 
 import org.junit.Rule;
 import org.junit.Test;

app/src/main/AndroidManifest.xml

@@ -23,9 +23,11 @@
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
     <application
         android:allowBackup="true"
+        android:fullBackupContent="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
@@ -57,24 +59,6 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".settings.SettingActivity"
-            android:label="@string/action_settings"
-            android:launchMode="singleTask"
-            android:parentActivityName=".MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.vrem.wifianalyzer.MainActivity"/>
-        </activity>
-        <activity
-            android:name=".about.AboutActivity"
-            android:label="@string/action_about"
-            android:launchMode="singleTask"
-            android:parentActivityName=".MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.vrem.wifianalyzer.MainActivity"/>
-        </activity>
     </application>
 
 </manifest>

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

@@ -61,12 +61,12 @@ public static <T extends Enum> Set<T> find(@NonNull Class<T> enumType, @NonNull
 
     @NonNull
     public static <T extends Enum> Set<String> find(@NonNull Set<T> values) {
-        return new HashSet<>(CollectionUtils.collect(values, new ToOrdinal<T>()));
+        return new HashSet<>(CollectionUtils.collect(values, new ToOrdinal<>()));
     }
 
     @NonNull
     public static <T extends Enum> Set<String> ordinals(@NonNull Class<T> enumType) {
-        return new HashSet<>(CollectionUtils.collect(values(enumType), new ToOrdinal<T>()));
+        return new HashSet<>(CollectionUtils.collect(values(enumType), new ToOrdinal<>()));
     }
 
     @NonNull

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

@@ -33,9 +33,7 @@ private FileUtils() {
 
     @NonNull
     public static String readFile(@NonNull Resources resources, @RawRes int id) {
-        InputStream inputStream = null;
-        try {
-            inputStream = resources.openRawResource(id);
+        try (InputStream inputStream = resources.openRawResource(id)) {
             int size = inputStream.available();
             byte[] bytes = new byte[size];
             int count = inputStream.read(bytes);
@@ -46,14 +44,7 @@ public static String readFile(@NonNull Resources resources, @RawRes int id) {
         } catch (Exception e) {
             // file is corrupted
             return StringUtils.EMPTY;
-        } finally {
-            if (inputStream != null) {
-                try {
-                    inputStream.close();
-                } catch (Exception e) {
-                    // do nothing
-                }
-            }
         }
+        // do nothing
     }
 }

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

@@ -39,7 +39,7 @@ private TextUtils() {
     @NonNull
     public static Set<String> split(String source) {
         return StringUtils.isBlank(source)
-            ? new HashSet<String>()
+            ? new HashSet<>()
             : new HashSet<>(Arrays.asList(trim(source).split(SEPARATOR)));
     }
 

app/src/main/java/com/vrem/wifianalyzer/ActivityUtils.java

@@ -18,36 +18,21 @@
 
 package com.vrem.wifianalyzer;
 
-import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 
-import com.vrem.util.ConfigurationUtils;
 import com.vrem.wifianalyzer.settings.Settings;
 
-import java.util.Locale;
-
-public class ActivityUtils {
+class ActivityUtils {
     private ActivityUtils() {
         throw new IllegalStateException("Utility class");
     }
 
-    @NonNull
-    public static Context createContext(@NonNull Context context) {
-        Context result = context;
-        Settings settings = MainContext.INSTANCE.getSettings();
-        if (settings != null) {
-            Locale newLocale = settings.getLanguageLocale();
-            result = ConfigurationUtils.createContext(context, newLocale);
-        }
-        return result;
-    }
-
-    public static void setActionBarOptions(ActionBar actionBar) {
+    static void setActionBarOptions(ActionBar actionBar) {
         if (actionBar == null) {
             return;
         }