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

Clean

Browse Source
This commit is contained in:
Niels Andriesse 2020-01-22 15:28:39 +11:00
parent d0225bdffb
commit 1e014a690f
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/conversation_activity.xml
View File

@ -57,6 +57,8 @@
android:id="@+id/subtitleTextView" android:id="@+id/subtitleTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:text="26 members" android:text="26 members"
android:textColor="@color/text" android:textColor="@color/text"
android:textSize="@dimen/small_font_size" /> android:textSize="@dimen/small_font_size" />

5
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -237,6 +237,7 @@ import org.whispersystems.signalservice.loki.api.PairingAuthorisation;
import org.whispersystems.signalservice.loki.messaging.LokiMessageFriendRequestStatus; import org.whispersystems.signalservice.loki.messaging.LokiMessageFriendRequestStatus;
import org.whispersystems.signalservice.loki.messaging.LokiThreadFriendRequestStatus; import org.whispersystems.signalservice.loki.messaging.LokiThreadFriendRequestStatus;
import org.whispersystems.signalservice.loki.messaging.Mention; import org.whispersystems.signalservice.loki.messaging.Mention;
import org.whispersystems.signalservice.loki.utilities.PublicKeyValidation;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -3147,9 +3148,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} else { } else {
actionBarSubtitleTextView.setText(userCount + " members"); actionBarSubtitleTextView.setText(userCount + " members");
} }
} else if (PublicKeyValidation.isValid(recipient.getAddress().toString())) {
actionBarSubtitleTextView.setText(recipient.getAddress().toString());
} else { } else {
actionBarSubtitleTextView.setVisibility(View.GONE); actionBarSubtitleTextView.setVisibility(View.GONE);
} }
} else if (PublicKeyValidation.isValid(recipient.getAddress().toString())) {
actionBarSubtitleTextView.setText(recipient.getAddress().toString());
} else { } else {
actionBarSubtitleTextView.setVisibility(View.GONE); actionBarSubtitleTextView.setVisibility(View.GONE);
} }