Add phone number and direct dial to recipient preferences

res/layout/recipient_preference_contact_widget.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/container"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="horizontal">
+
+    <ImageView android:id="@+id/message"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:src="@drawable/ic_message_white_24dp"
+               android:layout_marginRight="20dp"
+               android:layout_marginEnd="20dp"/>
+
+    <ImageView android:id="@+id/call"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:src="@drawable/ic_call_white_24dp"/>
+
+    <ImageView android:id="@+id/secure_call"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:src="@drawable/ic_call_secure_white_24dp"/>
+
+</LinearLayout>

res/values/strings.xml

@@ -1415,6 +1415,7 @@
     <string name="prompt_passphrase_activity__signal_is_locked">Signal is locked</string>
     <string name="prompt_passphrase_activity__tap_to_unlock">TAP TO UNLOCK</string>
     <string name="RegistrationLockDialog_reminder">Reminder:</string>
+    <string name="recipient_preferences__about">About</string>
     <!-- EOF -->
 
 </resources>

res/xml/recipient_preferences.xml

@@ -2,6 +2,12 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <PreferenceCategory android:key="about" android:title="@string/recipient_preferences__about">
+        <org.thoughtcrime.securesms.preferences.widgets.ContactPreference android:key="pref_key_number" android:persistent="false"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory android:layout="@layout/preference_divider"/>
+
     <PreferenceCategory android:key="notification_settings" android:title="@string/recipient_preferences__chat_settings">
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
                 android:key="pref_key_recipient_mute"

src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java

@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms;
 
 import android.annotation.SuppressLint;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -26,6 +27,7 @@ import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.widget.Toolbar;
+import android.telephony.PhoneNumberUtils;
 import android.util.Log;
 import android.util.Pair;
 import android.view.MenuItem;
@@ -51,10 +53,14 @@ import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.widgets.ColorPickerPreference;
+import org.thoughtcrime.securesms.preferences.widgets.ContactPreference;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
+import org.thoughtcrime.securesms.service.WebRtcCallService;
+import org.thoughtcrime.securesms.util.Dialogs;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
@@ -83,6 +89,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
   private static final String PREFERENCE_BLOCK           = "pref_key_recipient_block";
   private static final String PREFERENCE_COLOR           = "pref_key_recipient_color";
   private static final String PREFERENCE_IDENTITY        = "pref_key_recipient_identity";
+  private static final String PREFERENCE_ABOUT           = "pref_key_number";
 
   private final DynamicTheme    dynamicTheme    = new DynamicNoActionBarTheme();
   private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
@@ -266,6 +273,8 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
           .setOnPreferenceClickListener(new BlockClickedListener());
       this.findPreference(PREFERENCE_COLOR)
           .setOnPreferenceChangeListener(new ColorChangeListener());
+      ((ContactPreference)this.findPreference(PREFERENCE_ABOUT))
+          .setListener(new AboutNumberClickedListener());
     }
 
     @Override
@@ -313,6 +322,8 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
       ColorPickerPreference colorPreference           = (ColorPickerPreference) this.findPreference(PREFERENCE_COLOR);
       Preference            blockPreference           = this.findPreference(PREFERENCE_BLOCK);
       Preference            identityPreference        = this.findPreference(PREFERENCE_IDENTITY);
+      PreferenceCategory    aboutCategory             = (PreferenceCategory)this.findPreference("about");
+      ContactPreference     aboutPreference           = (ContactPreference)this.findPreference(PREFERENCE_ABOUT);
       PreferenceCategory    privacyCategory           = (PreferenceCategory) this.findPreference("privacy_settings");
       PreferenceCategory    divider                   = (PreferenceCategory) this.findPreference("divider");
 
@@ -336,10 +347,15 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
         if (identityPreference != null) identityPreference.setVisible(false);
         if (privacyCategory    != null) privacyCategory.setVisible(false);
         if (divider            != null) divider.setVisible(false);
+        if (aboutCategory      != null) aboutCategory.setVisible(false);
       } else {
         colorPreference.setColors(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(getActivity()));
         colorPreference.setColor(recipient.getColor().toActionBarColor(getActivity()));
 
+        aboutPreference.setTitle(PhoneNumberUtils.formatNumber(recipient.getAddress().toPhoneString()));
+        aboutPreference.setSummary(recipient.getCustomLabel());
+        aboutPreference.setSecure(recipient.getRegistered() == RecipientDatabase.RegisteredState.REGISTERED);
+
         if (recipient.isBlocked()) blockPreference.setTitle(R.string.RecipientPreferenceActivity_unblock);
         else                       blockPreference.setTitle(R.string.RecipientPreferenceActivity_block);
 
@@ -630,5 +646,50 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
       }
     }
+
+    private class AboutNumberClickedListener implements ContactPreference.Listener {
+
+      @Override
+      public void onMessageClicked() {
+        Intent intent = new Intent(getContext(), ConversationActivity.class);
+        intent.putExtra(ConversationActivity.ADDRESS_EXTRA, recipient.getAddress());
+        startActivity(intent);
+      }
+
+      @Override
+      public void onSecureCallClicked() {
+        Permissions.with(RecipientPreferenceFragment.this)
+                   .request(android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAMERA)
+                   .ifNecessary()
+                   .withRationaleDialog(getString(R.string.ConversationActivity_to_call_s_signal_needs_access_to_your_microphone_and_camera, recipient.toShortString()),
+                                        R.drawable.ic_mic_white_48dp, R.drawable.ic_videocam_white_48dp)
+                   .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s, recipient.toShortString()))
+                   .onAllGranted(() -> {
+                     Intent intent = new Intent(getContext(), WebRtcCallService.class);
+                     intent.setAction(WebRtcCallService.ACTION_OUTGOING_CALL);
+                     intent.putExtra(WebRtcCallService.EXTRA_REMOTE_ADDRESS, recipient.getAddress());
+                     getContext().startService(intent);
+
+                     Intent activityIntent = new Intent(getContext(), WebRtcCallActivity.class);
+                     activityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                     startActivity(activityIntent);
+                   })
+                   .execute();
+      }
+
+      @Override
+      public void onInSecureCallClicked() {
+        try {
+          Intent dialIntent = new Intent(Intent.ACTION_DIAL,
+                                         Uri.parse("tel:" + recipient.getAddress().serialize()));
+          startActivity(dialIntent);
+        } catch (ActivityNotFoundException anfe) {
+          Log.w(TAG, anfe);
+          Dialogs.showAlertDialog(getContext(),
+                                  getString(R.string.ConversationActivity_calls_not_supported),
+                                  getString(R.string.ConversationActivity_this_device_does_not_appear_to_support_dial_actions));
+        }
+      }
+    }
   }
 }

src/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java

@@ -0,0 +1,92 @@
+package org.thoughtcrime.securesms.preferences.widgets;
+
+
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+
+import org.thoughtcrime.securesms.R;
+
+public class ContactPreference extends Preference {
+
+  private ImageView messageButton;
+  private ImageView callButton;
+  private ImageView secureCallButton;
+
+  private Listener listener;
+  private boolean secure;
+
+  public ContactPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    super(context, attrs, defStyleAttr, defStyleRes);
+    initialize();
+  }
+
+  public ContactPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+    initialize();
+  }
+
+  public ContactPreference(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    initialize();
+  }
+
+  public ContactPreference(Context context) {
+    super(context);
+    initialize();
+  }
+
+  private void initialize() {
+    setWidgetLayoutResource(R.layout.recipient_preference_contact_widget);
+  }
+
+  @Override
+  public void onBindViewHolder(PreferenceViewHolder view) {
+    super.onBindViewHolder(view);
+
+    this.messageButton    = (ImageView) view.findViewById(R.id.message);
+    this.callButton       = (ImageView) view.findViewById(R.id.call);
+    this.secureCallButton = (ImageView) view.findViewById(R.id.secure_call);
+
+    if (listener != null) setListener(listener);
+    setSecure(secure);
+  }
+
+  public void setSecure(boolean secure) {
+    this.secure = secure;
+
+    if (secureCallButton != null) secureCallButton.setVisibility(secure ? View.VISIBLE : View.GONE);
+    if (callButton != null)       callButton.setVisibility(secure ? View.GONE : View.VISIBLE);
+
+    int color;
+
+    if (secure) {
+      color = getContext().getResources().getColor(R.color.textsecure_primary);
+    } else {
+      color = getContext().getResources().getColor(R.color.grey_600);
+    }
+
+    if (messageButton != null)    messageButton.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+    if (secureCallButton != null) secureCallButton.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+    if (callButton != null)       callButton.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+  }
+
+  public void setListener(Listener listener) {
+    this.listener = listener;
+
+    if (this.messageButton != null)    this.messageButton.setOnClickListener(v -> listener.onMessageClicked());
+    if (this.secureCallButton != null) this.secureCallButton.setOnClickListener(v -> listener.onSecureCallClicked());
+    if (this.callButton != null)       this.callButton.setOnClickListener(v -> listener.onInSecureCallClicked());
+  }
+
+  public interface Listener {
+    public void onMessageClicked();
+    public void onSecureCallClicked();
+    public void onInSecureCallClicked();
+  }
+
+}