in-conversation invite reminder

Closes #4250
// FREEBIE

src/org/thoughtcrime/securesms/components/ComposeText.java

@@ -57,6 +57,7 @@ public class ComposeText extends EmojiEditText {
     }
 
     append(invite);
+    setSelection(getText().length());
   }
 
   private boolean isLandscape() {

src/org/thoughtcrime/securesms/components/ExpiredBuildReminder.java

@@ -1,35 +0,0 @@
-package org.thoughtcrime.securesms.components;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.provider.Telephony;
-import android.util.Log;
-import android.view.View;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.TextSecureExpiredException;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
-
-public class ExpiredBuildReminder extends Reminder {
-
-  private static final String TAG = ExpiredBuildReminder.class.getSimpleName();
-
-  public ExpiredBuildReminder() {
-    super(R.drawable.ic_warning_dark,
-          R.string.reminder_header_expired_build,
-          R.string.reminder_header_expired_build_details);
-  }
-
-  @Override
-  public boolean isDismissable() {
-    return false;
-  }
-
-  public static boolean isEligible(Context context) {
-    return !Util.isBuildFresh();
-  }
-
-}

src/org/thoughtcrime/securesms/components/Reminder.java

@@ -1,53 +0,0 @@
-package org.thoughtcrime.securesms.components;
-
-import android.content.Context;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-
-import org.thoughtcrime.securesms.R;
-
-public abstract class Reminder {
-  private int             iconResId;
-  private int             titleResId;
-  private int             textResId;
-  private OnClickListener okListener;
-  private OnClickListener cancelListener;
-
-  public Reminder(int iconResId, int titleResId, int textResId) {
-    this.iconResId  = iconResId;
-    this.titleResId = titleResId;
-    this.textResId  = textResId;
-  }
-
-  public int getIconResId() {
-    return iconResId;
-  }
-
-  public int getTitleResId() {
-    return titleResId;
-  }
-
-  public int getTextResId() {
-    return textResId;
-  }
-
-  public OnClickListener getOkListener() {
-    return okListener;
-  }
-
-  public OnClickListener getCancelListener() {
-    return cancelListener;
-  }
-
-  public void setOkListener(OnClickListener okListener) {
-    this.okListener = okListener;
-  }
-
-  public void setCancelListener(OnClickListener cancelListener) {
-    this.cancelListener = cancelListener;
-  }
-
-  public boolean isDismissable() {
-    return true;
-  }
-}

src/org/thoughtcrime/securesms/components/reminder/DefaultSmsReminder.java

@@ -1,9 +1,8 @@
-package org.thoughtcrime.securesms.components;
+package org.thoughtcrime.securesms.components.reminder;
 
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.provider.Telephony;
 import android.view.View;
@@ -17,9 +16,9 @@ public class DefaultSmsReminder extends Reminder {
 
   @TargetApi(VERSION_CODES.KITKAT)
   public DefaultSmsReminder(final Context context) {
-    super(R.drawable.sms_selection_icon,
-          R.string.reminder_header_sms_default_title,
-          R.string.reminder_header_sms_default_text);
+    super(context.getString(R.string.reminder_header_sms_default_title),
+          context.getString(R.string.reminder_header_sms_default_text),
+          context.getString(R.string.reminder_header_sms_default_button));
 
     final OnClickListener okListener = new OnClickListener() {
       @Override
@@ -30,14 +29,14 @@ public class DefaultSmsReminder extends Reminder {
         context.startActivity(intent);
       }
     };
-    final OnClickListener cancelListener = new OnClickListener() {
+    final OnClickListener dismissListener = new OnClickListener() {
       @Override
       public void onClick(View v) {
         TextSecurePreferences.setPromptedDefaultSmsProvider(context, true);
       }
     };
     setOkListener(okListener);
-    setCancelListener(cancelListener);
+    setDismissListener(dismissListener);
   }
 
   public static boolean isEligible(Context context) {

src/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java

@@ -0,0 +1,39 @@
+package org.thoughtcrime.securesms.components.reminder;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.Util;
+
+public class ExpiredBuildReminder extends Reminder {
+  private static final String TAG = ExpiredBuildReminder.class.getSimpleName();
+
+  public ExpiredBuildReminder(final Context context) {
+    super(context.getString(R.string.reminder_header_expired_build),
+          context.getString(R.string.reminder_header_expired_build_details),
+          context.getString(R.string.reminder_header_expired_build_button));
+    setOkListener(new OnClickListener() {
+      @Override public void onClick(View v) {
+        try {
+          context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + context.getPackageName())));
+        } catch (android.content.ActivityNotFoundException anfe) {
+          context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + context.getPackageName())));
+        }
+      }
+    });
+  }
+
+  @Override
+  public boolean isDismissable() {
+    return false;
+  }
+
+  public static boolean isEligible(Context context) {
+    return !Util.isBuildFresh();
+  }
+
+}

src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java

@@ -0,0 +1,34 @@
+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.Recipients;
+
+public class InviteReminder extends Reminder {
+
+  public InviteReminder(final @NonNull Context context,
+                        final @NonNull Recipients recipients)
+  {
+    super(context.getString(R.string.reminder_header_invite_title),
+          context.getString(R.string.reminder_header_invite_text, recipients.toShortString()),
+          context.getString(R.string.reminder_header_invite_button));
+
+    setDismissListener(new OnClickListener() {
+      @Override public void onClick(View v) {
+        new AsyncTask<Void,Void,Void>() {
+
+          @Override protected Void doInBackground(Void... params) {
+            DatabaseFactory.getRecipientPreferenceDatabase(context).setSeenInviteReminder(recipients, true);
+            return null;
+          }
+        }.execute();
+      }
+    });
+  }
+}

src/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java

@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.components;
+package org.thoughtcrime.securesms.components.reminder;
 
 import android.content.Context;
 import android.content.Intent;
@@ -13,9 +13,9 @@ import org.thoughtcrime.securesms.crypto.MasterSecret;
 public class PushRegistrationReminder extends Reminder {
 
   public PushRegistrationReminder(final Context context, final MasterSecret masterSecret) {
-    super(R.drawable.ic_push_registration_reminder,
-          R.string.reminder_header_push_title,
-          R.string.reminder_header_push_text);
+    super(context.getString(R.string.reminder_header_push_title),
+          context.getString(R.string.reminder_header_push_text),
+          context.getString(R.string.reminder_header_push_button));
 
     final OnClickListener okListener = new OnClickListener() {
       @Override

src/org/thoughtcrime/securesms/components/reminder/Reminder.java

@@ -0,0 +1,56 @@
+package org.thoughtcrime.securesms.components.reminder;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
+import android.view.View.OnClickListener;
+
+public abstract class Reminder {
+  private CharSequence buttonText;
+  private CharSequence title;
+  private CharSequence text;
+
+  private OnClickListener okListener;
+  private OnClickListener dismissListener;
+
+  public Reminder(@NonNull CharSequence title,
+                  @NonNull CharSequence text,
+                  @NonNull CharSequence buttonText)
+  {
+    this.title      = title;
+    this.text       = text;
+    this.buttonText = buttonText;
+  }
+
+  public CharSequence getTitle() {
+    return title;
+  }
+
+  public CharSequence getText() {
+    return text;
+  }
+
+  public CharSequence getButtonText() {
+    return buttonText;
+  }
+
+  public OnClickListener getOkListener() {
+    return okListener;
+  }
+
+  public OnClickListener getDismissListener() {
+    return dismissListener;
+  }
+
+  public void setOkListener(OnClickListener okListener) {
+    this.okListener = okListener;
+  }
+
+  public void setDismissListener(OnClickListener dismissListener) {
+    this.dismissListener = dismissListener;
+  }
+
+  public boolean isDismissable() {
+    return true;
+  }
+}

src/org/thoughtcrime/securesms/components/reminder/ReminderView.java

@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.components;
+package org.thoughtcrime.securesms.components.reminder;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -7,23 +7,21 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 /**
  * View to display actionable reminders to the user
  */
 public class ReminderView extends LinearLayout {
   private ViewGroup   container;
-  private ImageButton cancel;
+  private TextView    acceptButton;
+  private TextView    closeButton;
   private TextView    title;
   private TextView    text;
-  private ImageView   icon;
 
   public ReminderView(Context context) {
     super(context);
@@ -43,35 +41,39 @@ public class ReminderView extends LinearLayout {
 
   private void initialize() {
     LayoutInflater.from(getContext()).inflate(R.layout.reminder_header, this, true);
-    container = (ViewGroup  ) findViewById(R.id.container);
-    cancel    = (ImageButton) findViewById(R.id.cancel);
-    title     = (TextView   ) findViewById(R.id.reminder_title);
-    text      = (TextView   ) findViewById(R.id.reminder_text);
-    icon      = (ImageView  ) findViewById(R.id.icon);
+    container    = ViewUtil.findById(this, R.id.container);
+    acceptButton = ViewUtil.findById(this, R.id.accept);
+    closeButton  = ViewUtil.findById(this, R.id.cancel);
+    title        = ViewUtil.findById(this, R.id.reminder_title);
+    text         = ViewUtil.findById(this, R.id.reminder_text);
   }
 
   public void showReminder(final Reminder reminder) {
-    icon.setImageResource(reminder.getIconResId());
-    title.setText(reminder.getTitleResId());
-    text.setText(reminder.getTextResId());
+    title.setText(reminder.getTitle());
+    text.setText(reminder.getText());
+    acceptButton.setText(reminder.getButtonText());
 
-    this.setOnClickListener(reminder.getOkListener());
+    acceptButton.setOnClickListener(reminder.getOkListener());
 
     if (reminder.isDismissable()) {
-      cancel.setOnClickListener(new OnClickListener() {
+      closeButton.setOnClickListener(new OnClickListener() {
         @Override
         public void onClick(View v) {
           hide();
-          if (reminder.getCancelListener() != null) reminder.getCancelListener().onClick(v);
+          if (reminder.getDismissListener() != null) reminder.getDismissListener().onClick(v);
         }
       });
     } else {
-      cancel.setVisibility(View.GONE);
+      closeButton.setVisibility(View.GONE);
     }
 
     container.setVisibility(View.VISIBLE);
   }
 
+  public void requestDismiss() {
+    closeButton.performClick();
+  }
+
   public void hide() {
     container.setVisibility(View.GONE);
   }

src/org/thoughtcrime/securesms/components/reminder/SystemSmsImportReminder.java

@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.components;
+package org.thoughtcrime.securesms.components.reminder;
 
 import android.content.Context;
 import android.content.Intent;
@@ -14,9 +14,9 @@ import org.thoughtcrime.securesms.crypto.MasterSecret;
 public class SystemSmsImportReminder extends Reminder {
 
   public SystemSmsImportReminder(final Context context, final MasterSecret masterSecret) {
-    super(R.drawable.sms_system_import_icon,
-          R.string.reminder_header_sms_import_title,
-          R.string.reminder_header_sms_import_text);
+    super(context.getString(R.string.reminder_header_sms_import_title),
+          context.getString(R.string.reminder_header_sms_import_text),
+          context.getString(R.string.reminder_header_sms_import_button));
 
     final OnClickListener okListener = new OnClickListener() {
       @Override
@@ -42,7 +42,7 @@ public class SystemSmsImportReminder extends Reminder {
       }
     };
     setOkListener(okListener);
-    setCancelListener(cancelListener);
+    setDismissListener(cancelListener);
   }
 
   public static boolean isEligible(Context context) {