empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

temporarily disable encrypted backup

Browse source 
// FREEBIE
This commit is contained in:
Jake McGinty 2014-06-22 16:29:05 -07:00
parent 622d8975fc
commit 5121ab0eed
4 changed files with 84 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/layout/export_fragment.xml
View file

@ -15,7 +15,7 @@
android:background="#ffeaeaea"> android:background="#ffeaeaea">
<LinearLayout android:id="@+id/export_encrypted_backup" <!--LinearLayout android:id="@+id/export_encrypted_backup"
android:clickable="true" android:clickable="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -53,7 +53,7 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout-->
<LinearLayout android:id="@+id/export_plaintext_backup" <LinearLayout android:id="@+id/export_plaintext_backup"

4
res/values/strings.xml
View file

@ -161,6 +161,10 @@
<string name="GroupCreateActivity_creating_group">Creating %1$s&#8230;</string> <string name="GroupCreateActivity_creating_group">Creating %1$s&#8230;</string>
<string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Cannot add non-TextSecure contacts to an existing TextSecure group</string> <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Cannot add non-TextSecure contacts to an existing TextSecure group</string>
<!-- ImportExportActivity -->
<string name="ImportExportActivity_import">Import</string>
<string name="ImportExportActivity_export">Export</string>
<!-- ImportFragment --> <!-- ImportFragment -->
<string name="ImportFragment_import_system_sms_database">Import system SMS database?</string> <string name="ImportFragment_import_system_sms_database">Import system SMS database?</string>
<string name="ImportFragment_this_will_import_messages_from_the_system">This will import <string name="ImportFragment_this_will_import_messages_from_the_system">This will import

148
src/org/thoughtcrime/securesms/ExportFragment.java
View file

@ -16,7 +16,7 @@ import android.widget.Toast;
import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.app.SherlockFragment;
import org.whispersystems.textsecure.crypto.MasterSecret; import org.whispersystems.textsecure.crypto.MasterSecret;
import org.thoughtcrime.securesms.util.Dialogs; import org.thoughtcrime.securesms.util.Dialogs;
import org.thoughtcrime.securesms.database.EncryptedBackupExporter; //import org.thoughtcrime.securesms.database.EncryptedBackupExporter;
import org.thoughtcrime.securesms.database.NoExternalStorageException; import org.thoughtcrime.securesms.database.NoExternalStorageException;
import org.thoughtcrime.securesms.database.PlaintextBackupExporter; import org.thoughtcrime.securesms.database.PlaintextBackupExporter;
@ -38,15 +38,15 @@ public class ExportFragment extends SherlockFragment {
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
View layout = inflater.inflate(R.layout.export_fragment, container, false); View layout = inflater.inflate(R.layout.export_fragment, container, false);
View exportEncryptedView = layout.findViewById(R.id.export_encrypted_backup); // View exportEncryptedView = layout.findViewById(R.id.export_encrypted_backup);
View exportPlaintextView = layout.findViewById(R.id.export_plaintext_backup); View exportPlaintextView = layout.findViewById(R.id.export_plaintext_backup);
exportEncryptedView.setOnClickListener(new View.OnClickListener() { // exportEncryptedView.setOnClickListener(new View.OnClickListener() {
@Override // @Override
public void onClick(View v) { // public void onClick(View v) {
handleExportEncryptedBackup(); // handleExportEncryptedBackup();
} // }
}); // });
exportPlaintextView.setOnClickListener(new View.OnClickListener() { exportPlaintextView.setOnClickListener(new View.OnClickListener() {
@Override @Override
@ -58,20 +58,20 @@ public class ExportFragment extends SherlockFragment {
return layout; return layout;
} }
private void handleExportEncryptedBackup() { // private void handleExportEncryptedBackup() {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); // AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setIcon(Dialogs.resolveIcon(getActivity(), R.attr.dialog_info_icon)); // builder.setIcon(Dialogs.resolveIcon(getActivity(), R.attr.dialog_info_icon));
builder.setTitle(getActivity().getString(R.string.ExportFragment_export_to_sd_card)); // builder.setTitle(getActivity().getString(R.string.ExportFragment_export_to_sd_card));
builder.setMessage(getActivity().getString(R.string.ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages)); // builder.setMessage(getActivity().getString(R.string.ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages));
builder.setPositiveButton(getActivity().getString(R.string.ExportFragment_export), new Dialog.OnClickListener() { // builder.setPositiveButton(getActivity().getString(R.string.ExportFragment_export), new Dialog.OnClickListener() {
@Override // @Override
public void onClick(DialogInterface dialog, int which) { // public void onClick(DialogInterface dialog, int which) {
new ExportEncryptedTask().execute(); // new ExportEncryptedTask().execute();
} // }
}); // });
builder.setNegativeButton(getActivity().getString(R.string.ExportFragment_cancel), null); // builder.setNegativeButton(getActivity().getString(R.string.ExportFragment_cancel), null);
builder.show(); // builder.show();
} // }
private void handleExportPlaintextBackup() { private void handleExportPlaintextBackup() {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
@ -143,56 +143,56 @@ public class ExportFragment extends SherlockFragment {
} }
} }
private class ExportEncryptedTask extends AsyncTask<Void, Void, Integer> { // private class ExportEncryptedTask extends AsyncTask<Void, Void, Integer> {
private ProgressDialog dialog; // private ProgressDialog dialog;
//
@Override // @Override
protected void onPreExecute() { // protected void onPreExecute() {
dialog = ProgressDialog.show(getActivity(), // dialog = ProgressDialog.show(getActivity(),
getActivity().getString(R.string.ExportFragment_exporting), // getActivity().getString(R.string.ExportFragment_exporting),
getActivity().getString(R.string.ExportFragment_exporting_keys_settings_and_messages), // getActivity().getString(R.string.ExportFragment_exporting_keys_settings_and_messages),
true, false); // true, false);
} // }
//
@Override // @Override
protected void onPostExecute(Integer result) { // protected void onPostExecute(Integer result) {
Context context = getActivity(); // Context context = getActivity();
//
if (dialog != null) dialog.dismiss(); // if (dialog != null) dialog.dismiss();
//
if (context == null) return; // if (context == null) return;
//
switch (result) { // switch (result) {
case NO_SD_CARD: // case NO_SD_CARD:
Toast.makeText(context, // Toast.makeText(context,
context.getString(R.string.ExportFragment_error_unable_to_write_to_sd_card), // context.getString(R.string.ExportFragment_error_unable_to_write_to_sd_card),
Toast.LENGTH_LONG).show(); // Toast.LENGTH_LONG).show();
break; // break;
case IO_ERROR: // case IO_ERROR:
Toast.makeText(context, // Toast.makeText(context,
context.getString(R.string.ExportFragment_error_while_writing_to_sd_card), // context.getString(R.string.ExportFragment_error_while_writing_to_sd_card),
Toast.LENGTH_LONG).show(); // Toast.LENGTH_LONG).show();
break; // break;
case SUCCESS: // case SUCCESS:
Toast.makeText(context, // Toast.makeText(context,
context.getString(R.string.ExportFragment_success), // context.getString(R.string.ExportFragment_success),
Toast.LENGTH_LONG).show(); // Toast.LENGTH_LONG).show();
break; // break;
} // }
} // }
//
@Override // @Override
protected Integer doInBackground(Void... params) { // protected Integer doInBackground(Void... params) {
try { // try {
EncryptedBackupExporter.exportToSd(getActivity()); // EncryptedBackupExporter.exportToSd(getActivity());
return SUCCESS; // return SUCCESS;
} catch (NoExternalStorageException e) { // } catch (NoExternalStorageException e) {
Log.w("ExportFragment", e); // Log.w("ExportFragment", e);
return NO_SD_CARD; // return NO_SD_CARD;
} catch (IOException e) { // } catch (IOException e) {
Log.w("ExportFragment", e); // Log.w("ExportFragment", e);
return IO_ERROR; // return IO_ERROR;
} // }
} // }
} // }
} }

8
src/org/thoughtcrime/securesms/ImportExportActivity.java
View file

@ -72,8 +72,8 @@ public class ImportExportActivity extends PassphraseRequiredSherlockFragmentActi
public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {} public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {}
}; };
actionBar.addTab(actionBar.newTab().setText("Import").setTabListener(tabListener)); actionBar.addTab(actionBar.newTab().setText(R.string.ImportExportActivity_import).setTabListener(tabListener));
actionBar.addTab(actionBar.newTab().setText("Export").setTabListener(tabListener)); actionBar.addTab(actionBar.newTab().setText(R.string.ImportExportActivity_export).setTabListener(tabListener));
} }
private class TabPagerAdapter extends FragmentStatePagerAdapter { private class TabPagerAdapter extends FragmentStatePagerAdapter {
@ -102,8 +102,8 @@ public class ImportExportActivity extends PassphraseRequiredSherlockFragmentActi
@Override @Override
public CharSequence getPageTitle(int i) { public CharSequence getPageTitle(int i) {
if (i == 0) return "Import"; if (i == 0) return getString(R.string.ImportExportActivity_import);
else return "Export"; else return getString(R.string.ImportExportActivity_export);
} }
} }