From 676308a6fbf184531433bd38332cdf4aa204be3c Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Tue, 27 Nov 2018 17:40:15 +0100 Subject: [PATCH] remove dead code wrt quotes --- .../securesms/BindableConversationItem.java | 2 - .../securesms/ConversationFragment.java | 55 ---------------- .../securesms/NewConversationActivity.java | 5 -- .../components/reminder/InviteReminder.java | 33 ---------- .../thoughtcrime/securesms/util/Trimmer.java | 65 ------------------- 5 files changed, 160 deletions(-) delete mode 100644 src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java delete mode 100644 src/org/thoughtcrime/securesms/util/Trimmer.java diff --git a/src/org/thoughtcrime/securesms/BindableConversationItem.java b/src/org/thoughtcrime/securesms/BindableConversationItem.java index 501c46c08..65cf792de 100644 --- a/src/org/thoughtcrime/securesms/BindableConversationItem.java +++ b/src/org/thoughtcrime/securesms/BindableConversationItem.java @@ -29,8 +29,6 @@ public interface BindableConversationItem extends Unbindable { void setEventListener(@Nullable EventListener listener); interface EventListener { - void onQuoteClicked(DcMsg messageRecord); - void onSharedContactDetailsClicked(@NonNull Contact contact, @NonNull View avatarTransitionView); void onAddToContactsClicked(@NonNull Contact contact); void onMessageSharedContactClicked(@NonNull List choices); void onInviteSharedContactClicked(@NonNull List choices); diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java index 8e0ca184d..0d1d96136 100644 --- a/src/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationFragment.java @@ -28,8 +28,6 @@ import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.RequiresApi; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.ActivityOptionsCompat; import android.support.v4.app.Fragment; import android.support.v4.app.LoaderManager; import android.support.v4.content.Loader; @@ -69,9 +67,7 @@ import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.connect.DcMsgListLoader; import org.thoughtcrime.securesms.contactshare.Contact; import org.thoughtcrime.securesms.contactshare.ContactUtil; -import org.thoughtcrime.securesms.contactshare.SharedContactDetailsActivity; import org.thoughtcrime.securesms.database.Address; -import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.permissions.Permissions; @@ -763,57 +759,6 @@ public class ConversationFragment extends Fragment } } - @Override - public void onQuoteClicked(DcMsg messageRecord) { - if (messageRecord.getQuote() == null) { - Log.w(TAG, "Received a 'quote clicked' event, but there's no quote..."); - return; - } - - new AsyncTask() { - @Override - protected Integer doInBackground(Void... voids) { - if (getActivity() == null || getActivity().isFinishing()) { - Log.w(TAG, "Task to retrieve quote position started after the fragment was detached."); - return 0; - } - return DatabaseFactory.getMmsSmsDatabase(getContext()) - .getQuotedMessagePosition(threadId, - messageRecord.getQuote().getId(), - messageRecord.getQuote().getAuthor(), - getListAdapter().getItemCount()); - } - - @Override - protected void onPostExecute(Integer position) { - if (getActivity() == null || getActivity().isFinishing()) { - Log.w(TAG, "Task to retrieve quote position finished after the fragment was detached."); - return; - } - - if (position >= 0 && position < getListAdapter().getItemCount()) { - list.scrollToPosition(position); - getListAdapter().pulseHighlightItem(position); - } else { - Toast.makeText(getContext(), getResources().getText(R.string.ConversationFragment_quoted_message_not_found), Toast.LENGTH_SHORT).show(); - if (position < 0) { - Log.w(TAG, "Tried to navigate to quoted message, but it was deleted."); - } else { - Log.w(TAG, "Tried to navigate to quoted message, but it was out of the bounds of the adapter."); - } - } - } - }.execute(); - } - - @Override - public void onSharedContactDetailsClicked(@NonNull Contact contact, @NonNull View avatarTransitionView) { - if (getContext() != null && getActivity() != null) { - Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(getActivity(), avatarTransitionView, "avatar").toBundle(); - ActivityCompat.startActivity(getActivity(), SharedContactDetailsActivity.getIntent(getContext(), contact), bundle); - } - } - @Override public void onAddToContactsClicked(@NonNull Contact contactWithAvatar) { if (getContext() != null) { diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/src/org/thoughtcrime/securesms/NewConversationActivity.java index 967697b25..a3044f966 100644 --- a/src/org/thoughtcrime/securesms/NewConversationActivity.java +++ b/src/org/thoughtcrime/securesms/NewConversationActivity.java @@ -26,15 +26,10 @@ import android.view.MenuItem; import android.view.View; import android.widget.Toast; -import com.b44t.messenger.DcChat; import com.b44t.messenger.DcContact; import com.b44t.messenger.DcContext; import org.thoughtcrime.securesms.connect.DcHelper; -import org.thoughtcrime.securesms.database.Address; -import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.database.ThreadDatabase; -import org.thoughtcrime.securesms.recipients.Recipient; /** * Activity container for starting a new conversation. diff --git a/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java b/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java deleted file mode 100644 index 689c12796..000000000 --- a/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.thoughtcrime.securesms.components.reminder; - -import android.content.Context; -import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.view.View; -import android.view.View.OnClickListener; - -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.recipients.Recipient; - -public class InviteReminder extends Reminder { - - public InviteReminder(final @NonNull Context context, - final @NonNull Recipient recipient) - { - super(context.getString(R.string.reminder_header_invite_title), - context.getString(R.string.reminder_header_invite_text, recipient.toShortString())); - - setDismissListener(new OnClickListener() { - @Override public void onClick(View v) { - new AsyncTask() { - - @Override protected Void doInBackground(Void... params) { - DatabaseFactory.getRecipientDatabase(context).setSeenInviteReminder(recipient, true); - return null; - } - }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - } - }); - } -} diff --git a/src/org/thoughtcrime/securesms/util/Trimmer.java b/src/org/thoughtcrime/securesms/util/Trimmer.java deleted file mode 100644 index eac7575f0..000000000 --- a/src/org/thoughtcrime/securesms/util/Trimmer.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.thoughtcrime.securesms.util; - -import android.app.ProgressDialog; -import android.content.Context; -import android.os.AsyncTask; -import android.widget.Toast; - -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.database.ThreadDatabase; - -public class Trimmer { - - public static void trimAllThreads(Context context, int threadLengthLimit) { - new TrimmingProgressTask(context).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, threadLengthLimit); - } - - private static class TrimmingProgressTask extends AsyncTask implements ThreadDatabase.ProgressListener { - private ProgressDialog progressDialog; - private Context context; - - public TrimmingProgressTask(Context context) { - this.context = context; - } - - @Override - protected void onPreExecute() { - progressDialog = new ProgressDialog(context); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setCancelable(false); - progressDialog.setIndeterminate(false); - progressDialog.setTitle(R.string.trimmer__deleting); - progressDialog.setMessage(context.getString(R.string.trimmer__deleting_old_messages)); - progressDialog.setMax(100); - progressDialog.show(); - } - - @Override - protected Void doInBackground(Integer... params) { - DatabaseFactory.getThreadDatabase(context).trimAllThreads(params[0], this); - return null; - } - - @Override - protected void onProgressUpdate(Integer... progress) { - double count = progress[1]; - double index = progress[0]; - - progressDialog.setProgress((int)Math.round((index / count) * 100.0)); - } - - @Override - protected void onPostExecute(Void result) { - progressDialog.dismiss(); - Toast.makeText(context, - R.string.trimmer__old_messages_successfully_deleted, - Toast.LENGTH_LONG).show(); - } - - @Override - public void onProgress(int complete, int total) { - this.publishProgress(complete, total); - } - } -}