break out big methods and i18n

mcginty · mcginty · commit 6f24e3c7794d · 2015-02-12T14:48:34.000-08:00
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -233,6 +233,10 @@
     <string name="KeyScanningActivity_install_barcode_Scanner">Install Barcode Scanner?</string>
     <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure needs Barcode Scanner for QR codes.</string>
 
+    <!-- MessageDetailsRecipient -->
+    <string name="MessageDetailsRecipient_failed_to_send">Failed to send</string>
+    <string name="MessageDetailsRecipient_new_identity">New identity</string>
+
     <!-- MmsDownloader -->
     <string name="MmsDownloader_error_storing_mms">Error storing MMS!</string>
     <string name="MmsDownloader_error_connecting_to_mms_provider">Error connecting to MMS provider...</string>
diff --git a/src/org/thoughtcrime/securesms/MessageDetailsRecipient.java b/src/org/thoughtcrime/securesms/MessageDetailsRecipient.java
@@ -51,7 +51,6 @@ public class MessageDetailsRecipient extends RelativeLayout
 {
   private final static String TAG = MessageDetailsRecipient.class.getSimpleName();
 
-  private Context    context;
   private Recipient  recipient;
   private TextView   fromView;
   private TextView   errorDescription;
@@ -63,12 +62,10 @@ public class MessageDetailsRecipient extends RelativeLayout
 
   public MessageDetailsRecipient(Context context) {
     super(context);
-    this.context = context;
   }
 
   public MessageDetailsRecipient(Context context, AttributeSet attrs) {
     super(context, attrs);
-    this.context = context;
   }
 
   @Override
@@ -87,54 +84,50 @@ public void set(final MasterSecret masterSecret, final MessageRecord record, fin
 
     setContactPhoto(recipient);
 
-    int conflictVisibility = View.GONE;
-    int resendVisibility = View.GONE;
-    int errorVisibility = View.GONE;
+    boolean hasNetworkFailures = populateNetworkFailures(masterSecret, record);
+    boolean hasConflicts       = !hasNetworkFailures && populateConflicts(masterSecret, record);
+
+    resendButton.setVisibility(hasNetworkFailures || hasConflicts ? View.VISIBLE : View.GONE);
+    conflictButton.setVisibility(hasConflicts ? View.VISIBLE : View.GONE);
+    errorDescription.setVisibility(hasNetworkFailures ? View.VISIBLE : View.GONE);
+  }
+
+  private boolean populateNetworkFailures(final MasterSecret masterSecret, final MessageRecord record) {
+    boolean applicableFailures = false;
     if (record.hasNetworkFailures()) {
       for (final NetworkFailure failure : record.getNetworkFailures()) {
         if (failure.getRecipientId() == recipient.getRecipientId()) {
-          resendVisibility = View.VISIBLE;
-          errorVisibility = View.VISIBLE;
-          errorDescription.setText("Failed to send");
+          applicableFailures = true;
+          errorDescription.setText(R.string.MessageDetailsRecipient_failed_to_send);
           resendButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-              new AsyncTask<Void, Void, Void>() {
-                @Override
-                protected Void doInBackground(Void... params) {
-                  MmsDatabase mmsDatabase = DatabaseFactory.getMmsDatabase(getContext());
-                  mmsDatabase.removeFailure(record.getId(), failure);
-
-                  if (record.getRecipients().isGroupRecipient()) {
-                    MessageSender.resendGroupMessage(getContext(), masterSecret, record, failure.getRecipientId());
-                  } else {
-                    MessageSender.resend(getContext(), masterSecret, record);
-                  }
-                  return null;
-                }
-              }.execute();
+              new ResendAsyncTask(masterSecret, record, failure).execute();
             }
           });
         }
       }
-    } else if (record.isIdentityMismatchFailure()) {
+    }
+    return applicableFailures;
+  }
+
+  private boolean populateConflicts(final MasterSecret masterSecret, final MessageRecord record) {
+    boolean applicableFailures = false;
+    if (record.isIdentityMismatchFailure()) {
       for (final IdentityKeyMismatch mismatch : record.getIdentityKeyMismatches()) {
         if (mismatch.getRecipientId() == recipient.getRecipientId()) {
-          conflictVisibility = View.VISIBLE;
-          errorVisibility = View.VISIBLE;
-          errorDescription.setText("New identity");
+          applicableFailures = true;
+          errorDescription.setText(R.string.MessageDetailsRecipient_new_identity);
           conflictButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-              new ConfirmIdentityDialog(context, masterSecret, record, mismatch).show();
+              new ConfirmIdentityDialog(getContext(), masterSecret, record, mismatch).show();
             }
           });
         }
       }
     }
-    resendButton.setVisibility(resendVisibility);
-    conflictButton.setVisibility(conflictVisibility);
-    errorDescription.setVisibility(errorVisibility);
+    return applicableFailures;
   }
 
   public void unbind() {
@@ -150,7 +143,7 @@ private CharSequence formatFrom(Recipient from) {
     final String fromString;
     final boolean isUnnamedGroup = from.isGroupRecipient() && TextUtils.isEmpty(from.getName());
     if (isUnnamedGroup) {
-      fromString = context.getString(R.string.ConversationActivity_unnamed_group);
+      fromString = getContext().getString(R.string.ConversationActivity_unnamed_group);
     } else {
       fromString = from.toShortString();
     }
@@ -176,4 +169,30 @@ public void run() {
       }
     });
   }
+
+  private class ResendAsyncTask extends AsyncTask<Void,Void,Void> {
+    private final MasterSecret   masterSecret;
+    private final MessageRecord  record;
+    private final NetworkFailure failure;
+
+    public ResendAsyncTask(MasterSecret masterSecret, MessageRecord record, NetworkFailure failure) {
+      this.masterSecret = masterSecret;
+      this.record       = record;
+      this.failure      = failure;
+    }
+
+    @Override
+    protected Void doInBackground(Void... params) {
+      MmsDatabase mmsDatabase = DatabaseFactory.getMmsDatabase(getContext());
+      mmsDatabase.removeFailure(record.getId(), failure);
+
+      if (record.getRecipients().isGroupRecipient()) {
+        MessageSender.resendGroupMessage(getContext(), masterSecret, record, failure.getRecipientId());
+      } else {
+        MessageSender.resend(getContext(), masterSecret, record);
+      }
+      return null;
+    }
+  }
+
 }
