code cleanup

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,7 +1,7 @@
 #Build Properties
-#Sun Nov 04 09:02:16 EST 2018
+#Sun Nov 04 09:22:04 EST 2018
 version_minor=0
-version_build=9
+version_build=10
 version_patch=1
-version_store=42
 version_major=2
+version_store=42

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/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,35 +18,20 @@
 
 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 {
     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) {
         if (actionBar == null) {
             return;

app/src/main/java/com/vrem/wifianalyzer/navigation/NavigationGroup.java

@@ -68,7 +68,7 @@ public NavigationMenu previous(@NonNull NavigationMenu navigationMenu) {
     }
 
     static class NavigationPredicate implements Predicate<NavigationGroup> {
-        public final NavigationMenu navigationMenu;
+        private final NavigationMenu navigationMenu;
 
         NavigationPredicate(@NonNull NavigationMenu navigationMenu) {
             this.navigationMenu = navigationMenu;

app/src/main/java/com/vrem/wifianalyzer/vendor/model/VendorDB.java

@@ -62,7 +62,7 @@ public List<String> findMacAddresses(String vendorName) {
             return new ArrayList<>();
         }
         List<String> results = getVendors().get(vendorName);
-        return results == null ? new ArrayList<String>() : results;
+        return results == null ? new ArrayList<>() : results;
     }
 
     @NonNull

app/src/main/java/com/vrem/wifianalyzer/wifi/channelrating/ChannelRatingAdapter.java

@@ -62,7 +62,7 @@ class ChannelRatingAdapter extends ArrayAdapter<WiFiChannel> implements UpdateNo
     private ChannelRating channelRating;
 
     ChannelRatingAdapter(@NonNull Context context, @NonNull TextView bestChannels) {
-        super(context, R.layout.channel_rating_details, new ArrayList<WiFiChannel>());
+        super(context, R.layout.channel_rating_details, new ArrayList<>());
         this.bestChannels = bestChannels;
         setChannelRating(new ChannelRating());
     }

app/src/main/java/com/vrem/wifianalyzer/wifi/filter/adapter/SSIDAdapter.java

@@ -46,7 +46,7 @@ public boolean isActive() {
 
     @Override
     public void reset() {
-        setValues(new HashSet<String>());
+        setValues(new HashSet<>());
     }
 
     @Override