From bcc5afb78ccc19730400592991e357746a4b6a1e Mon Sep 17 00:00:00 2001 From: vanous Date: Sun, 18 Jul 2021 18:18:00 +0200 Subject: [PATCH] use '_' instead ':' in exported and imported file names --- .../activities/DataManagementActivity.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DataManagementActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DataManagementActivity.java index 5db3df455..145a9f7c4 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DataManagementActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DataManagementActivity.java @@ -236,7 +236,7 @@ public class DataManagementActivity extends AbstractGBActivity { SharedPreferences deviceSharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(dbDevice.getIdentifier()); if (sharedPrefs != null) { File myPath = FileUtils.getExternalFilesDir(); - File myFile = new File(myPath, "Export_preference_" + dbDevice.getIdentifier()); + File myFile = new File(myPath, "Export_preference_" + FileUtils.makeValidFileName(dbDevice.getIdentifier())); try { ImportExportSharedPreferences.exportToFile(deviceSharedPrefs, myFile, null); } catch (Exception ignore) { @@ -264,7 +264,15 @@ public class DataManagementActivity extends AbstractGBActivity { SharedPreferences deviceSharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(dbDevice.getIdentifier()); if (sharedPrefs != null) { File myPath = FileUtils.getExternalFilesDir(); - File myFile = new File(myPath, "Export_preference_" + dbDevice.getIdentifier()); + File myFile = new File(myPath, "Export_preference_" + FileUtils.makeValidFileName(dbDevice.getIdentifier())); + + if (!myFile.exists()) { //first try to use file in new format de_ad_be_af, if doesn't exist use old format de:at:be:af + myFile = new File(myPath, "Export_preference_" + dbDevice.getIdentifier()); + LOG.info("Trying to import with older filename"); + }else{ + LOG.info("Trying to import with new filename"); + } + try { ImportExportSharedPreferences.importFromFile(deviceSharedPrefs, myFile); } catch (Exception ignore) {