Support for full backup/restore to sdcard

src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java

@@ -223,7 +223,7 @@ public class AdvancedPreferenceFragment extends CorrectedPreferenceFragment {
         Intent nextIntent = new Intent(getActivity(), ApplicationPreferencesActivity.class);
 
         Intent intent = new Intent(getActivity(), RegistrationActivity.class);
-        intent.putExtra("cancel_button", true);
+        intent.putExtra(RegistrationActivity.RE_REGISTRATION_EXTRA, true);
         intent.putExtra("next_intent", nextIntent);
         startActivity(intent);
       }

src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java

@@ -1,8 +1,11 @@
 package org.thoughtcrime.securesms.preferences;
 
+import android.Manifest;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.preference.EditTextPreference;
@@ -11,13 +14,26 @@ import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 import android.util.Log;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.backup.BackupDialog;
+import org.thoughtcrime.securesms.backup.FullBackupBase;
+import org.thoughtcrime.securesms.backup.FullBackupBase.BackupEvent;
+import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
+import org.thoughtcrime.securesms.jobs.LocalBackupJob;
+import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.preferences.widgets.ProgressPreference;
+import org.thoughtcrime.securesms.util.BackupUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Trimmer;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
@@ -41,7 +57,14 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
     findPreference(TextSecurePreferences.THREAD_TRIM_LENGTH)
         .setOnPreferenceChangeListener(new TrimLengthValidationListener());
 
+    findPreference(TextSecurePreferences.BACKUP_ENABLED)
+        .setOnPreferenceClickListener(new BackupClickListener());
+    findPreference(TextSecurePreferences.BACKUP_NOW)
+        .setOnPreferenceClickListener(new BackupCreateListener());
+
     initializeListSummary((ListPreference) findPreference(TextSecurePreferences.MESSAGE_BODY_TEXT_SIZE_PREF));
+
+    EventBus.getDefault().register(this);
   }
 
   @Override
@@ -54,6 +77,38 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
     super.onResume();
     ((ApplicationPreferencesActivity)getActivity()).getSupportActionBar().setTitle(R.string.preferences__chats);
     setMediaDownloadSummaries();
+    setBackupSummary();
+  }
+
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+    EventBus.getDefault().unregister(this);
+  }
+
+  @Override
+  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
+  }
+
+  @Subscribe(threadMode = ThreadMode.MAIN)
+  public void onEvent(BackupEvent event) {
+    ProgressPreference preference = (ProgressPreference)findPreference(TextSecurePreferences.BACKUP_NOW);
+
+    if (event.getType() == BackupEvent.Type.PROGRESS) {
+      preference.setEnabled(false);
+      preference.setSummary(getString(R.string.ChatsPreferenceFragment_in_progress));
+      preference.setProgress(event.getCount());
+    } else if (event.getType() == BackupEvent.Type.FINISHED) {
+      preference.setEnabled(true);
+      preference.setProgressVisible(false);
+      setBackupSummary();
+    }
+  }
+
+  private void setBackupSummary() {
+    findPreference(TextSecurePreferences.BACKUP_NOW)
+        .setSummary(String.format(getString(R.string.ChatsPreferenceFragment_last_backup_s), BackupUtil.getLastBackupTime(getContext(), Locale.US)));
   }
 
   private void setMediaDownloadSummaries() {
@@ -78,6 +133,46 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
                                : TextUtils.join(", ", outValues);
   }
 
+  private class BackupClickListener implements Preference.OnPreferenceClickListener {
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+      Permissions.with(ChatsPreferenceFragment.this)
+                 .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                 .ifNecessary()
+                 .onAllGranted(() -> {
+                   if (!((SwitchPreferenceCompat)preference).isChecked()) {
+                     BackupDialog.showEnableBackupDialog(getActivity(), (SwitchPreferenceCompat)preference);
+                   } else {
+                     BackupDialog.showDisableBackupDialog(getActivity(), (SwitchPreferenceCompat)preference);
+                   }
+                 })
+                 .withPermanentDenialDialog(getString(R.string.ChatsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups))
+                 .execute();
+
+      return true;
+    }
+  }
+
+  private class BackupCreateListener implements Preference.OnPreferenceClickListener {
+    @SuppressLint("StaticFieldLeak")
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+      Permissions.with(ChatsPreferenceFragment.this)
+                 .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                 .ifNecessary()
+                 .onAllGranted(() -> {
+                   Log.w(TAG, "Queing backup...");
+                   ApplicationContext.getInstance(getContext())
+                                     .getJobManager()
+                                     .add(new LocalBackupJob(getContext()));
+                 })
+                 .withPermanentDenialDialog(getString(R.string.ChatsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups))
+                 .execute();
+
+      return true;
+    }
+  }
+
   private class TrimNowClickListener implements Preference.OnPreferenceClickListener {
     @Override
     public boolean onPreferenceClick(Preference preference) {

src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java

@@ -0,0 +1,61 @@
+package org.thoughtcrime.securesms.preferences.widgets;
+
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.R;
+
+public class ProgressPreference extends Preference {
+
+  private View        container;
+  private TextView    progressText;
+
+  public ProgressPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    super(context, attrs, defStyleAttr, defStyleRes);
+    initialize();
+  }
+
+  public ProgressPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+    initialize();
+  }
+
+  public ProgressPreference(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    initialize();
+  }
+
+  public ProgressPreference(Context context) {
+    super(context);
+    initialize();
+  }
+
+  private void initialize() {
+    setWidgetLayoutResource(R.layout.preference_widget_progress);
+  }
+
+  @Override
+  public void onBindViewHolder(PreferenceViewHolder view) {
+    super.onBindViewHolder(view);
+
+    this.container    = view.findViewById(R.id.container);
+    this.progressText = (TextView) view.findViewById(R.id.progress_text);
+
+    this.container.setVisibility(View.GONE);
+  }
+
+  public void setProgress(int count) {
+    container.setVisibility(View.VISIBLE);
+    progressText.setText(getContext().getString(R.string.ProgressPreference_d_messages_so_far, count));
+  }
+
+  public void setProgressVisible(boolean visible) {
+    container.setVisibility(visible ? View.VISIBLE : View.GONE);
+  }
+
+}