- Replace the deprecated functions in ImageDownloader, Throttle, ImportExportConnectionsList and LogViewerActivity

- linting
- tidy up some code

Author: flash62au

.gitignore

@@ -28,3 +28,6 @@ EngineDriver.iml
 .Trashes
 ehthumbs.db
 Thumbs.db
+
+#other file types
+*.hprof

EngineDriver/src/main/java/jmri/enginedriver/SettingsActivity.java

@@ -1936,7 +1936,8 @@ private void showHideLeftRightSwipePreferences() {
             parentActivity.enableDisablePreference(getPreferenceScreen(), "prefFullScreenSwipeArea", !enable);
         }
 
-        public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,String key) {
+        @SuppressLint("ApplySharedPref")
+        public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
             boolean prefForcedRestart = sharedPreferences.getBoolean("prefForcedRestart", false);
 
             if ((key != null) && !prefForcedRestart) {  // don't do anything if the preference have been loaded and we are about to reload the app.

EngineDriver/src/main/java/jmri/enginedriver/import_export/ImportExportConnectionList.java

@@ -3,7 +3,6 @@
 import static jmri.enginedriver.threaded_application.context;
 
 import android.content.SharedPreferences;
-import android.os.AsyncTask;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -28,7 +27,7 @@
 public class ImportExportConnectionList {
     public ArrayList<HashMap<String, String>> connections_list;
     private final SharedPreferences prefs;
-    private boolean prefHideDemoServer;
+    private final boolean prefHideDemoServer;
     public boolean foundDemoHost = false;
 
     private static final String demo_host = "jmri.mstevetodd.com";
@@ -60,8 +59,8 @@ public void getConnectionsList(String addressToRemove, String portToRemove) {
                     String ip_address;
                     String host_name;
                     String port_str;
-                    Integer port = 0;
-                    String ssid_str = "";
+                    int port = 0;
+                    String ssid_str;
                     String service_type = "";
                     List<String> parts = Arrays.asList(line.split(":", 5)); //split record from file, max of 4 parts
                     if (parts.size() > 1) {  //skip if not split
@@ -91,19 +90,19 @@ public void getConnectionsList(String addressToRemove, String portToRemove) {
                             port = Integer.decode(port_str);
                         } catch (Exception ignored) {
                         }
-                        if (!(ip_address.equals(addressToRemove)) || !(port.toString().equals(portToRemove))) {
+                        if (!(ip_address.equals(addressToRemove)) || !(Integer.toString(port).equals(portToRemove))) {
                             if (port > 0) {  //skip if port not converted to integer
 
                                 boolean includeThisHost = true;
-                                if (host_name.equals(demo_host) && port.toString().equals(demo_port)) {
+                                if (host_name.equals(demo_host) && Integer.toString(port).equals(demo_port)) {
                                     foundDemoHost = true;
                                     if (prefHideDemoServer) includeThisHost = false;
                                 }
                                 if (includeThisHost) {
                                     HashMap<String, String> hm = new HashMap<>();
                                     hm.put("ip_address", ip_address);
                                     hm.put("host_name", host_name);
-                                    hm.put("port", port.toString());
+                                    hm.put("port", Integer.toString(port));
                                     hm.put("ssid", ssid_str);
                                     hm.put("service_type", service_type);
                                     if (!connections_list.contains(hm)) {    // suppress dups
@@ -139,10 +138,10 @@ public void getConnectionsList(String addressToRemove, String portToRemove) {
     }
 
     public void saveConnectionsListExecute(threaded_application myApp, String ip, String name, int port, String wsName, String ssidName, String serviceType) {
-        new saveConnectionsList(myApp, ip, name, port, wsName, ssidName, serviceType).execute();
+        new SaveConnectionsList(myApp, ip, name, port, wsName, ssidName, serviceType);
     }
 
-    class saveConnectionsList extends AsyncTask<Void, Void, String> {
+    class SaveConnectionsList implements Runnable{
 
         public threaded_application mainapp;  // hold pointer to mainapp
 
@@ -153,22 +152,23 @@ class saveConnectionsList extends AsyncTask<Void, Void, String> {
         private final String connected_ssid;
         private final String serviceType;
 
-        public saveConnectionsList(threaded_application myApp, String ip, String name, int port, String wsName, String ssidName, String sserviceType) {
+        public SaveConnectionsList(threaded_application myApp, String ip, String name, int port, String wsName, String ssidName, String sserviceType) {
             mainapp = myApp;
             connected_hostip = ip;
             connected_hostname = name;
             connected_port = port;
             connected_ssid = ssidName;
             webServerName = wsName;
             serviceType = sserviceType;
+
+            new Thread(this).start();
         }
 
-        @Override
-        protected String doInBackground(Void... params) {
 
+        public void run() {
             String errMsg = "";
             //exit if values not set, avoid NPE reported to Play Store
-            if (connected_hostip == null || connected_port == 0) return errMsg;
+            if (connected_hostip == null || connected_port == 0)  return;
 
             foundDemoHost = false;
             boolean isBlankOrDemo = false;
@@ -177,14 +177,15 @@ protected String doInBackground(Void... params) {
                 isDemo = true;
                 foundDemoHost = true;
             }
-            if ( ((webServerName.isEmpty()) || (connected_hostname.equals(webServerName)))
-                    || (isDemo) ) {
+            if (((webServerName.isEmpty()) || (connected_hostname.equals(webServerName)))
+                    || (isDemo)) {
                 isBlankOrDemo = true;
             }
 
             //if no SD Card present then nothing to do
-            if (!android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED))
-                return errMsg;
+            if (!android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED)) {
+                return;
+            }
             try {
                 File connections_list_file = new File(context.getExternalFilesDir(null), "connections_list.txt");
                 PrintWriter list_output = new PrintWriter(connections_list_file);
@@ -199,7 +200,7 @@ protected String doInBackground(Void... params) {
                 }
 
                 String smrc = prefs.getString("maximum_recent_connections_preference", ""); //retrieve pref for max recents to show
-                if (smrc.equals("")) { //if no value or entry removed, set to default
+                if (smrc.isEmpty()) { //if no value or entry removed, set to default
                     smrc = mainapp.getApplicationContext().getResources().getString(R.string.prefMaximumRecentConnectionsDefaultValue);
                 }
                 int mrc = 10;
@@ -210,19 +211,23 @@ protected String doInBackground(Void... params) {
                 int clEntries = Math.min(connections_list.size(), mrc);  //don't keep more entries than specified in preference
                 for (int i = 0; i < clEntries; i++) {  //loop thru entries from connections list, up to max in prefs
                     HashMap<String, String> t = connections_list.get(i);
-                    String li = t.get("ip_address");
-                    String lh = t.get("host_name");
-                    Integer lp = Integer.valueOf(t.get("port"));
-                    String ssid = t.get("ssid");
+                    String sIpAddress = t.get("ip_address");
+                    String sHostName = t.get("host_name");
+                    String sPort = t.get("port");
+                    String sSsid = t.get("ssid");
                     String sType = t.get("service_type");
+                    
+                    if ( (sIpAddress!=null) &&  (sHostName!=null) &&(sPort!=null) &&  (sSsid!=null) &&  (sType!=null) ) {
+                        Integer port = Integer.valueOf(sPort);
 
-                    boolean doWrite = !connected_hostip.equals(li) || (connected_port.intValue() != lp.intValue());
-                    //don't write it out if same as selected
-                    if ( li.equals(demo_host) && lp.toString().equals(demo_port) && (foundDemoHost) ) {
-                        doWrite = false;
-                    }
-                    if (doWrite) {
-                        list_output.format("%s:%s:%d:%s:%s\n", lh, li, lp, ssid, sType);
+                        boolean doWrite = !connected_hostip.equals(sIpAddress) || (connected_port.intValue() != port.intValue());
+                        //don't write it out if same as selected
+                        if (sIpAddress.equals(demo_host) && port.toString().equals(demo_port) && (foundDemoHost)) {
+                            doWrite = false;
+                        }
+                        if (doWrite) {
+                            list_output.format("%s:%s:%d:%s:%s\n", sHostName, sIpAddress, port, sSsid, sType);
+                        }
                     }
                 }
                 list_output.flush();
@@ -241,30 +246,32 @@ protected String doInBackground(Void... params) {
                     File connections_log_file = new File(context.getExternalFilesDir(null), connection_log_file_name);
                     FileWriter fileWriter = new FileWriter(connections_log_file , true);
                     BufferedWriter bufferedWriter = new BufferedWriter(fileWriter, 1024);
-                    PrintWriter log_output = new PrintWriter(bufferedWriter);
-
-                    if (isBlankOrDemo) {
-                        log_output.format("%s:%s:%d:%s:%s:%s\n", connected_hostname, connected_hostip, connected_port, connected_ssid, serviceType, currentDateAndTime);
-                    } else {
-                        log_output.format("%s:%s:%d:%s:%s:%s\n", webServerName, connected_hostip, connected_port, connected_ssid, serviceType, currentDateAndTime);
-                    }
-
-                    log_output.flush();
+                    PrintWriter log_output = getPrintWriter(bufferedWriter, isBlankOrDemo, currentDateAndTime);
                     log_output.close();
                     bufferedWriter.close();
                     fileWriter.close();
                 } catch (IOException except) {
                     errMsg = except.getMessage();
                 }
             }
+            if (errMsg != null) displayError(errMsg);
+        }
+
+        private PrintWriter getPrintWriter(BufferedWriter bufferedWriter, boolean isBlankOrDemo, String currentDateAndTime) {
+            PrintWriter log_output = new PrintWriter(bufferedWriter);
+
+            if (isBlankOrDemo) {
+                log_output.format("%s:%s:%d:%s:%s:%s\n", connected_hostname, connected_hostip, connected_port, connected_ssid, serviceType, currentDateAndTime);
+            } else {
+                log_output.format("%s:%s:%d:%s:%s:%s\n", webServerName, connected_hostip, connected_port, connected_ssid, serviceType, currentDateAndTime);
+            }
 
-            return errMsg;
+            log_output.flush();
+            return log_output;
         }
 
-        @Override
-        protected void onPostExecute(String errMsg) {
-            if (errMsg.length() > 0)
-//                Toast.makeText(mainapp, mainapp.getResources().getString(R.string.toastConnectErrorSavingRecentConnection) + " " + errMsg, Toast.LENGTH_SHORT).show();
+        protected void displayError(String errMsg) {
+            if (!errMsg.isEmpty())
                 threaded_application.safeToast(mainapp.getResources().getString(R.string.toastConnectErrorSavingRecentConnection) + " " + errMsg, Toast.LENGTH_SHORT);
         }
     }

EngineDriver/src/main/java/jmri/enginedriver/import_export/ImportExportPreferences.java

@@ -987,7 +987,7 @@ public void loadRecentTurnoutsListFromFile() {
                     String line = list_reader.readLine();
                     int splitPos = line.indexOf(':');
                     if (splitPos > 0) {
-                        Integer source = 0;
+                        Integer source;
                         String addr, turnoutName ="", turnoutServer = "";
                         try {
                              addr = line.substring(0, splitPos);
@@ -1010,7 +1010,7 @@ public void loadRecentTurnoutsListFromFile() {
                             turnoutName = "";
                             source = -1;
                         }
-                        if (addr.length() > 0) {
+                        if (!addr.isEmpty()) {
                             recentTurnoutAddressList.add(addr);
                             recentTurnoutNameList.add(turnoutName);
                             recentTurnoutSourceList.add(source);
@@ -1068,7 +1068,7 @@ public void downloadRosterToRecents(Context context, SharedPreferences sharedPre
 
             // parse address and length from string, e.g. 2591(L)
             String[] ras = threaded_application.splitByString(rosterAddressString, "(");
-            if (ras[0].length() > 0) {  //only process if address found
+            if (!ras[0].isEmpty()) {  //only process if address found
                 locoAddressSize = (ras[1].charAt(0) == 'L') ? address_type.LONG : address_type.SHORT;   // convert S/L to 0/1
                 try {
                     locoAddress = Integer.parseInt(ras[0]);   // convert address to int

EngineDriver/src/main/java/jmri/enginedriver/intro/intro_activity.java

@@ -20,6 +20,8 @@
 
 package jmri.enginedriver.intro;
 
+import static jmri.enginedriver.threaded_application.context;
+
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -28,6 +30,7 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -42,10 +45,9 @@
 public class intro_activity extends AppIntro2 {
     private boolean introComplete = false;
     private SharedPreferences prefs;
-    private String prefTheme  = "";
-    private String prefThrottleType  = "";
+    //    private String prefThrottleType  = "";
     private String originalPrefTheme  = "";
-    private String originalPrefThrottleType  = "";
+//    private String originalPrefThrottleType  = "";
 
     private threaded_application mainapp;    //pointer back to application
 
@@ -60,7 +62,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         prefs = getSharedPreferences("jmri.enginedriver_preferences", 0);
         originalPrefTheme = prefs.getString("prefTheme", getApplicationContext().getResources().getString(R.string.prefThemeDefaultValue));
-        originalPrefThrottleType = prefs.getString("prefThrottleScreenType", getApplicationContext().getResources().getString(R.string.prefThrottleScreenTypeDefault));
+//        originalPrefThrottleType = prefs.getString("prefThrottleScreenType", getApplicationContext().getResources().getString(R.string.prefThrottleScreenTypeDefault));
 
         mainapp.getFakeDeviceId(true); // force getting a new ID
 
@@ -82,7 +84,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 sliderPage.setTitle(getApplicationContext().getResources().getString(R.string.permissionsRequestTitle));
                 sliderPage.setDescription(getApplicationContext().getResources().getString(R.string.permissionsPOST_NOTIFICATIONS));
                 sliderPage.setImageDrawable(R.drawable.icon_vector);
-                sliderPage.setBgColor(getResources().getColor(R.color.intro_background));
+                sliderPage.setBgColor(ContextCompat.getColor(context, R.color.intro_background));
                 addSlide(AppIntroFragment.newInstance(sliderPage));
                 slideNumber = slideNumber + 1;
                 askForPermissions(new String[]{Manifest.permission.POST_NOTIFICATIONS}, slideNumber);
@@ -123,7 +125,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 sliderPage.setTitle(getApplicationContext().getResources().getString(R.string.permissionsRequestTitle));
                 sliderPage.setDescription(getApplicationContext().getResources().getString(R.string.permissionsREAD_MEDIA_VISUAL_USER_SELECTED));
                 sliderPage.setImageDrawable(R.drawable.icon_vector);
-                sliderPage.setBgColor(getResources().getColor(R.color.intro_background));
+                sliderPage.setBgColor(ContextCompat.getColor(context, R.color.intro_background));
                 addSlide(AppIntroFragment.newInstance(sliderPage));
                 slideNumber = slideNumber + 1;
                 askForPermissions(new String[]{Manifest.permission.READ_MEDIA_IMAGES, Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED}, slideNumber);
@@ -240,15 +242,17 @@ public void onDonePressed(Fragment currentFragment) {
         SharedPreferences prefsNoBackup = mainapp.getSharedPreferences("jmri.enginedriver_preferences_no_backup", 0);
         prefsNoBackup.edit().putString("prefRunIntro", threaded_application.INTRO_VERSION).commit();
 
-        prefTheme = prefs.getString("prefTheme", getApplicationContext().getResources().getString(R.string.prefThemeDefaultValue));
-        prefThrottleType = prefs.getString("prefThrottleScreenType", getApplicationContext().getResources().getString(R.string.prefThrottleScreenTypeDefault));
+        String prefTheme = prefs.getString("prefTheme", getApplicationContext().getResources().getString(R.string.prefThemeDefaultValue));
+//        prefThrottleType = prefs.getString("prefThrottleScreenType", getApplicationContext().getResources().getString(R.string.prefThrottleScreenTypeDefault));
 
         if (!prefTheme.equals(originalPrefTheme))  {
             // the theme has changed so need to restart the app.
             Intent intent = getBaseContext().getPackageManager().getLaunchIntentForPackage(getBaseContext().getPackageName());
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(intent);
+            if (intent != null ) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            }
             finish();
 //            Runtime.getRuntime().exit(0); // really force the kill
         }