TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-02 14:35:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch from secure indicator to insecure indicator

Browse Source 
Instead of cluttering Signal messages with a little padlock,
let's highlight the insecurity of SMS messages instead.

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-09-26 17:38:17 -07:00
parent 8ce914a344
commit 8d08f3969a
8 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 814 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 543 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
res/drawable-xxxhdpi/ic_unlocked_white_18dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 650 B

17
res/layout/conversation_item_received.xml
View File

@ -113,15 +113,16 @@
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="left"> android:gravity="left">
<ImageView android:id="@+id/secure_indicator" <ImageView android:id="@+id/insecure_indicator"
android:layout_width="wrap_content" android:layout_width="12dp"
android:layout_height="wrap_content" android:layout_height="11dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingRight="2dp" android:layout_marginRight="3dp"
android:paddingEnd="4dp" android:layout_marginEnd="3dp"
android:src="?menu_lock_icon_small" android:src="@drawable/ic_unlocked_white_18dp"
android:contentDescription="@string/conversation_item__secure_message_description" android:contentDescription="@string/conversation_item__secure_message_description"
android:visibility="gone" android:visibility="gone"
android:alpha=".65"
android:tint="?conversation_item_received_text_secondary_color" android:tint="?conversation_item_received_text_secondary_color"
android:tintMode="multiply" android:tintMode="multiply"
tools:visibility="visible"/> tools:visibility="visible"/>
@ -135,8 +136,10 @@
app:offset="0" app:offset="0"
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:alpha=".65" android:alpha=".65"
android:layout_width="10dp" android:layout_width="8dp"
android:layout_height="11dp" android:layout_height="11dp"
android:layout_marginRight="3dp"
android:layout_marginEnd="3dp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"/> tools:visibility="visible"/>

29
res/layout/conversation_item_sent.xml
View File

@ -76,9 +76,9 @@
android:layout_gravity="right"> android:layout_gravity="right">
<View android:id="@+id/group_sender_holder" <View android:id="@+id/group_sender_holder"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"/> android:visibility="gone"/>
<TextView android:id="@+id/group_message_sender" <TextView android:id="@+id/group_message_sender"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -89,7 +89,7 @@
android:textColor="?conversation_item_sent_text_secondary_color" android:textColor="?conversation_item_sent_text_secondary_color"
android:visibility="gone" android:visibility="gone"
android:layout_marginRight="8dip" android:layout_marginRight="8dip"
android:paddingTop="1dip" /> android:paddingTop="1dip"/>
<TextView android:id="@+id/group_message_sender_profile" <TextView android:id="@+id/group_message_sender_profile"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -100,7 +100,7 @@
android:textColor="?conversation_item_sent_text_secondary_color" android:textColor="?conversation_item_sent_text_secondary_color"
android:visibility="gone" android:visibility="gone"
android:layout_marginRight="8dip" android:layout_marginRight="8dip"
android:paddingTop="1dip" /> android:paddingTop="1dip"/>
<TextView android:id="@+id/conversation_item_date" <TextView android:id="@+id/conversation_item_date"
@ -116,7 +116,7 @@
android:textSize="@dimen/conversation_item_date_text_size" android:textSize="@dimen/conversation_item_date_text_size"
android:paddingTop="1dip" android:paddingTop="1dip"
android:paddingBottom="2dp" android:paddingBottom="2dp"
tools:text="30 mins" /> tools:text="30 mins"/>
<TextView android:id="@+id/sim_info" <TextView android:id="@+id/sim_info"
android:autoLink="none" android:autoLink="none"
@ -154,19 +154,22 @@
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:alpha=".6" android:alpha=".6"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:layout_width="10dp" android:layout_marginStart="3dp"
android:layout_width="7dp"
android:layout_height="11dp" android:layout_height="11dp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"/> tools:visibility="visible"/>
<ImageView android:id="@+id/secure_indicator" <ImageView android:id="@+id/insecure_indicator"
android:layout_width="wrap_content" android:layout_width="12dp"
android:layout_height="wrap_content" android:layout_height="11dp"
android:src="?menu_lock_icon_small" android:src="@drawable/ic_unlocked_white_18dp"
android:visibility="gone" android:visibility="gone"
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:paddingLeft="2dp" android:alpha=".6"
android:tint="?conversation_item_sent_text_secondary_color" android:tint="@color/black"
android:layout_marginLeft="3dp"
android:layout_marginStart="3dp"
android:tintMode="multiply" android:tintMode="multiply"
android:contentDescription="@string/conversation_item__secure_message_description" android:contentDescription="@string/conversation_item__secure_message_description"
tools:visibility="visible"/> tools:visibility="visible"/>

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

@ -117,7 +117,7 @@ public class ConversationItem extends LinearLayout
private TextView groupSender; private TextView groupSender;
private TextView groupSenderProfileName; private TextView groupSenderProfileName;
private View groupSenderHolder; private View groupSenderHolder;
private ImageView secureImage; private ImageView insecureImage;
private AvatarImageView contactPhoto; private AvatarImageView contactPhoto;
private DeliveryStatusView deliveryStatusIndicator; private DeliveryStatusView deliveryStatusIndicator;
private AlertView alertView; private AlertView alertView;
@ -162,7 +162,7 @@ public class ConversationItem extends LinearLayout
this.indicatorText = (TextView) findViewById(R.id.indicator_text); this.indicatorText = (TextView) findViewById(R.id.indicator_text);
this.groupSender = (TextView) findViewById(R.id.group_message_sender); this.groupSender = (TextView) findViewById(R.id.group_message_sender);
this.groupSenderProfileName = (TextView) findViewById(R.id.group_message_sender_profile); this.groupSenderProfileName = (TextView) findViewById(R.id.group_message_sender_profile);
this.secureImage = (ImageView) findViewById(R.id.secure_indicator); this.insecureImage = (ImageView) findViewById(R.id.insecure_indicator);
this.deliveryStatusIndicator = (DeliveryStatusView) findViewById(R.id.delivery_status); this.deliveryStatusIndicator = (DeliveryStatusView) findViewById(R.id.delivery_status);
this.alertView = (AlertView) findViewById(R.id.indicators_parent); this.alertView = (AlertView) findViewById(R.id.indicators_parent);
this.contactPhoto = (AvatarImageView) findViewById(R.id.contact_photo); this.contactPhoto = (AvatarImageView) findViewById(R.id.contact_photo);
@ -432,7 +432,7 @@ public class ConversationItem extends LinearLayout
private void setStatusIcons(MessageRecord messageRecord) { private void setStatusIcons(MessageRecord messageRecord) {
indicatorText.setVisibility(View.GONE); indicatorText.setVisibility(View.GONE);
secureImage.setVisibility(messageRecord.isSecure() ? View.VISIBLE : View.GONE); insecureImage.setVisibility(messageRecord.isSecure() ? View.GONE : View.VISIBLE);
bodyText.setCompoundDrawablesWithIntrinsicBounds(0, 0, messageRecord.isKeyExchange() ? R.drawable.ic_menu_login : 0, 0); bodyText.setCompoundDrawablesWithIntrinsicBounds(0, 0, messageRecord.isKeyExchange() ? R.drawable.ic_menu_login : 0, 0);
dateText.setText(DateUtils.getExtendedRelativeTimeSpanString(getContext(), locale, messageRecord.getTimestamp())); dateText.setText(DateUtils.getExtendedRelativeTimeSpanString(getContext(), locale, messageRecord.getTimestamp()));