nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-01-23 10:25:54 +00:00
Code Releases Activity

Fallback to shell if db deletion fails (fixes #1753) (#1754)

Browse source
This commit is contained in:
Simon Frei 2022-02-07 09:16:28 +01:00 committed by GitHub
parent b19c7f6f6f
commit 28bdd4421d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java
View file

@ -40,6 +40,7 @@ import com.nutomic.syncthingandroid.R;
import com.nutomic.syncthingandroid.SyncthingApp; import com.nutomic.syncthingandroid.SyncthingApp;
import com.nutomic.syncthingandroid.service.Constants; import com.nutomic.syncthingandroid.service.Constants;
import com.nutomic.syncthingandroid.util.PermissionUtil; import com.nutomic.syncthingandroid.util.PermissionUtil;
import com.nutomic.syncthingandroid.util.Util;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -210,7 +211,18 @@ public class FirstStartActivity extends Activity {
} }
private void upgradeToApiLevel30() { private void upgradeToApiLevel30() {
FileUtils.deleteQuietly(new File(this.getFilesDir(), "index-v0.14.0.db")); File dbDir = new File(this.getFilesDir(), "index-v0.14.0.db");
if (dbDir.exists()) {
try {
FileUtils.deleteQuietly(dbDir);
} catch (Exception e) {
Log.w(TAG, "Deleting database with FileUtils failed", e);
Util.runShellCommand("rm -r" + dbDir.getAbsolutePath(), false);
if (dbDir.exists()) {
throw new RuntimeException("Failed to delete existing database");
}
}
}
mPreferences.edit().putBoolean(Constants.PREF_UPGRADED_TO_API_LEVEL_30, true).apply(); mPreferences.edit().putBoolean(Constants.PREF_UPGRADED_TO_API_LEVEL_30, true).apply();
} }