TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 12:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

group member name tags, group convo iconography, tweaks

Browse Source
This commit is contained in:
Jake McGinty 2014-02-15 04:21:56 -08:00
parent b2fdd74a1c
commit 8e3aa94a05
25 changed files with 150 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
res/drawable-hdpi/ic_groups_holo_dark.png → res/drawable-hdpi/ic_menu_groups_holo_dark.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
res/drawable-hdpi/ic_menu_groups_holo_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 859 B

0
res/drawable-hdpi/group_distribute.png → res/drawable-hdpi/ic_menu_split_holo_dark.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
res/drawable-hdpi/ic_menu_split_holo_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 509 B

0
res/drawable-mdpi/ic_groups_holo_dark.png → res/drawable-mdpi/ic_menu_groups_holo_dark.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
res/drawable-mdpi/ic_menu_groups_holo_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 557 B

0
res/drawable-mdpi/group_distribute.png → res/drawable-mdpi/ic_menu_split_holo_dark.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
res/drawable-mdpi/ic_menu_split_holo_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 441 B

0
res/drawable-xhdpi/ic_groups_holo_dark.png → res/drawable-xhdpi/ic_menu_groups_holo_dark.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
res/drawable-xhdpi/ic_menu_groups_holo_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

0
res/drawable-xhdpi/group_distribute.png → res/drawable-xhdpi/ic_menu_split_holo_dark.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
res/drawable-xhdpi/ic_menu_split_holo_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 653 B

BIN
res/drawable-xxhdpi/ic_menu_groups_holo_dark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
res/drawable-xxhdpi/ic_menu_groups_holo_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
res/drawable-xxhdpi/ic_menu_split_holo_dark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 907 B

BIN
res/drawable-xxhdpi/ic_menu_split_holo_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 916 B

222
res/layout/conversation_item_received.xml
View File

@ -1,103 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<org.thoughtcrime.securesms.ConversationItem
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/conversation_item"
<org.thoughtcrime.securesms.ConversationItem android:id="@+id/conversation_item"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingRight="10dip"
android:orientation="horizontal"
android:background="?conversation_background">
android:orientation="vertical"
android:background="?conversation_background"
xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:id="@+id/group_message_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="5dp"
android:fontFamily="sans-serif-light"
android:textSize="13sp"
android:textColor="?attr/conversation_group_member_name"
android:visibility="gone" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="6dp"
android:layout_marginLeft="10dp"
android:layout_marginBottom="6dp"
android:layout_marginRight="0dp">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginLeft="9dp"
android:layout_marginBottom="6dp"
android:layout_marginRight="0dp"
android:orientation="horizontal">
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/contact_photo"
android:layout_alignParentLeft="true"
android:layout_width="40dp"
android:layout_height="40dp"
android:cropToPadding="true"
android:scaleType="centerCrop"
android:layout_marginRight="10dp"
/>
<View
android:id="@+id/triangle_tick"
android:background="@drawable/conversation_item_received_triangle_shape"
<ImageView android:id="@+id/contact_photo"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginRight="10dp"
android:layout_alignParentLeft="true"
android:cropToPadding="true"
android:scaleType="centerCrop" />
<View android:id="@+id/triangle_tick"
android:layout_width="12dp"
android:layout_height="15dp"
android:layout_marginTop="12dp"
android:layout_alignRight="@id/contact_photo"
/>
android:background="@drawable/conversation_item_received_triangle_shape" />
<LinearLayout android:id="@+id/conversation_item_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_toRightOf="@id/triangle_tick"
android:background="@drawable/conversation_item_received_shape"
android:orientation="vertical">
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_toRightOf="@id/triangle_tick"
android:background="@drawable/conversation_item_received_shape"
android:orientation="vertical">
<LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="5dip"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/key_exchange_indicator"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="5dip"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:orientation="horizontal">
<ImageView android:id="@+id/key_exchange_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_menu_login"
android:visibility="gone"
android:contentDescription="Key Exchange Indicator"/>
android:contentDescription="Key Exchange Indicator"
android:visibility="gone" />
<TextView android:id="@+id/conversation_item_body"
android:autoLink="all"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:linksClickable="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?conversation_received_text_primary_color"
android:textSize="16sp" />
android:textSize="16sp"
android:autoLink="all"
android:linksClickable="true" />
</LinearLayout>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/mms_view"
<FrameLayout android:id="@+id/mms_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone">
<ImageView
android:id="@+id/image_view"
<ImageView android:id="@+id/image_view"
android:layout_width="230dip"
android:layout_height="174dip"
android:layout_gravity="center"
android:scaleType="centerInside"
android:adjustViewBounds="true"
android:visibility="gone"
android:contentDescription="Message Media"/>
<ImageButton
android:id="@+id/play_slideshow_button"
android:contentDescription="Message Media"
android:visibility="gone" />
<ImageButton android:id="@+id/play_slideshow_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/mms_play_btn"
android:layout_gravity="center"
android:visibility="gone"
android:contentDescription="Play Button"/>
android:src="@drawable/mms_play_btn"
android:contentDescription="Play Button"
android:visibility="gone" />
</FrameLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/mms_download_controls"
<LinearLayout android:id="@+id/mms_download_controls"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
@ -120,75 +114,61 @@
</LinearLayout>
<LinearLayout android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="left"
android:paddingTop="2dip"
android:paddingLeft="8dp"
android:paddingRight="5dp"
android:paddingBottom="5dp" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingTop="2dip"
android:paddingLeft="8dp"
android:paddingRight="5dp"
android:paddingBottom="5dp"
android:orientation="horizontal"
android:gravity="left">
<ImageView android:id="@+id/delivered_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="3dip"
android:src="?conversation_delivered_indicator"
android:visibility="gone"
android:contentDescription="Delivered Indicator"/>
<TextView android:id="@+id/group_message_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:linksClickable="false"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_gravity="left"
android:textColor="?conversation_received_text_secondary_color"
android:visibility="gone"
android:layout_marginRight="8dip"
android:paddingTop="1dip"/>
<ImageView android:id="@+id/delivered_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="3dip"
android:src="?conversation_delivered_indicator"
android:contentDescription="Delivered Indicator"
android:visibility="gone" />
<ImageView android:id="@+id/sms_secure_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?menu_lock_icon_small"
android:layout_gravity="center_vertical"
android:visibility="gone"
android:paddingRight="4dp"
android:paddingTop="2dp"
android:contentDescription="Secure Message Indicator"/>
<TextView android:id="@+id/conversation_item_date"
android:autoLink="all"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:linksClickable="false"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_gravity="left"
android:textColor="?conversation_received_text_secondary_color"
android:fontFamily="sans-serif-light"
android:paddingTop="1dip" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="4dp"
android:paddingTop="2dp"
android:src="?menu_lock_icon_small"
android:contentDescription="Secure Message Indicator"
android:visibility="gone" />
<TextView android:id="@+id/conversation_item_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:paddingTop="1dip"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?conversation_received_text_secondary_color"
android:fontFamily="sans-serif-light"
android:autoLink="all"
android:linksClickable="false" />
</LinearLayout>
</LinearLayout>
<LinearLayout android:id="@+id/indicators_parent"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:orientation="vertical"
android:layout_alignParentRight="true"
android:gravity="center_vertical"
android:background="?conversation_background">
<LinearLayout android:id="@+id/indicators_parent"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_alignParentRight="true"
android:orientation="vertical"
android:gravity="center_vertical"
android:background="?conversation_background">
<ImageView
android:id="@+id/sms_failed_indicator"
<ImageView android:id="@+id/sms_failed_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_list_alert_sms_failed"
android:visibility="gone"
android:contentDescription="Send Failed Indicator"/>
android:contentDescription="Send Failed Indicator"
android:visibility="gone" />
</LinearLayout>
</RelativeLayout>

71
res/layout/group_create_activity.xml
View File

@ -1,104 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginBottom="20dp">
android:layout_marginBottom="20dp"
android:gravity="center_vertical">
<LinearLayout
android:id="@+id/group_details_layout"
<LinearLayout android:id="@+id/group_details_layout"
android:layout_width="fill_parent"
android:layout_height="106dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingLeft="14dp"
android:paddingRight="18dp"
android:paddingTop="14dp">
android:paddingTop="14dp"
android:orientation="horizontal"
android:gravity="center_vertical">
<ImageView
android:id="@+id/avatar"
<ImageView android:id="@+id/avatar"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginRight="10dp"
android:background="@drawable/thin_border"
android:src="@drawable/icon"/>
<EditText
android:id="@+id/group_name"
<EditText android:id="@+id/group_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="10dp"
android:hint="@string/GroupCreateActivity_group_name_hint"
android:layout_gravity="center_vertical" />
android:lines="1"
android:inputType="textAutoCorrect"
android:hint="@string/GroupCreateActivity_group_name_hint" />
</LinearLayout>
<LinearLayout
android:id="@+id/creating_group_layout"
android:visibility="gone"
<LinearLayout android:id="@+id/creating_group_layout"
android:layout_width="fill_parent"
android:layout_height="106dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingLeft="18dp"
android:paddingRight="18dp"
android:paddingTop="18dp">
android:paddingTop="18dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:visibility="gone">
<ProgressBar
android:id="@+id/creating_progress_bar"
<ProgressBar android:id="@+id/creating_progress_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:indeterminate="true"
style="@android:style/Widget.ProgressBar" />
style="@android:style/Widget.ProgressBar"
android:indeterminate="true" />
<TextView
android:id="@+id/creating_group_text"
<TextView android:id="@+id/creating_group_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="10dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="center_vertical" />
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<RelativeLayout
android:id="@+id/push_disabled"
<RelativeLayout android:id="@+id/push_disabled"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="106dp"
android:background="#aa000000"
android:gravity="center_vertical|center_horizontal"
android:padding="15dp"
android:gravity="center_vertical|center_horizontal"
android:background="#aa000000"
android:visibility="gone">
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:padding="8dp"
android:background="#dd222222"
android:textColor="#ffeeeeee"
android:fontFamily="sans-serif-light"
android:padding="8dp"
android:textSize="16sp"
android:text="@string/GroupCreateActivity_contacts_dont_support_push" />
</RelativeLayout>
</RelativeLayout>
<org.thoughtcrime.securesms.components.PushRecipientsPanel
android:id="@+id/recipients"
<org.thoughtcrime.securesms.components.PushRecipientsPanel android:id="@+id/recipients"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingLeft="15dp"
android:paddingRight="15dp" />
<ListView
android:id="@+id/selected_contacts_list"
<ListView android:id="@+id/selected_contacts_list"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

6
res/menu/conversation_group_options.xml
View File

@ -3,15 +3,15 @@
<item android:title="@string/convesation_group_options__recipients_list"
android:id="@+id/menu_group_recipients"
android:icon="@drawable/ic_groups_holo_dark"
android:icon="?menu_group_icon"
android:showAsAction="ifRoom" />
<item android:title="@string/conversation_group_options__delivery"
android:id="@+id/menu_group_delivery"
android:icon="@drawable/group_distribute"
android:icon="?menu_split_icon"
android:showAsAction="ifRoom" >
<menu >
<menu>
<group android:id="@+id/distribution_group"
android:checkableBehavior="single">
<item android:id="@+id/menu_distribution_conversation" android:title="@string/conversation_group_options__conversation" android:checked="true" />

3
res/values/attrs.xml
View File

@ -9,6 +9,7 @@
<attr name="conversation_list_item_date_color" format="reference|color"/>
<attr name="conversation_sent_card_background" format="reference|color"/>
<attr name="conversation_group_member_name" format="reference|color"/>
<attr name="conversation_sent_text_primary_color" format="reference|color"/>
<attr name="conversation_sent_text_secondary_color" format="reference|color"/>
<attr name="conversation_received_card_background" format="reference|color"/>
@ -42,4 +43,6 @@
<attr name="menu_lock_icon_small" format="reference" />
<attr name="menu_trash_icon" format="reference" />
<attr name="menu_selectall_icon" format="reference" />
<attr name="menu_group_icon" format="reference" />
<attr name="menu_split_icon" format="reference" />
</resources>

6
res/values/styles.xml
View File

@ -15,8 +15,8 @@
<item name="android:backgroundDimEnabled">false</item>
<item name="android:background">@android:color/transparent</item>
</style>
<style name="NotificationText">
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
@ -25,7 +25,7 @@
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textStyle">bold</item>
</style>
<style name="Registration.Description" parent="@android:style/TextAppearance">
<item name="android:textSize">16.0sp</item>
<item name="android:typeface">sans</item>

6
res/values/themes.xml
View File

@ -11,6 +11,7 @@
<item name="actionbar_icon">@drawable/actionbar_icon_holo_light</item>
<item name="conversation_group_member_name">#99000000</item>
<item name="conversation_sent_text_primary_color">#ffeeeeee</item>
<item name="conversation_sent_text_secondary_color">#44000000</item>
<item name="conversation_received_text_primary_color">#ff111111</item>
@ -29,6 +30,7 @@
<item name="menu_new_conversation_icon">@drawable/ic_action_new_holo_light</item>
<item name="menu_new_group_icon">@drawable/ic_action_add_group_holo_light</item>
<item name="menu_group_icon">@drawable/ic_menu_groups_holo_light</item>
<item name="menu_search_icon">@drawable/ic_menu_search_holo_light</item>
<item name="menu_call_icon">@drawable/ic_menu_call_holo_light</item>
<item name="menu_unlock_icon">@drawable/ic_menu_unlock_holo_light</item>
@ -36,6 +38,7 @@
<item name="menu_lock_icon_small">@drawable/ic_menu_lock_small_holo_light</item>
<item name="menu_trash_icon">@drawable/ic_menu_trash_holo_light</item>
<item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_light</item>
<item name="menu_split_icon">@drawable/ic_menu_split_holo_light</item>
</style>
@ -59,6 +62,7 @@
<item name="conversation_list_item_subject_color">#ffdddddd</item>
<item name="conversation_list_item_date_color">#ffdddddd</item>
<item name="conversation_group_member_name">#99ffffff</item>
<item name="conversation_sent_text_primary_color">#ffeeeeee</item>
<item name="conversation_sent_text_secondary_color">#44000000</item>
<item name="conversation_received_text_primary_color">#ff111111</item>
@ -79,12 +83,14 @@
<item name="menu_new_conversation_icon">@drawable/ic_action_new_holo_dark</item>
<item name="menu_new_group_icon">@drawable/ic_action_add_group_holo_dark</item>
<item name="menu_group_icon">@drawable/ic_menu_groups_holo_dark</item>
<item name="menu_search_icon">@drawable/ic_menu_search_holo_dark</item>
<item name="menu_call_icon">@drawable/ic_menu_call_holo_dark</item>
<item name="menu_unlock_icon">@drawable/ic_menu_unlock_holo_dark</item>
<item name="menu_lock_icon">@drawable/ic_menu_lock_holo_dark</item>
<item name="menu_trash_icon">@drawable/ic_menu_trash_holo_dark</item>
<item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_dark</item>
<item name="menu_split_icon">@drawable/ic_menu_split_holo_dark</item>
</style>
<style name="TextSecure.DarkTheme.NavigationDrawer"

2
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -435,7 +435,7 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.ConversationActivity_group_conversation_recipients);
builder.setIcon(R.drawable.ic_groups_holo_dark);
builder.setIcon(R.drawable.ic_menu_groups_holo_dark);
builder.setCancelable(true);
builder.setItems(recipientStrings.toArray(new String[]{}), null);
builder.setPositiveButton(android.R.string.ok, null);

2
src/org/thoughtcrime/securesms/ConversationFragment.java
View File

@ -188,7 +188,7 @@ public class ConversationFragment extends SherlockListFragment
if (this.recipients != null && this.threadId != -1) {
this.setListAdapter(new ConversationAdapter(getActivity(), masterSecret,
new FailedIconClickHandler(),
!this.recipients.isSingleRecipient()));
(!this.recipients.isSingleRecipient()) || this.recipients.isGroupRecipient()));
getListView().setRecyclerListener((ConversationAdapter)getListAdapter());
getLoaderManager().initLoader(0, null, this);
}

15
src/org/thoughtcrime/securesms/ConversationItem.java
View File

@ -21,13 +21,7 @@ import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffXfermode;
import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.media.MediaScannerConnection;
import android.net.Uri;
@ -48,8 +42,6 @@ import android.widget.TextView;
import android.widget.Toast;
import android.webkit.MimeTypeMap;
import org.thoughtcrime.securesms.contacts.ContactIdentityManager;
import org.thoughtcrime.securesms.contacts.ContactPhotoFactory;
import org.whispersystems.textsecure.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.MmsDatabase;
import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
@ -61,7 +53,6 @@ import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.service.SendReceiveService;
import org.thoughtcrime.securesms.util.BitmapUtil;
import org.thoughtcrime.securesms.util.Emoji;
import org.whispersystems.textsecure.push.PushMessageProtos;
import org.whispersystems.textsecure.util.FutureTaskListener;
import org.whispersystems.textsecure.util.ListenableFutureTask;
@ -340,12 +331,6 @@ public class ConversationItem extends LinearLayout {
}
}
private void setContactPhotoForUserIdentity() {
Uri uri = ContactIdentityManager.getInstance(context).getSelfIdentityUri();
contactPhoto.setImageBitmap(ContactPhotoFactory.getLocalUserContactPhoto(context, uri));
contactPhoto.setVisibility(View.VISIBLE);
}
private void setContactPhotoForRecipient(final Recipient recipient) {
contactPhoto.setImageBitmap(BitmapUtil.getCroppedBitmap(recipient.getContactPhoto()));
contactPhoto.setOnClickListener(new View.OnClickListener() {