From 19e377fd9e765698c16582f7105f66f1e967e44c Mon Sep 17 00:00:00 2001 From: Michael Mikovsky <77305074+Astatin3@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:29:45 -0700 Subject: [PATCH] Fix crash --- .../com/ridgebotics/ridgescout/ui/transfer/FTPSync.java | 6 +++--- .../com/ridgebotics/ridgescout/utility/settingsManager.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/FTPSync.java b/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/FTPSync.java index 696ae20..ff920aa 100644 --- a/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/FTPSync.java +++ b/app/src/main/java/com/ridgebotics/ridgescout/ui/transfer/FTPSync.java @@ -97,11 +97,11 @@ public class FTPSync extends Thread { boolean sendMetaFiles = settingsManager.getFTPSendMetaFiles(); // Meta files - String[] meta_string_array = new String[]{ + List meta_string_array = Arrays.asList( "matches.fields", "pits.fields", evcode+".eventdata" - }; + ); try { // Login to FTP @@ -123,7 +123,7 @@ public class FTPSync extends Thread { // Remove timestamts file if(localFile.getName().equals(timestampsFilename)) continue; // Remove meta files if the option is disabled - if(!sendMetaFiles && Arrays.stream(meta_string_array).anyMatch(localFile.getName()::equals)) continue; + if(!sendMetaFiles && meta_string_array.contains(localFile.getName())) continue; Date remoteTimestamp = remoteTimestamps.get(localFile.getName()); diff --git a/app/src/main/java/com/ridgebotics/ridgescout/utility/settingsManager.java b/app/src/main/java/com/ridgebotics/ridgescout/utility/settingsManager.java index 9278fa3..6a9b365 100644 --- a/app/src/main/java/com/ridgebotics/ridgescout/utility/settingsManager.java +++ b/app/src/main/java/com/ridgebotics/ridgescout/utility/settingsManager.java @@ -97,8 +97,8 @@ public class settingsManager { public static String getFTPServer(){return prefs.getString( FTPServer, (String) defaults.get(FTPServer));} public static void setFTPServer(String str){ getEditor().putString( FTPServer,str).apply();} - public static boolean getFTPSendMetaFiles(){return prefs.getBoolean(FTPServer, (boolean) defaults.get(FTPServer));} - public static void setFTPSendMetaFiles(String str){getEditor().putString(FTPServer,str).apply();} + public static boolean getFTPSendMetaFiles(){return prefs.getBoolean(FTPSendMetaFiles, (boolean) defaults.get(FTPSendMetaFiles));} + public static void setFTPSendMetaFiles(String str){getEditor().putString(FTPSendMetaFiles,str).apply();}