From 7deab10a9f4fb309af0153bb486e41abede7d74f Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 1 Oct 2018 23:24:07 +0200 Subject: [PATCH] cleanup chat preferences --- AndroidManifest.xml | 8 +- res/values/arrays.xml | 26 --- res/xml/preferences_advanced.xml | 3 +- res/xml/preferences_chats.xml | 52 ----- src/com/b44t/messenger/DcContext.java | 2 + .../securesms/backup/BackupDialog.java | 86 -------- .../securesms/database/MmsDatabase.java | 8 +- .../securesms/database/SmsDatabase.java | 18 +- .../securesms/jobs/LocalBackupJob.java | 96 --------- .../securesms/jobs/TrimThreadJob.java | 65 ------ .../preferences/ChatsPreferenceFragment.java | 196 ++++-------------- .../service/LocalBackupListener.java | 39 ---- .../securesms/util/AttachmentUtil.java | 48 +++-- .../securesms/util/BackupUtil.java | 160 -------------- .../securesms/util/TextSecurePreferences.java | 55 ----- 15 files changed, 86 insertions(+), 776 deletions(-) delete mode 100644 src/org/thoughtcrime/securesms/backup/BackupDialog.java delete mode 100644 src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java delete mode 100644 src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java delete mode 100644 src/org/thoughtcrime/securesms/service/LocalBackupListener.java delete mode 100644 src/org/thoughtcrime/securesms/util/BackupUtil.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 302fe5f9b..4f0cea385 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -501,13 +501,7 @@ - - - - - - - + diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 9579ea9d2..5e66c5d2d 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -213,33 +213,7 @@ - - image - audio - video - documents - - - @string/arrays__images - @string/arrays__audio - @string/arrays__video - @string/arrays__documents - - - - image - audio - - - - image - audio - video - documents - - - diff --git a/res/xml/preferences_advanced.xml b/res/xml/preferences_advanced.xml index aee5dae4c..4a70e139d 100644 --- a/res/xml/preferences_advanced.xml +++ b/res/xml/preferences_advanced.xml @@ -14,7 +14,8 @@ + android:title="@string/preferences__backup" + android:summary="@string/preferences_chats__backup_chats_to_external_storage"/> diff --git a/res/xml/preferences_chats.xml b/res/xml/preferences_chats.xml index d9407a3b9..a3b9ea0d4 100644 --- a/res/xml/preferences_chats.xml +++ b/res/xml/preferences_chats.xml @@ -2,34 +2,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/com/b44t/messenger/DcContext.java b/src/com/b44t/messenger/DcContext.java index 11187640f..29a12d9e4 100644 --- a/src/com/b44t/messenger/DcContext.java +++ b/src/com/b44t/messenger/DcContext.java @@ -29,6 +29,8 @@ public class DcContext { public final static int DC_PREF_DEFAULT_E2EE_ENABLED = 1; public final static int DC_PREF_DEFAULT_MDNS_ENABLED = 1; + public final static int DC_PREF_DEFAULT_TRIM_ENABLED = 0; + public final static int DC_PREF_DEFAULT_TRIM_LENGTH = 500; public final static int DC_EVENT_INFO = 100; public final static int DC_EVENT_WARNING = 300; diff --git a/src/org/thoughtcrime/securesms/backup/BackupDialog.java b/src/org/thoughtcrime/securesms/backup/BackupDialog.java deleted file mode 100644 index 364329049..000000000 --- a/src/org/thoughtcrime/securesms/backup/BackupDialog.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.thoughtcrime.securesms.backup; - - -import android.content.ClipData; -import android.content.ClipboardManager; -import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.TextView; -import android.widget.Toast; - -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.components.SwitchPreferenceCompat; -import org.thoughtcrime.securesms.service.LocalBackupListener; -import org.thoughtcrime.securesms.util.BackupUtil; -import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.thoughtcrime.securesms.util.Util; - -public class BackupDialog { - - public static void showEnableBackupDialog(@NonNull Context context, @NonNull SwitchPreferenceCompat preference) { - String[] password = BackupUtil.generateBackupPassphrase(); - AlertDialog dialog = new AlertDialog.Builder(context) - .setTitle(R.string.BackupDialog_enable_local_backups) - .setView(R.layout.backup_enable_dialog) - .setPositiveButton(R.string.BackupDialog_enable_backups, null) - .setNegativeButton(android.R.string.cancel, null) - .create(); - - dialog.setOnShowListener(created -> { - Button button = ((AlertDialog) created).getButton(AlertDialog.BUTTON_POSITIVE); - button.setOnClickListener(v -> { - CheckBox confirmationCheckBox = dialog.findViewById(R.id.confirmation_check); - if (confirmationCheckBox.isChecked()) { - TextSecurePreferences.setBackupPassphrase(context, Util.join(password, " ")); - TextSecurePreferences.setBackupEnabled(context, true); - LocalBackupListener.schedule(context); - - preference.setChecked(true); - created.dismiss(); - } else { - Toast.makeText(context, R.string.BackupDialog_please_acknowledge_your_understanding_by_marking_the_confirmation_check_box, Toast.LENGTH_LONG).show(); - } - }); - }); - - dialog.show(); - - CheckBox checkBox = dialog.findViewById(R.id.confirmation_check); - TextView textView = dialog.findViewById(R.id.confirmation_text); - - ((TextView)dialog.findViewById(R.id.code_first)).setText(password[0]); - ((TextView)dialog.findViewById(R.id.code_second)).setText(password[1]); - ((TextView)dialog.findViewById(R.id.code_third)).setText(password[2]); - - ((TextView)dialog.findViewById(R.id.code_fourth)).setText(password[3]); - ((TextView)dialog.findViewById(R.id.code_fifth)).setText(password[4]); - ((TextView)dialog.findViewById(R.id.code_sixth)).setText(password[5]); - - textView.setOnClickListener(v -> checkBox.toggle()); - - dialog.findViewById(R.id.number_table).setOnClickListener(v -> { - ((ClipboardManager)context.getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("text", Util.join(password, " "))); - Toast.makeText(context, R.string.BackupDialog_copied_to_clipboard, Toast.LENGTH_LONG).show(); - }); - - - } - - public static void showDisableBackupDialog(@NonNull Context context, @NonNull SwitchPreferenceCompat preference) { - new AlertDialog.Builder(context) - .setTitle(R.string.BackupDialog_delete_backups) - .setMessage(R.string.BackupDialog_disable_and_delete_all_local_backups) - .setNegativeButton(android.R.string.cancel, null) - .setPositiveButton(R.string.BackupDialog_delete_backups_statement, (dialog, which) -> { - TextSecurePreferences.setBackupPassphrase(context, null); - TextSecurePreferences.setBackupEnabled(context, false); - BackupUtil.deleteAllBackups(); - preference.setChecked(false); - }) - .create() - .show(); - } -} diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java index 8225ef189..322231082 100644 --- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -51,7 +51,6 @@ import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.NotificationMmsMessageRecord; import org.thoughtcrime.securesms.database.model.Quote; import org.thoughtcrime.securesms.jobmanager.JobManager; -import org.thoughtcrime.securesms.jobs.TrimThreadJob; import org.thoughtcrime.securesms.mms.IncomingMediaMessage; import org.thoughtcrime.securesms.mms.MmsException; import org.thoughtcrime.securesms.mms.OutgoingExpirationUpdateMessage; @@ -63,7 +62,6 @@ import org.thoughtcrime.securesms.mms.SlideDeck; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientFormattingException; import org.thoughtcrime.securesms.util.JsonUtils; -import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; import org.whispersystems.libsignal.util.guava.Optional; @@ -756,7 +754,7 @@ public class MmsDatabase extends MessagingDatabase { } notifyConversationListeners(threadId); - jobManager.add(new TrimThreadJob(context, threadId)); +// jobManager.add(new TrimThreadJob(context, threadId)); return Optional.of(new InsertResult(messageId, threadId)); } @@ -837,7 +835,7 @@ public class MmsDatabase extends MessagingDatabase { DatabaseFactory.getThreadDatabase(context).incrementUnread(threadId, 1); } - jobManager.add(new TrimThreadJob(context, threadId)); +// jobManager.add(new TrimThreadJob(context, threadId)); } public long insertMessageOutbox(@NonNull OutgoingMediaMessage message, @@ -901,7 +899,7 @@ public class MmsDatabase extends MessagingDatabase { DatabaseFactory.getThreadDatabase(context).setLastSeen(threadId); DatabaseFactory.getThreadDatabase(context).setHasSent(threadId, true); - jobManager.add(new TrimThreadJob(context, threadId)); +// jobManager.add(new TrimThreadJob(context, threadId)); return messageId; } diff --git a/src/org/thoughtcrime/securesms/database/SmsDatabase.java b/src/org/thoughtcrime/securesms/database/SmsDatabase.java index 80a91230c..190e181c5 100644 --- a/src/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/src/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -37,13 +37,11 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.SmsMessageRecord; import org.thoughtcrime.securesms.jobmanager.JobManager; -import org.thoughtcrime.securesms.jobs.TrimThreadJob; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.sms.IncomingGroupMessage; import org.thoughtcrime.securesms.sms.IncomingTextMessage; import org.thoughtcrime.securesms.sms.OutgoingTextMessage; import org.thoughtcrime.securesms.util.JsonUtils; -import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.whispersystems.libsignal.util.guava.Optional; import java.io.IOException; @@ -461,7 +459,7 @@ public class SmsDatabase extends MessagingDatabase { DatabaseFactory.getThreadDatabase(context).update(record.getThreadId(), true); notifyConversationListeners(record.getThreadId()); - jobManager.add(new TrimThreadJob(context, record.getThreadId())); +// jobManager.add(new TrimThreadJob(context, record.getThreadId())); return new Pair<>(newMessageId, record.getThreadId()); } catch (NoSuchMessageException e) { @@ -499,7 +497,7 @@ public class SmsDatabase extends MessagingDatabase { DatabaseFactory.getThreadDatabase(context).update(threadId, true); notifyConversationListeners(threadId); - jobManager.add(new TrimThreadJob(context, threadId)); +// jobManager.add(new TrimThreadJob(context, threadId)); if (unread) { DatabaseFactory.getThreadDatabase(context).incrementUnread(threadId, 1); @@ -590,9 +588,9 @@ public class SmsDatabase extends MessagingDatabase { notifyConversationListeners(threadId); - if (!message.isIdentityUpdate() && !message.isIdentityVerified() && !message.isIdentityDefault()) { - jobManager.add(new TrimThreadJob(context, threadId)); - } +// if (!message.isIdentityUpdate() && !message.isIdentityVerified() && !message.isIdentityDefault()) { +// jobManager.add(new TrimThreadJob(context, threadId)); +// } return Optional.of(new InsertResult(messageId, threadId)); } @@ -648,9 +646,9 @@ public class SmsDatabase extends MessagingDatabase { notifyConversationListeners(threadId); - if (!message.isIdentityVerified() && !message.isIdentityDefault()) { - jobManager.add(new TrimThreadJob(context, threadId)); - } +// if (!message.isIdentityVerified() && !message.isIdentityDefault()) { +// jobManager.add(new TrimThreadJob(context, threadId)); +// } return messageId; } diff --git a/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java b/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java deleted file mode 100644 index b67b23fc0..000000000 --- a/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java +++ /dev/null @@ -1,96 +0,0 @@ -package org.thoughtcrime.securesms.jobs; - - -import android.Manifest; -import android.content.Context; -import android.support.annotation.NonNull; -import android.util.Log; - -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.backup.FullBackupExporter; -import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider; -import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.database.NoExternalStorageException; -import org.thoughtcrime.securesms.jobmanager.JobParameters; -import org.thoughtcrime.securesms.permissions.Permissions; -import org.thoughtcrime.securesms.service.GenericForegroundService; -import org.thoughtcrime.securesms.util.BackupUtil; -import org.thoughtcrime.securesms.util.StorageUtil; -import org.thoughtcrime.securesms.util.TextSecurePreferences; - -import java.io.File; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; -import java.util.concurrent.TimeUnit; - -public class LocalBackupJob extends ContextJob { - - private static final String TAG = LocalBackupJob.class.getSimpleName(); - - public LocalBackupJob(@NonNull Context context) { - super(context, JobParameters.newBuilder() - .withGroupId("__LOCAL_BACKUP__") - .withWakeLock(true, 10, TimeUnit.SECONDS) - .create()); - } - - @Override - public void onAdded() {} - - @Override - public void onRun() throws NoExternalStorageException, IOException { - Log.w(TAG, "Executing backup job..."); - - if (!Permissions.hasAll(context, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { - throw new IOException("No external storage permission!"); - } - - GenericForegroundService.startForegroundTask(context, - context.getString(R.string.LocalBackupJob_creating_backup)); - - try { - String backupPassword = TextSecurePreferences.getBackupPassphrase(context); - File backupDirectory = StorageUtil.getBackupDirectory(); - String timestamp = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US).format(new Date()); - String fileName = String.format("signal-%s.backup", timestamp); - File backupFile = new File(backupDirectory, fileName); - - if (backupFile.exists()) { - throw new IOException("Backup file already exists?"); - } - - if (backupPassword == null) { - throw new IOException("Backup password is null"); - } - - File tempFile = File.createTempFile("backup", "tmp", StorageUtil.getBackupCacheDirectory(context)); - - FullBackupExporter.export(context, - AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret(), - DatabaseFactory.getBackupDatabase(context), - tempFile, - backupPassword); - - if (!tempFile.renameTo(backupFile)) { - tempFile.delete(); - throw new IOException("Renaming temporary backup file failed!"); - } - - BackupUtil.deleteOldBackups(); - } finally { - GenericForegroundService.stopForegroundTask(context); - } - } - - @Override - public boolean onShouldRetry(Exception e) { - return false; - } - - @Override - public void onCanceled() { - - } -} diff --git a/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java b/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java deleted file mode 100644 index 634d0e63b..000000000 --- a/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright (C) 2014 Open Whisper Systems - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.thoughtcrime.securesms.jobs; - -import android.content.Context; -import android.util.Log; - -import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.jobmanager.Job; -import org.thoughtcrime.securesms.jobmanager.JobParameters; -import org.thoughtcrime.securesms.util.TextSecurePreferences; - -public class TrimThreadJob extends Job { - - private static final String TAG = TrimThreadJob.class.getSimpleName(); - - private final Context context; - private final long threadId; - - public TrimThreadJob(Context context, long threadId) { - super(JobParameters.newBuilder().withGroupId(TrimThreadJob.class.getSimpleName()).create()); - this.context = context; - this.threadId = threadId; - } - - @Override - public void onAdded() { - - } - - @Override - public void onRun() { - boolean trimmingEnabled = TextSecurePreferences.isThreadLengthTrimmingEnabled(context); - int threadLengthLimit = TextSecurePreferences.getThreadTrimLength(context); - - if (!trimmingEnabled) - return; - - DatabaseFactory.getThreadDatabase(context).trimThread(threadId, threadLengthLimit); - } - - @Override - public boolean onShouldRetry(Exception exception) { - return false; - } - - @Override - public void onCanceled() { - Log.w(TAG, "Canceling trim attempt: " + threadId); - } -} diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java index cadeda527..8b13482b5 100644 --- a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java @@ -1,70 +1,50 @@ 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.CheckBoxPreference; import android.support.v7.preference.EditTextPreference; import android.support.v7.preference.ListPreference; import android.support.v7.preference.Preference; -import android.text.TextUtils; import android.util.Log; +import android.widget.Toast; + +import com.b44t.messenger.DcContext; -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.connect.ApplicationDcContext; +import org.thoughtcrime.securesms.connect.DcHelper; 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 { private static final String TAG = ChatsPreferenceFragment.class.getSimpleName(); + private ApplicationDcContext dcContext; + + CheckBoxPreference trimEnabledCheckbox; + @Override public void onCreate(Bundle paramBundle) { super.onCreate(paramBundle); + dcContext = DcHelper.getContext(getContext()); - findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_MOBILE_PREF) - .setOnPreferenceChangeListener(new MediaDownloadChangeListener()); - findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_WIFI_PREF) - .setOnPreferenceChangeListener(new MediaDownloadChangeListener()); - findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_ROAMING_PREF) - .setOnPreferenceChangeListener(new MediaDownloadChangeListener()); findPreference(TextSecurePreferences.MESSAGE_BODY_TEXT_SIZE_PREF) .setOnPreferenceChangeListener(new ListSummaryListener()); - findPreference(TextSecurePreferences.THREAD_TRIM_NOW) - .setOnPreferenceClickListener(new TrimNowClickListener()); - findPreference(TextSecurePreferences.THREAD_TRIM_LENGTH) - .setOnPreferenceChangeListener(new TrimLengthValidationListener()); + trimEnabledCheckbox = (CheckBoxPreference) findPreference("pref_trim_threads"); + trimEnabledCheckbox.setOnPreferenceChangeListener(new TrimEnabledListener()); - findPreference(TextSecurePreferences.BACKUP_ENABLED) - .setOnPreferenceClickListener(new BackupClickListener()); - findPreference(TextSecurePreferences.BACKUP_NOW) - .setOnPreferenceClickListener(new BackupCreateListener()); + findPreference("pref_trim_length") + .setOnPreferenceChangeListener(new TrimLengthValidationListener()); + findPreference("pref_trim_now") + .setOnPreferenceClickListener(new TrimNowClickListener()); initializeListSummary((ListPreference) findPreference(TextSecurePreferences.MESSAGE_BODY_TEXT_SIZE_PREF)); - - EventBus.getDefault().register(this); } @Override @@ -76,14 +56,13 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment { public void onResume() { super.onResume(); ((ApplicationPreferencesActivity)getActivity()).getSupportActionBar().setTitle(R.string.preferences__chats); - setMediaDownloadSummaries(); - setBackupSummary(); + + trimEnabledCheckbox.setChecked(0!=dcContext.getConfigInt("trim_enabled", DcContext.DC_PREF_DEFAULT_TRIM_ENABLED)); } @Override public void onDestroy() { super.onDestroy(); - EventBus.getDefault().unregister(this); } @Override @@ -91,116 +70,12 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment { 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() { - findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_MOBILE_PREF) - .setSummary(getSummaryForMediaPreference(TextSecurePreferences.getMobileMediaDownloadAllowed(getActivity()))); - findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_WIFI_PREF) - .setSummary(getSummaryForMediaPreference(TextSecurePreferences.getWifiMediaDownloadAllowed(getActivity()))); - findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_ROAMING_PREF) - .setSummary(getSummaryForMediaPreference(TextSecurePreferences.getRoamingMediaDownloadAllowed(getActivity()))); - } - - private CharSequence getSummaryForMediaPreference(Set allowedNetworks) { - String[] keys = getResources().getStringArray(R.array.pref_media_download_entries); - String[] values = getResources().getStringArray(R.array.pref_media_download_values); - List outValues = new ArrayList<>(allowedNetworks.size()); - - for (int i=0; i < keys.length; i++) { - if (allowedNetworks.contains(keys[i])) outValues.add(values[i]); - } - - return outValues.isEmpty() ? getResources().getString(R.string.preferences__none) - : TextUtils.join(", ", outValues); - } - - private class BackupClickListener implements Preference.OnPreferenceClickListener { + private class TrimEnabledListener implements Preference.OnPreferenceChangeListener { @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) { - final int threadLengthLimit = TextSecurePreferences.getThreadTrimLength(getActivity()); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - builder.setTitle(R.string.ApplicationPreferencesActivity_delete_all_old_messages_now); - builder.setMessage(getResources().getQuantityString(R.plurals.ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages, - threadLengthLimit, threadLengthLimit)); - builder.setPositiveButton(R.string.ApplicationPreferencesActivity_delete, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - Trimmer.trimAllThreads(getActivity(), threadLengthLimit); - } - }); - - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - - return true; - } - } - - private class MediaDownloadChangeListener implements Preference.OnPreferenceChangeListener { - @SuppressWarnings("unchecked") - @Override public boolean onPreferenceChange(Preference preference, Object newValue) { - Log.w(TAG, "onPreferenceChange"); - preference.setSummary(getSummaryForMediaPreference((Set)newValue)); + public boolean onPreferenceChange(final Preference preference, Object newValue) { + boolean enabled = (Boolean) newValue; + dcContext.setConfigInt("trim_enabled", enabled? 1 : 0); + Toast.makeText(getActivity(), "Not yet implemented.", Toast.LENGTH_LONG).show(); return true; } } @@ -208,8 +83,8 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment { private class TrimLengthValidationListener implements Preference.OnPreferenceChangeListener { public TrimLengthValidationListener() { - EditTextPreference preference = (EditTextPreference)findPreference(TextSecurePreferences.THREAD_TRIM_LENGTH); - onPreferenceChange(preference, preference.getText()); + EditTextPreference preference = (EditTextPreference)findPreference("pref_trim_length"); + onPreferenceChange(preference, dcContext.getConfig("trim_length", ""+DcContext.DC_PREF_DEFAULT_TRIM_LENGTH)); } @Override @@ -230,11 +105,30 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment { return false; } + dcContext.setConfigInt("trim_length", value); preference.setSummary(getResources().getQuantityString(R.plurals.ApplicationPreferencesActivity_messages_per_conversation, value, value)); return true; } } + private class TrimNowClickListener implements Preference.OnPreferenceClickListener { + @Override + public boolean onPreferenceClick(Preference preference) { + final int threadLengthLimit = dcContext.getConfigInt("trim_length", DcContext.DC_PREF_DEFAULT_TRIM_LENGTH); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setTitle(R.string.ApplicationPreferencesActivity_delete_all_old_messages_now); + builder.setMessage(getResources().getQuantityString(R.plurals.ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_d_most_recent_messages, + threadLengthLimit, threadLengthLimit)); + builder.setPositiveButton(R.string.ApplicationPreferencesActivity_delete, + (dialog, which) -> Toast.makeText(getActivity(), "Not yet implemented.", Toast.LENGTH_LONG).show()); + + builder.setNegativeButton(android.R.string.cancel, null); + builder.show(); + + return true; + } + } + public static CharSequence getSummary(Context context) { return null; } diff --git a/src/org/thoughtcrime/securesms/service/LocalBackupListener.java b/src/org/thoughtcrime/securesms/service/LocalBackupListener.java deleted file mode 100644 index d60dad349..000000000 --- a/src/org/thoughtcrime/securesms/service/LocalBackupListener.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.thoughtcrime.securesms.service; - - -import android.content.Context; -import android.content.Intent; - -import org.thoughtcrime.securesms.ApplicationContext; -import org.thoughtcrime.securesms.jobs.LocalBackupJob; -import org.thoughtcrime.securesms.util.TextSecurePreferences; - -import java.util.concurrent.TimeUnit; - -public class LocalBackupListener extends PersistentAlarmManagerListener { - - private static final long INTERVAL = TimeUnit.DAYS.toMillis(1); - - @Override - protected long getNextScheduledExecutionTime(Context context) { - return TextSecurePreferences.getNextBackupTime(context); - } - - @Override - protected long onAlarm(Context context, long scheduledTime) { - if (TextSecurePreferences.isBackupEnabled(context)) { - ApplicationContext.getInstance(context).getJobManager().add(new LocalBackupJob(context)); - } - - long nextTime = System.currentTimeMillis() + INTERVAL; - TextSecurePreferences.setNextBackupTime(context, nextTime); - - return nextTime; - } - - public static void schedule(Context context) { - if (TextSecurePreferences.isBackupEnabled(context)) { - new LocalBackupListener().onReceive(context, new Intent()); - } - } -} diff --git a/src/org/thoughtcrime/securesms/util/AttachmentUtil.java b/src/org/thoughtcrime/securesms/util/AttachmentUtil.java index 575578244..ab5bc0d44 100644 --- a/src/org/thoughtcrime/securesms/util/AttachmentUtil.java +++ b/src/org/thoughtcrime/securesms/util/AttachmentUtil.java @@ -26,25 +26,26 @@ public class AttachmentUtil { @WorkerThread public static boolean isAutoDownloadPermitted(@NonNull Context context, @Nullable DatabaseAttachment attachment) { - if (attachment == null) { - Log.w(TAG, "attachment was null, returning vacuous true"); - return true; - } - - if (isFromUnknownContact(context, attachment)) { - return false; - } - - Set allowedTypes = getAllowedAutoDownloadTypes(context); - String contentType = attachment.getContentType(); - - if (attachment.isVoiceNote() || (MediaUtil.isAudio(attachment) && TextUtils.isEmpty(attachment.getFileName()))) { - return true; - } else if (isNonDocumentType(contentType)) { - return allowedTypes.contains(MediaUtil.getDiscreteMimeType(contentType)); - } else { - return allowedTypes.contains("documents"); - } + return false; +// if (attachment == null) { +// Log.w(TAG, "attachment was null, returning vacuous true"); +// return true; +// } +// +// if (isFromUnknownContact(context, attachment)) { +// return false; +// } +// +// Set allowedTypes = getAllowedAutoDownloadTypes(context); +// String contentType = attachment.getContentType(); +// +// if (attachment.isVoiceNote() || (MediaUtil.isAudio(attachment) && TextUtils.isEmpty(attachment.getFileName()))) { +// return true; +// } else if (isNonDocumentType(contentType)) { +// return allowedTypes.contains(MediaUtil.getDiscreteMimeType(contentType)); +// } else { +// return allowedTypes.contains("documents"); +// } } /** @@ -76,10 +77,11 @@ public class AttachmentUtil { } private static @NonNull Set getAllowedAutoDownloadTypes(@NonNull Context context) { - if (isConnectedWifi(context)) return TextSecurePreferences.getWifiMediaDownloadAllowed(context); - else if (isConnectedRoaming(context)) return TextSecurePreferences.getRoamingMediaDownloadAllowed(context); - else if (isConnectedMobile(context)) return TextSecurePreferences.getMobileMediaDownloadAllowed(context); - else return Collections.emptySet(); +// if (isConnectedWifi(context)) return TextSecurePreferences.getWifiMediaDownloadAllowed(context); +// else if (isConnectedRoaming(context)) return TextSecurePreferences.getRoamingMediaDownloadAllowed(context); +// else if (isConnectedMobile(context)) return TextSecurePreferences.getMobileMediaDownloadAllowed(context); +// else return Collections.emptySet(); + return Collections.emptySet(); } private static NetworkInfo getNetworkInfo(@NonNull Context context) { diff --git a/src/org/thoughtcrime/securesms/util/BackupUtil.java b/src/org/thoughtcrime/securesms/util/BackupUtil.java deleted file mode 100644 index e21ff81a2..000000000 --- a/src/org/thoughtcrime/securesms/util/BackupUtil.java +++ /dev/null @@ -1,160 +0,0 @@ -package org.thoughtcrime.securesms.util; - - -import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.util.Log; - -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.database.NoExternalStorageException; -import org.whispersystems.libsignal.util.ByteUtil; - -import java.io.File; -import java.security.SecureRandom; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Locale; - -public class BackupUtil { - - private static final String TAG = BackupUtil.class.getSimpleName(); - - public static @NonNull String getLastBackupTime(@NonNull Context context, @NonNull Locale locale) { - try { - BackupInfo backup = getLatestBackup(); - - if (backup == null) return context.getString(R.string.BackupUtil_never); - else return DateUtils.getExtendedRelativeTimeSpanString(context, locale, backup.getTimestamp()); - } catch (NoExternalStorageException e) { - Log.w(TAG, e); - return context.getString(R.string.BackupUtil_unknown); - } - } - - public static @Nullable BackupInfo getLatestBackup() throws NoExternalStorageException { - File backupDirectory = StorageUtil.getBackupDirectory(); - File[] backups = backupDirectory.listFiles(); - BackupInfo latestBackup = null; - - for (File backup : backups) { - long backupTimestamp = getBackupTimestamp(backup); - - if (latestBackup == null || (backupTimestamp != -1 && backupTimestamp > latestBackup.getTimestamp())) { - latestBackup = new BackupInfo(backupTimestamp, backup.length(), backup); - } - } - - return latestBackup; - } - - @SuppressWarnings("ResultOfMethodCallIgnored") - public static void deleteAllBackups() { - try { - File backupDirectory = StorageUtil.getBackupDirectory(); - File[] backups = backupDirectory.listFiles(); - - for (File backup : backups) { - if (backup.isFile()) backup.delete(); - } - } catch (NoExternalStorageException e) { - Log.w(TAG, e); - } - } - - public static void deleteOldBackups() { - try { - File backupDirectory = StorageUtil.getBackupDirectory(); - File[] backups = backupDirectory.listFiles(); - - if (backups != null && backups.length > 2) { - Arrays.sort(backups, (left, right) -> { - long leftTimestamp = getBackupTimestamp(left); - long rightTimestamp = getBackupTimestamp(right); - - if (leftTimestamp == -1 && rightTimestamp == -1) return 0; - else if (leftTimestamp == -1) return 1; - else if (rightTimestamp == -1) return -1; - - return (int)(rightTimestamp - leftTimestamp); - }); - - for (int i=2;i getMobileMediaDownloadAllowed(Context context) { - return getMediaDownloadAllowed(context, MEDIA_DOWNLOAD_MOBILE_PREF, R.array.pref_media_download_mobile_data_default); - } - - public static @NonNull Set getWifiMediaDownloadAllowed(Context context) { - return getMediaDownloadAllowed(context, MEDIA_DOWNLOAD_WIFI_PREF, R.array.pref_media_download_wifi_default); - } - - public static @NonNull Set getRoamingMediaDownloadAllowed(Context context) { - return getMediaDownloadAllowed(context, MEDIA_DOWNLOAD_ROAMING_PREF, R.array.pref_media_download_roaming_default); - } - private static @NonNull Set getMediaDownloadAllowed(Context context, String key, @ArrayRes int defaultValuesRes) { return getStringSetPreference(context, key,