Andreas/solxpect
1
0
Fork 0
mirror of https://github.com/woheller69/solxpect.git synced 2025-09-22 00:40:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugfix backup/restore for Android R+

Browse source
This commit is contained in:
woheller69 2023-04-17 11:54:06 +02:00
parent 7a2edcf814
commit 6537132813
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/woheller69/weather/activities/BackupRestoreActivity.java
View file

@ -43,7 +43,7 @@ public class BackupRestoreActivity extends NavigationActivity{
mRestore = registerForActivityResult(
new ActivityResultContracts.StartActivityForResult(),
result -> {
File intData = new File(Environment.getDataDirectory() + "//databases//" + this.getPackageName());
File intData = new File(Environment.getDataDirectory() + "//data//" + this.getPackageName());
if (result.getData()!=null && result.getData().getData()!=null) Backup.zipExtract(this, intData, result.getData().getData());
});
}
@ -74,7 +74,7 @@ public class BackupRestoreActivity extends NavigationActivity{
try {
new ZipFile(dbBackup).addFolder(intData);
} catch (ZipException e) {
e.printStackTrace();
Toast.makeText(this,e.toString(), Toast.LENGTH_LONG).show();
}
}
});
@ -93,7 +93,7 @@ public class BackupRestoreActivity extends NavigationActivity{
String filesBackup = getResources().getString(R.string.app_name)+".zip";
final File zipFileBackup = new File(extStorage, filesBackup);
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(getResources().getString(R.string.restore_database));
builder.setMessage(getResources().getString(R.string.restore_database_message));
builder.setPositiveButton(R.string.dialog_OK_button, (dialog, whichButton) -> {
if (!Backup.checkPermissionStorage(this)) {
Backup.requestPermission(this);

1
app/src/main/res/values-de/strings.xml
View file

@ -101,6 +101,7 @@
<string name="permission_required">Berechtigung erforderlich</string>
<string name="permission_message">%s benötigt Zugriff auf den externen Speicher. Bitte die Berechtigung erteilen und erneut versuchen.</string>
<string name="toast_delete">Bitte die Datei zuerst löschen und erneut versuchen.</string>
<string name="restore_database_message">Daten aus dem Dokumentenordner wiederherstellen. Falls nötig, Ordner \'Documents\' öffnen und solXpect.zip auswählen!</string>
</resources>

1
app/src/main/res/values/strings.xml
View file

@ -104,4 +104,5 @@
<string name="permission_required">Permission required</string>
<string name="permission_message">%s needs access to external storage. Please accept permission and try again.</string>
<string name="toast_delete">Please delete file and try again</string>
<string name="restore_database_message">Restore Data from Documents folder. Open folder \'Documents\' and select solXpect.zip if needed!</string>
</resources>