Add 'Signal Call' option to contact card

moxie0 · moxie0 · commit 7bec5efe1a4a · 2015-11-12T15:20:16.000-08:00
Fixes signalapp#4392 Closes signalapp#4465 // FREEBIE
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -317,6 +317,19 @@
         </intent-filter>
     </activity>
 
+    <activity android:name="org.thoughtcrime.redphone.RedPhoneShare"
+              android:theme="@style/NoAnimation.Theme.BlackScreen"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.call" />
+        </intent-filter>
+
+    </activity>
+
     <activity android:name=".RecipientPreferenceActivity"
               android:theme="@style/TextSecure.LightNoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -70,6 +70,7 @@
 
     <!-- ContactsDatabase -->
     <string name="ContactsDatabase_message_s">Message %s</string>
+    <string name="ContactsDatabase_signal_call_s">Signal Call %s</string>
 
     <!-- ConversationItem -->
     <string name="ConversationItem_message_size_d_kb">Message size: %d KB</string>
diff --git a/res/xml/contactsformat.xml b/res/xml/contactsformat.xml
@@ -6,4 +6,9 @@
             android:summaryColumn="data2"
             android:detailColumn="data3"
             android:detailSocialSummary="true"/>
+    <ContactsDataKind
+            android:icon="@drawable/icon"
+            android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.call"
+            android:summaryColumn="data2"
+            android:detailColumn="data3"/>
 </ContactsSource>
diff --git a/src/org/thoughtcrime/redphone/RedPhoneShare.java b/src/org/thoughtcrime/redphone/RedPhoneShare.java
@@ -0,0 +1,46 @@
+package org.thoughtcrime.redphone;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.provider.ContactsContract;
+import android.text.TextUtils;
+
+public class RedPhoneShare extends Activity {
+
+  private static final String TAG = RedPhone.class.getSimpleName();
+
+  @Override
+  public void onCreate(Bundle icicle) {
+    super.onCreate(icicle);
+
+    if (getIntent().getData() != null && "content".equals(getIntent().getData().getScheme())) {
+      Cursor cursor = null;
+
+      try {
+        cursor = getContentResolver().query(getIntent().getData(), null, null, null, null);
+
+        if (cursor != null && cursor.moveToNext()) {
+          String destination = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.RawContacts.Data.DATA1));
+
+          if (!TextUtils.isEmpty(destination)) {
+            Intent serviceIntent = new Intent(this, RedPhoneService.class);
+            serviceIntent.setAction(RedPhoneService.ACTION_OUTGOING_CALL);
+            serviceIntent.putExtra(RedPhoneService.EXTRA_REMOTE_NUMBER, destination);
+            startService(serviceIntent);
+
+            Intent activityIntent = new Intent(this, RedPhone.class);
+            activityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(activityIntent);
+          }
+        }
+      } finally {
+        if (cursor != null) cursor.close();
+      }
+    }
+
+    finish();
+  }
+
+}
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java b/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
@@ -20,11 +20,13 @@
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.database.MergeCursor;
+import android.provider.ContactsContract;
 import android.support.annotation.NonNull;
 import android.support.v4.content.CursorLoader;
 import android.text.TextUtils;
 import android.util.Log;
 
+import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.Recipients;
@@ -73,7 +75,18 @@ public Cursor loadInBackground() {
     }
 
     if (!TextUtils.isEmpty(filter) && NumberUtil.isValidSmsOrEmail(filter)) {
-      cursorList.add(contactsDatabase.getNewNumberCursor(filter));
+      MatrixCursor newNumberCursor = new MatrixCursor(new String[] {ContactsDatabase.ID_COLUMN,
+                                                                    ContactsDatabase.NAME_COLUMN,
+                                                                    ContactsDatabase.NUMBER_COLUMN,
+                                                                    ContactsDatabase.NUMBER_TYPE_COLUMN,
+                                                                    ContactsDatabase.LABEL_COLUMN,
+                                                                    ContactsDatabase.CONTACT_TYPE_COLUMN}, 1);
+
+      newNumberCursor.addRow(new Object[] {-1L, getContext().getString(R.string.contact_selection_list__unknown_contact),
+                                           filter, ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM,
+                                           "\u21e2", ContactsDatabase.NEW_TYPE});
+
+      cursorList.add(newNumberCursor);
     }
 
     return new MergeCursor(cursorList.toArray(new Cursor[0]));
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java b/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
diff --git a/src/org/thoughtcrime/securesms/util/DirectoryHelper.java b/src/org/thoughtcrime/securesms/util/DirectoryHelper.java
