demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-11 01:21:56 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

use '_' instead ':' in exported and imported file names

Browse Source
This commit is contained in:
vanous 2021-07-18 18:18:00 +02:00
parent c0fe15d38f
commit bcc5afb78c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DataManagementActivity.java
View File

@ -236,7 +236,7 @@ public class DataManagementActivity extends AbstractGBActivity {
SharedPreferences deviceSharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(dbDevice.getIdentifier()); SharedPreferences deviceSharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(dbDevice.getIdentifier());
if (sharedPrefs != null) { if (sharedPrefs != null) {
File myPath = FileUtils.getExternalFilesDir(); 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 { try {
ImportExportSharedPreferences.exportToFile(deviceSharedPrefs, myFile, null); ImportExportSharedPreferences.exportToFile(deviceSharedPrefs, myFile, null);
} catch (Exception ignore) { } catch (Exception ignore) {
@ -264,7 +264,15 @@ public class DataManagementActivity extends AbstractGBActivity {
SharedPreferences deviceSharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(dbDevice.getIdentifier()); SharedPreferences deviceSharedPrefs = GBApplication.getDeviceSpecificSharedPrefs(dbDevice.getIdentifier());
if (sharedPrefs != null) { if (sharedPrefs != null) {
File myPath = FileUtils.getExternalFilesDir(); 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 { try {
ImportExportSharedPreferences.importFromFile(deviceSharedPrefs, myFile); ImportExportSharedPreferences.importFromFile(deviceSharedPrefs, myFile);
} catch (Exception ignore) { } catch (Exception ignore) {