rework backup & restore

use the implementation from Conversations

1 files changed, 26 insertions, 285 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
index 75493d6c8..0ce07dda4 100644
--- a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
@@ -10,6 +10,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -41,9 +42,12 @@ import de.pixart.messenger.persistance.FileBackend;
 import de.pixart.messenger.utils.EncryptDecryptFile;
 import de.pixart.messenger.utils.XmppUri;
 
+import static de.pixart.messenger.utils.PermissionUtils.allGranted;
+import static de.pixart.messenger.utils.PermissionUtils.writeGranted;
+
 public class WelcomeActivity extends XmppActivity {
 
-    boolean importSuccessful = false;
+    private static final int REQUEST_IMPORT_BACKUP = 0x63fb;
 
     @Override
     protected void refreshUiReal() {
@@ -85,21 +89,14 @@ public class WelcomeActivity extends XmppActivity {
             ab.setDisplayHomeAsUpEnabled(false);
         }
 
-        //check if there is a backed up database --
-        if (hasStoragePermission(REQUEST_READ_EXTERNAL_STORAGE)) {
-            BackupAvailable();
-        }
-
-
         final Button ImportDatabase = findViewById(R.id.import_database);
         final TextView ImportText = findViewById(R.id.import_text);
-
-        if (BackupAvailable() != 0) {
+        if (hasStoragePermission(REQUEST_IMPORT_BACKUP)) {
             ImportDatabase.setVisibility(View.VISIBLE);
             ImportText.setVisibility(View.VISIBLE);
         }
+        ImportDatabase.setOnClickListener(v -> startActivity(new Intent(this, ImportBackupActivity.class)));
 
-        ImportDatabase.setOnClickListener(v -> enterPasswordDialog(BackupAvailable()));
 
         final Button createAccount = findViewById(R.id.create_account);
         createAccount.setOnClickListener(v -> {
@@ -127,290 +124,34 @@ public class WelcomeActivity extends XmppActivity {
 
     }
 
-    public void enterPasswordDialog(final int backup_type) {
-        if (backup_type == 1) {
-            LayoutInflater li = LayoutInflater.from(WelcomeActivity.this);
-            View promptsView = li.inflate(R.layout.password, null);
-            final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(WelcomeActivity.this);
-            alertDialogBuilder.setView(promptsView);
-            final EditText userInput = promptsView
-                    .findViewById(R.id.password);
-            alertDialogBuilder.setTitle(R.string.enter_password);
-            alertDialogBuilder.setMessage(R.string.enter_account_password);
-            alertDialogBuilder
-                    .setCancelable(false)
-                    .setPositiveButton(R.string.ok,
-                            new DialogInterface.OnClickListener() {
-                                public void onClick(DialogInterface dialog, int id) {
-                                    final String password = userInput.getText().toString();
-                                    final ProgressDialog pd = ProgressDialog.show(WelcomeActivity.this, getString(R.string.please_wait), getString(R.string.databaseimport_started), true);
-                                    if (!password.isEmpty()) {
-                                        new Thread(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                try {
-                                                    checkDatabase(password);
-                                                } catch (IOException e) {
-                                                    e.printStackTrace();
-                                                } catch (Exception e) {
-                                                    e.printStackTrace();
-                                                }
-                                                pd.dismiss();
-                                            }
-                                        }).start();
-                                    } else {
-                                        AlertDialog.Builder builder = new AlertDialog.Builder(WelcomeActivity.this);
-                                        builder.setTitle(R.string.error);
-                                        builder.setMessage(R.string.password_should_not_be_empty);
-                                        builder.setNegativeButton(R.string.cancel, null);
-                                        builder.setPositiveButton(R.string.try_again, new DialogInterface.OnClickListener() {
-                                            @Override
-                                            public void onClick(DialogInterface dialog, int id) {
-                                                enterPasswordDialog(backup_type);
-                                            }
-                                        });
-                                        builder.create().show();
-                                    }
-                                }
-                            })
-                    .setNegativeButton(R.string.cancel,
-                            new DialogInterface.OnClickListener() {
-                                public void onClick(DialogInterface dialog, int id) {
-                                    Toast.makeText(WelcomeActivity.this, R.string.import_canceled, Toast.LENGTH_LONG).show();
-                                    dialog.dismiss();
-                                }
-                            }
-                    );
-            WelcomeActivity.this.runOnUiThread(new Runnable() {
-                public void run() {
-                    // create alert dialog
-                    AlertDialog alertDialog = alertDialogBuilder.create();
-                    // show it
-                    alertDialog.show();
-                }
-            });
-        } else {
-            try {
-                checkDatabase(null);
-            } catch (IOException e) {
-                e.printStackTrace();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
+    public void addInviteUri(Intent intent) {
+        StartConversationActivity.addInviteUri(intent, getIntent());
     }
 
-    private int BackupAvailable() {
-        // Set the folder on the SDcard
-        File filePath_enc = new File(FileBackend.getBackupDirectory() + "/database.db.crypt");
-        File filePath_dec = new File(FileBackend.getBackupDirectory() + "/database.db");
-        if (filePath_enc.exists()) {
-            Log.d(Config.LOGTAG, "DB Path existing (encrypted)");
-            return 1;
-        } else if (filePath_dec.exists()) {
-            Log.d(Config.LOGTAG, "DB Path existing (decrypted)");
-            return 2;
-        } else {
-            Log.d(Config.LOGTAG, "DB Path not existing");
-            return 0;
-        }
+    public static void launch(AppCompatActivity activity) {
+        Intent intent = new Intent(activity, WelcomeActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        activity.startActivity(intent);
+        activity.overridePendingTransition(0, 0);
     }
 
-    private void checkDatabase(String DecryptionKey) throws IOException {
-        if (DecryptionKey != null) {
-            // Set the folder on the SDcard
-            File directory = new File(FileBackend.getBackupDirectory());
-            // Set the input file stream up:
-            FileInputStream InputFile = new FileInputStream(directory.getPath() + "/database.db.crypt");
-            // Temp output for DB checks
-            File TempFile = new File(directory.getPath() + "database.bak");
-            FileOutputStream OutputTemp = new FileOutputStream(TempFile);
-
-            try {
-                EncryptDecryptFile.decrypt(InputFile, OutputTemp, DecryptionKey);
-            } catch (NoSuchAlgorithmException e) {
-                Log.d(Config.LOGTAG, "Database importer: decryption failed with " + e);
-                e.printStackTrace();
-            } catch (NoSuchPaddingException e) {
-                Log.d(Config.LOGTAG, "Database importer: decryption failed with " + e);
-                e.printStackTrace();
-            } catch (InvalidKeyException e) {
-                Log.d(Config.LOGTAG, "Database importer: decryption failed (invalid key) with " + e);
-                e.printStackTrace();
-            } catch (IOException e) {
-                Log.d(Config.LOGTAG, "Database importer: decryption failed (IO) with " + e);
-                e.printStackTrace();
-            } catch (Exception e) {
-                Log.d(Config.LOGTAG, "Database importer: Error " + e);
-                e.printStackTrace();
-            }
-
-            SQLiteDatabase checkDB = null;
-            int DB_Version = DatabaseBackend.DATABASE_VERSION;
-            int Backup_DB_Version = 0;
-
-            try {
-                String dbPath = TempFile.toString();
-                checkDB = SQLiteDatabase.openDatabase(dbPath, null, SQLiteDatabase.OPEN_READONLY);
-                Backup_DB_Version = checkDB.getVersion();
-                Log.d(Config.LOGTAG, "Backup found: " + checkDB + " Version: " + checkDB.getVersion());
-            } catch (SQLiteException e) {
-                //database does't exist yet.
-                Log.d(Config.LOGTAG, "No backup found: " + checkDB);
-            } catch (Exception e) {
-                Log.d(Config.LOGTAG, "Error importing backup: " + e);
-            }
-
-            if (checkDB != null) {
-                checkDB.close();
-            }
-            if (checkDB != null) {
-                Log.d(Config.LOGTAG, "checkDB = " + checkDB.toString() + ", Backup DB = " + Backup_DB_Version + ", DB = " + DB_Version);
-            }
-            if (checkDB != null && Backup_DB_Version != 0 && Backup_DB_Version <= DB_Version) {
-                try {
-                    ImportDatabase();
-                    importSuccessful = true;
-                } catch (Exception e) {
-                    importSuccessful = false;
-                    e.printStackTrace();
-                } finally {
-                    if (importSuccessful) {
-                        restart();
-                    }
-                }
-            } else if (checkDB != null && Backup_DB_Version == 0) {
-                WelcomeActivity.this.runOnUiThread(new Runnable() {
-                    public void run() {
-                        Toast.makeText(WelcomeActivity.this, R.string.Password_wrong, Toast.LENGTH_LONG).show();
-                        enterPasswordDialog(1);
-                    }
-                });
-            } else {
-                WelcomeActivity.this.runOnUiThread(new Runnable() {
-                    public void run() {
-                        Toast.makeText(WelcomeActivity.this, R.string.Import_failed, Toast.LENGTH_LONG).show();
-                    }
-                });
-            }
-        } else {
-            // Set the folder on the SDcard
-            File directory = new File(FileBackend.getBackupDirectory());
-            // Set the input file stream up:
-            FileInputStream InputFile = new FileInputStream(directory.getPath() + "/database.db");
-            // Temp output for DB checks
-            File TempFile = new File(directory.getPath() + "database.bak");
-            FileOutputStream OutputTemp = new FileOutputStream(TempFile);
-
-            try {
-                // Transfer bytes from in to out
-                byte[] buf = new byte[1024];
-                int len;
-                while ((len = InputFile.read(buf)) > 0) {
-                    OutputTemp.write(buf, 0, len);
-                }
-            } finally {
-                OutputTemp.close();
-            }
-
-            SQLiteDatabase checkDB = null;
-            int DB_Version = DatabaseBackend.DATABASE_VERSION;
-            int Backup_DB_Version = 0;
-
-            try {
-                String dbPath = TempFile.toString();
-                checkDB = SQLiteDatabase.openDatabase(dbPath, null, SQLiteDatabase.OPEN_READONLY);
-                Backup_DB_Version = checkDB.getVersion();
-                Log.d(Config.LOGTAG, "Backup found: " + checkDB + " Version: " + checkDB.getVersion());
-            } catch (SQLiteException e) {
-                //database does't exist yet.
-                Log.d(Config.LOGTAG, "No backup found: " + checkDB);
-            } catch (Exception e) {
-                Log.d(Config.LOGTAG, "Error importing backup: " + e);
-            }
-
-            if (checkDB != null) {
-                checkDB.close();
-            }
-            if (checkDB != null) {
-                Log.d(Config.LOGTAG, "checkDB = " + checkDB.toString() + ", Backup DB = " + Backup_DB_Version + ", DB = " + DB_Version);
-            }
-            if (checkDB != null && Backup_DB_Version != 0 && Backup_DB_Version <= DB_Version) {
-                try {
-                    ImportDatabase();
-                    importSuccessful = true;
-                } catch (Exception e) {
-                    importSuccessful = false;
-                    e.printStackTrace();
-                } finally {
-                    if (importSuccessful) {
-                        restart();
-                    }
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+        if (grantResults.length > 0) {
+            if (allGranted(grantResults)) {
+                switch (requestCode) {
+                    case REQUEST_IMPORT_BACKUP:
+                        startActivity(new Intent(this, ImportBackupActivity.class));
+                        break;
                 }
             } else {
-                WelcomeActivity.this.runOnUiThread(new Runnable() {
-                    public void run() {
-                        Toast.makeText(WelcomeActivity.this, R.string.Import_failed, Toast.LENGTH_LONG).show();
-                    }
-                });
+                Toast.makeText(this, R.string.no_storage_permission, Toast.LENGTH_SHORT).show();
             }
         }
-    }
-
-    private void ImportDatabase() throws Exception {
-        // Set location for the db:
-        final OutputStream OutputFile = new FileOutputStream(this.getDatabasePath(DatabaseBackend.DATABASE_NAME));
-        // Set the folder on the SDcard
-        File directory = new File(FileBackend.getBackupDirectory());
-        // Set the input file stream up:
-        final InputStream InputFile = new FileInputStream(directory.getPath() + "database.bak");
-        //set temp file
-        File TempFile = new File(directory.getPath() + "database.bak");
-
-        // Transfer bytes from the input file to the output file
-        byte[] buffer = new byte[1024];
-        int length;
-        while ((length = InputFile.read(buffer)) > 0) {
-            OutputFile.write(buffer, 0, length);
-        }
-        if (TempFile.exists()) {
-            Log.d(Config.LOGTAG, "Delete temp file from " + TempFile.toString());
-            TempFile.delete();
-        }
-    }
-
-    private void restart() {
-        //restart app
-        Log.d(Config.LOGTAG, "Restarting " + getBaseContext().getPackageManager().getLaunchIntentForPackage(getBaseContext().getPackageName()));
-        Intent intent = getBaseContext().getPackageManager().getLaunchIntentForPackage(getBaseContext().getPackageName());
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(intent);
-        overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
-        System.exit(0);
-    }
-
-    public boolean hasStoragePermission(int requestCode) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, requestCode);
-                return false;
-            } else {
-                return true;
+        if (writeGranted(grantResults, permissions)) {
+            if (xmppConnectionService != null) {
+                xmppConnectionService.restartFileObserver();
             }
-        } else {
-            return true;
         }
     }
-
-    public void addInviteUri(Intent intent) {
-        StartConversationActivity.addInviteUri(intent, getIntent());
-    }
-
-    public static void launch(AppCompatActivity activity) {
-        Intent intent = new Intent(activity, WelcomeActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        activity.startActivity(intent);
-        activity.overridePendingTransition(0, 0);
-    }
 }
\ No newline at end of file