From bbf33f88e03000f925280bd6543c1000c25839c0 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 27 Jul 2015 10:49:14 -0700
Subject: [PATCH] Support for static RecipientDetails for certain shortcodes.

Closes #3813
// FREEBIE
---
 res/drawable-hdpi/ic_amazon.png               | Bin 0 -> 1041 bytes
 res/drawable-mdpi/ic_amazon.png               | Bin 0 -> 704 bytes
 res/drawable-xhdpi/ic_amazon.png              | Bin 0 -> 1553 bytes
 res/drawable-xxhdpi/ic_amazon.png             | Bin 0 -> 2072 bytes
 res/drawable-xxxhdpi/ic_amazon.png            | Bin 0 -> 4788 bytes
 .../contacts/avatars/ContactPhotoFactory.java |   9 ++++++++-
 .../avatars/ResourceContactPhoto.java         |   3 ++-
 .../database/CanonicalAddressDatabase.java    |   3 ++-
 .../recipients/RecipientProvider.java         |  19 +++++++++++++-----
 9 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_amazon.png
 create mode 100644 res/drawable-mdpi/ic_amazon.png
 create mode 100644 res/drawable-xhdpi/ic_amazon.png
 create mode 100644 res/drawable-xxhdpi/ic_amazon.png
 create mode 100644 res/drawable-xxxhdpi/ic_amazon.png

diff --git a/res/drawable-hdpi/ic_amazon.png b/res/drawable-hdpi/ic_amazon.png
new file mode 100644
index 0000000000000000000000000000000000000000..504f2b1f47de071cd02894f0cbb18d9eb762edfd
GIT binary patch
literal 1041
zcmV+s1n&EZP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000BnNkl<ZSV!%b
zYlxI(6vuz(b!Oa|S;q@ev0~W;DZxmkq6^Vt7cz>h4+(Z7+#M^83MHZoOI8L&HzTvb
zEVU1P2#R1UinN=BP*Hv8vP*7dcCpf>W@mRU&xzB%Q{(s!?>o6e`@!>RIL~>`|Norl
z|GejnFwRWI86OT23cHd2TA`W1CBPiuIA9Wx2fhM60bT_5gn<XGH%n+Pum-pw0@yRa
z&A=ZKV*d$ghR~J3v%rKV0Q!N`fnTHUiAv~P;EkwB>*8JpE{(c3Dxoic69ST21>W@i
z7XdRG0GoeT6jD(LEvNyl&A9<sTH}ZVZvkfo051d9j}@Vnz=L(kegh5*0Js*|7~o$8
zJTz8>rUDCr>A*Dq>b3!o1^`%f-VN~I4m>bcgrelB#@LJ6{(lfk0w)1y_(Glq91R@V
z;3`{Ip;Lh6z*W#xA8ZLB)67jx5~<$am=k&uxIRD|3VaB>0t^C20k^eULl*+Q0U$ep
z%l&3rT{ca<-)cfzfpY>tP6Kw-`OgO4ZY3cPC;*8%kZ%DSLF#P@u%(rRGQKwIF+K%O
z4gkIjxF^7WA8==s4_a6+v-S`)XqoTuI)FCdXTT0oZ$J2gcVVQ$2-)m2(qIO%;p;IU
zpdEM#utwa-?31zfU<uj&Z-8SOBr?JG0gD?{rgmEeI35@%tYfD05=-z%c~H?}F_*fL
z?=3j2LKc$+o(elz&H4xalvuyz^VN&EV&%fb!%lUc2m`9pF2ZbuyVG68)lmsqoIPcG
z(qZ-paI62_vhP>bUIiBEbF>fUaZ_$!ulC?c4{j)zP@JwvWlK-&M<}0*&-YwuPcqAQ
z0jM#+z--X6-v^u?u$kv|f58O)9x&e@%xvG^Hk^x{=a4%@aD#hG7iXp<{wzCA%w&sS
z?nh{79n&Qi-=xUzs<L^<?vdWk9?EsdHXEG}9N}NLwTq8|&jLtJ1UiA&bOVzLl~`7h
zt3_lE=nKh0>6$`1HV@}*N-izV62aQgff~x^;@txGgJe|o`3W8$l~vwp?<xj?2410V
zB{tF@>vWE}h+KxqsfH!6(^0u4-Bq!{pP^i0ji+u~TX(ry*<exYdL|EhiRGZH6q!7V
zs>1?(4jDl8ClT2vFzgf&(WEL<J&_I_eM$Bz|NXn9>{8WxQ$LnAN)N^ADe`OSNUvab
z?WsavS^nwxbt19=Wif)al8C1JP_`(pH{D$^QAe^+Le(sNk2A3&6`w6|rsrga6OIL)
zhSH|Okiaiu)f4@?ST1ePETdl-)kQNFnNTxH4<_~yp|I+Wy9)gU6(I~XPLTjh00000
LNkvXXu0mjfR_W3I

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_amazon.png b/res/drawable-mdpi/ic_amazon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1e94ffbc5f7298791369e49bf3bff7e3e025fde
GIT binary patch
literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0007qNkl<ZNK3Vq
zO-NKx6vuz}z31q2Mk|a`FtdmPiGm2MpiPTfw5SNlJ~xwAu7WTmiXvzeVGu<hMpBDf
zL{kfeXxA>I=o9*)q+MuX>f|_Y=Di!o-oz_rbf(F(JNMoD|DAKsIrk~1+0-=aQwX32
zs0QM|C&0}oxTyehfDWJ;5J1MpfV;qP;NxVV$pDLihkn$#G`<6?fw#FfOa^!kEDs#~
z0QCEU6@m2_u(eP?Bk(A2s0(QI{RO~#!1DbOU`C;Ug+MzXHJAr90iOdRawSWAKLvye
z1!UVV*I5hH0XF~%LaZo&wB>$a1F#}Tr2h;M(c3_<pwjy?2NA$5CWCt5l`kYZ!@yzx
zYQ}*Vz_MZhXMjV2LL2}t{m&xb12zQ&R{?##Z}`__`@ZMbChOCYYtVXtjRC+;;HK{%
z1kV1|W;=jexmqvVx(wFdz=uKLG$2DJT_srr?TgHXJ_n9%u18^ol-sMKjONNf3ivFG
zP)1a;*%s)e-lr$ZIvZ+rv#0f-`t>-rm$x{v2|&CnJU49rNT^-N*k?>Ood>D{YhQt*
zz-3?$a2>b^wCPUlWL-&A4SNF`wcWw&sEj7xO#t)-B8l17NfkH4F7BO3H2uIAEd%6T
zlD;1To&Zh&xG2$W)wn6O#Zbm>w7zD~bdDs3LNUA5*{l@$k1HCxVy!``Q=l3__n~<W
zM!#ox-%8TnxMxzLwKWUn%~wh_Xw6!noQT(B4jIQv+nkq@iBl1(FKuz&NFZ5jkh~gN
zn)YZ?hFXW#D*?&mw`t9Y;p)e(W!yJWF}r14p7E?U)gNu*P`o=_ty8J0kcCdBN(U<U
mjY=)@vb+F!DHW4JF@T?Ym9ZIb*EM7S0000<MNUMnLSTZ}_CP!U

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_amazon.png b/res/drawable-xhdpi/ic_amazon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e087841db03d39fa0316accb9e7d83f40b1e180a
GIT binary patch
literal 1553
zcmV+s2JZQZP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000HpNkl<ZXhZFo
zdx%tZ6vsd3&fU>*S6f#t6e}?`+l(?HdSGP=VlSw+twf^I)T|846bfq%D<LZ?%XC*G
zDasxcrWt1VM}biG5Gu1YE5#R;x$g7M%sp|oySa{Y$GNkztKflQVSm5-`<?IayuRlM
zC%DK7u0JOMbhZUgS|E!B1_0*+{eZ4O9k3Pn8mK+i7CROeC<877t^;lbx`!yKz_-9_
zz^A~^fc>vs(p~`5fxCcn0XKpsyMT{?2Z4qN-yN~FPyoe16)*#cwL^gqfjfW$g`QCe
zfFfW?aB-pcw*Br6;7%Y_$YF&5xB++%a0<CF%Qyc3qk!)UIj;}^+X2foVe$vC2(Z6B
zfXYC@T>6<i&g}>QHwCYs?JjeH*MUhHix%9^0r%%na5GTe5dbU&TF_;aFM-iP-p^dO
zxY-Gu8uINv;Ixhaun@Qf=msR<FfR27@N^C(J_g2xtRD>AEi#6vF;Eite=C6Az<ELO
zdJ_0MhX$_#Q$p730XsXgL<JD}f;Jz#0^D<=0I<M4C-|Ke`1e>~=<x`^s<KfDb0y<M
zR{>{a#K+Mr*C{S!h0Lgg<@sSjU>{A<u=NfHFc7E?3e>TPqYecy7+9IZpIcwqsIv6}
z`++8)574u-W5B4vDqv&|Uoi@?0eCFn{H<G$i!3xBn4LrU)xZP5wk&%(9e~k*^*K1p
z?jR<%gaEXd$>d3`TRS8MEJc0>bO}-LZQ!;X*0B!k+RluDF~Hg!`Q7NS(c&<%#@>or
zHfbz04M$0V<AFDGDEKJwRLHt<C(B0hkaf#grvOIkB1seg*7hySak@1z)3U5v!LvSL
z!cjCc@b(CiBnkkd!bXY1<cFXi*qgE8QoyoP=}|QMDWD;i4DyyJ0ImSm<rtrs8(6A*
zDQG86;md)gfbpe#WC8GS=0>f;p&a2yRI2dXu15i2EuW>)u&%20Tzf$)W>$5LazvRI
znR3?vpV(ndOWd)(IQNNYu_}&08eiunrld@d7KsAD_P-C@n9oyY*^>lz1far>__bdt
z6<eNhd&b0Bs=k(qh|!TWXfKd%s;n)Z>=`vL2*BxpHQ@QWL|a9d19O7$Nj6UOjWOHW
z#T<yoiYhgw-}@qUX-U?_T~eAV8m%HrL|BuU<Xv4T0Q=5j!7R}$PfOU`=UHH0u>ZoK
zAhrgzO*6j89KD#|d;R0(e%kL-=cYE6`0fbBSues9iAmn$SphUuyAL_armmAy7OY`n
zZfE>|R#17vMvLY$D}d*NS8okIORLud9|RXz;2Xa(S80)hHSu9C%<@&oIV$^7X>U|4
z7QYf<g`d_7N~R_^Wd+b!?T+-3g{bTi%O0+`VbvOTRlaLJm{o=VHwS)gQ)yG$3YPI9
zn|qqihskije#`8&5B8<Z5qE?mGC_n&RRra8FO{q)oyPu#n)rNtCL~I|Go|v7K1T%c
zff~wOKR#20*#g@Y{oN5(b=jGGAv1;L=|VZTHB`qd6efc9ci?PAY=&fUJ3i4Ry;5$+
zh#n2q@!v=@v)fe9#+v_2XcnqpR5V;-EI_yjqy#hxvIBIDqyFkN&Y$U2vep&qJf)!_
zMswfYcz|y}^&Mhc_uvjHCSK=}NGm0-Tht>K)1LTTqDX}(Lsi7)OM&QLAnU=K(e3V*
zL0F44E@FVjismJnk`rY*&3OT^O}d=orldREPdjr2#vq3Vx`Ng#Qj41JY6C(uf`{S@
z`1;@2-D*HwR1#`)AJHBl))Zw9hU*o5OMQ8<c(=D%st%u2YZY<&5SM!o#Yxr}$YtyL
z#q<@Y$g+vGl;xI_+v!4kK)0c?A(8avW>YSo^P?6r^kqsKouYDaWr(5|W0p}F+}1kT
zFIKbASE9Pk_jO~M*tWgR-uA&6E|HJYdAm@Q!<uRsluEk;otV>G(eC*8zAv?|>+kl{
zsb7kx5Q(Jadv|0D<a=;O?K=seqh31fo|6{nYzzDgSDUFo2L3@-00000NkvXXu0mjf
DQD5L#

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_amazon.png b/res/drawable-xxhdpi/ic_amazon.png
new file mode 100644
index 0000000000000000000000000000000000000000..050c99ec3811699a85daa056730d86b30213b13a
GIT binary patch
literal 2072
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
CDfZ_8

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_amazon.png b/res/drawable-xxxhdpi/ic_amazon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1146472498746fa81f198ce39b0cee89b5e1f6de
GIT binary patch
literal 4788
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
O0000<MNUMnLSTY$k~}Q{

literal 0
HcmV?d00001

diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhotoFactory.java b/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhotoFactory.java
index 79816268e2..6cebe77f28 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhotoFactory.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhotoFactory.java
@@ -6,6 +6,8 @@ import android.net.Uri;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.provider.ContactsContract;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
@@ -17,8 +19,9 @@ import org.thoughtcrime.securesms.util.BitmapUtil;
 import java.io.InputStream;
 
 public class ContactPhotoFactory {
-  private static final String TAG = ContactPhotoFactory.class.getSimpleName();
 
+  private static final String TAG = ContactPhotoFactory.class.getSimpleName();
+  
   public static ContactPhoto getLoadingPhoto() {
     return new TransparentContactPhoto();
   }
@@ -28,6 +31,10 @@ public class ContactPhotoFactory {
     else                          return new GeneratedContactPhoto("#");
   }
 
+  public static ContactPhoto getResourceContactPhoto(@DrawableRes int resourceId) {
+    return new ResourceContactPhoto(resourceId);
+  }
+
   public static ContactPhoto getDefaultGroupPhoto() {
     return new ResourceContactPhoto(R.drawable.ic_group_white_24dp);
   }
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
index a261004e2f..cd1c3763c0 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
@@ -6,6 +6,7 @@ import android.graphics.ColorFilter;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
+import android.support.annotation.DrawableRes;
 import android.support.v4.graphics.ColorUtils;
 import android.widget.ImageView;
 
@@ -16,7 +17,7 @@ public class ResourceContactPhoto implements ContactPhoto {
 
   private final int resourceId;
 
-  ResourceContactPhoto(int resourceId) {
+  ResourceContactPhoto(@DrawableRes int resourceId) {
     this.resourceId = resourceId;
   }
 
diff --git a/src/org/thoughtcrime/securesms/database/CanonicalAddressDatabase.java b/src/org/thoughtcrime/securesms/database/CanonicalAddressDatabase.java
index 4fa4a783d1..b440748ef9 100644
--- a/src/org/thoughtcrime/securesms/database/CanonicalAddressDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/CanonicalAddressDatabase.java
@@ -22,6 +22,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteDatabase.CursorFactory;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.support.annotation.NonNull;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.util.Log;
@@ -97,7 +98,7 @@ public class CanonicalAddressDatabase {
     }
   }
 
-  public String getAddressFromId(long id) {
+  public @NonNull String getAddressFromId(long id) {
     String cachedAddress = idCache.get(id);
 
     if (cachedAddress != null)
diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
index 83374da6a0..c50a011080 100644
--- a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
+++ b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
@@ -25,7 +25,9 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
 
+import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.color.MaterialColor;
+import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhotoFactory;
 import org.thoughtcrime.securesms.database.CanonicalAddressDatabase;
@@ -40,7 +42,7 @@ import org.whispersystems.libaxolotl.util.guava.Optional;
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -62,6 +64,12 @@ public class RecipientProvider {
     PhoneLookup.NUMBER
   };
 
+  private static final Map<String, RecipientDetails> STATIC_DETAILS = new HashMap<String, RecipientDetails>() {{
+    put("262966", new RecipientDetails("Amazon", "262966", null,
+                                       ContactPhotoFactory.getResourceContactPhoto(R.drawable.ic_amazon),
+                                       ContactColors.UNKNOWN_COLOR));
+  }};
+
   Recipient getRecipient(Context context, long recipientId, boolean asynchronous) {
     Recipient cachedRecipient = recipientCache.get(recipientId);
     if (cachedRecipient != null && !cachedRecipient.isStale()) return cachedRecipient;
@@ -102,7 +110,7 @@ public class RecipientProvider {
 
   private @NonNull ListenableFutureTask<RecipientDetails> getRecipientDetailsAsync(final Context context,
                                                                                    final long recipientId,
-                                                                                   final String number)
+                                                                                   final @NonNull String number)
   {
     Callable<RecipientDetails> task = new Callable<RecipientDetails>() {
       @Override
@@ -116,12 +124,12 @@ public class RecipientProvider {
     return future;
   }
 
-  private @NonNull RecipientDetails getRecipientDetailsSync(Context context, long recipientId, String number) {
+  private @NonNull RecipientDetails getRecipientDetailsSync(Context context, long recipientId, @NonNull String number) {
     if (GroupUtil.isEncodedGroup(number)) return getGroupRecipientDetails(context, number);
     else                                  return getIndividualRecipientDetails(context, recipientId, number);
   }
 
-  private @NonNull RecipientDetails getIndividualRecipientDetails(Context context, long recipientId, String number) {
+  private @NonNull RecipientDetails getIndividualRecipientDetails(Context context, long recipientId, @NonNull String number) {
     Optional<RecipientsPreferences> preferences = DatabaseFactory.getRecipientPreferenceDatabase(context).getRecipientsPreferences(new long[]{recipientId});
     MaterialColor                   color       = preferences.isPresent() ? preferences.get().getColor() : null;
     Uri                             uri         = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(number));
@@ -143,7 +151,8 @@ public class RecipientProvider {
         cursor.close();
     }
 
-    return new RecipientDetails(null, number, null, ContactPhotoFactory.getDefaultContactPhoto(null), color);
+    if (STATIC_DETAILS.containsKey(number)) return STATIC_DETAILS.get(number);
+    else                                    return new RecipientDetails(null, number, null, ContactPhotoFactory.getDefaultContactPhoto(null), color);
   }
 
   private @NonNull RecipientDetails getGroupRecipientDetails(Context context, String groupId) {