mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-24 02:25:19 +00:00
parent
f45a285141
commit
dbf7715977
@ -508,7 +508,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|||||||
|
|
||||||
DatabaseFactory.getLokiThreadDatabase(this).setDelegate(this);
|
DatabaseFactory.getLokiThreadDatabase(this).setDelegate(this);
|
||||||
|
|
||||||
inputPanel.setHint("Message");
|
inputPanel.setHint(getResources().getString(R.string.ConversationActivity_message));
|
||||||
|
|
||||||
updateSessionRestoreBanner();
|
updateSessionRestoreBanner();
|
||||||
|
|
||||||
@ -2624,7 +2624,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|||||||
if (recipient == null) {
|
if (recipient == null) {
|
||||||
titleTextView.setText("Compose");
|
titleTextView.setText("Compose");
|
||||||
} else if (allUserDevices.contains(recipient.getAddress().toString().toLowerCase())) {
|
} else if (allUserDevices.contains(recipient.getAddress().toString().toLowerCase())) {
|
||||||
titleTextView.setText("Note to Self");
|
titleTextView.setText(getResources().getString(R.string.note_to_self));
|
||||||
} else {
|
} else {
|
||||||
boolean hasName = (recipient.getName() != null && !recipient.getName().isEmpty());
|
boolean hasName = (recipient.getName() != null && !recipient.getName().isEmpty());
|
||||||
titleTextView.setText(hasName ? recipient.getName() : recipient.getAddress().toString());
|
titleTextView.setText(hasName ? recipient.getName() : recipient.getAddress().toString());
|
||||||
|
@ -89,8 +89,8 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
|
|||||||
val isGuardSnode = (OnionRequestAPI.guardSnodes.contains(snode))
|
val isGuardSnode = (OnionRequestAPI.guardSnodes.contains(snode))
|
||||||
getPathRow(snode, LineView.Location.Middle, index.toLong() * 1000 + 2000, dotAnimationRepeatInterval, isGuardSnode)
|
getPathRow(snode, LineView.Location.Middle, index.toLong() * 1000 + 2000, dotAnimationRepeatInterval, isGuardSnode)
|
||||||
}
|
}
|
||||||
val youRow = getPathRow("You", null, LineView.Location.Top, 1000, dotAnimationRepeatInterval)
|
val youRow = getPathRow(resources.getString(R.string.activity_path_device_row_title), null, LineView.Location.Top, 1000, dotAnimationRepeatInterval)
|
||||||
val destinationRow = getPathRow("Destination", null, LineView.Location.Bottom, path.count().toLong() * 1000 + 2000, dotAnimationRepeatInterval)
|
val destinationRow = getPathRow(resources.getString(R.string.activity_path_destination_row_title), null, LineView.Location.Bottom, path.count().toLong() * 1000 + 2000, dotAnimationRepeatInterval)
|
||||||
val rows = listOf( youRow ) + pathRows + listOf( destinationRow )
|
val rows = listOf( youRow ) + pathRows + listOf( destinationRow )
|
||||||
for (row in rows) {
|
for (row in rows) {
|
||||||
pathRowsContainer.addView(row)
|
pathRowsContainer.addView(row)
|
||||||
|
@ -128,6 +128,8 @@
|
|||||||
<string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Le destinataire n’est pas une adresse texto ou courriel valide !</string>
|
<string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Le destinataire n’est pas une adresse texto ou courriel valide !</string>
|
||||||
<string name="ConversationActivity_message_is_empty_exclamation">Le message est vide !</string>
|
<string name="ConversationActivity_message_is_empty_exclamation">Le message est vide !</string>
|
||||||
<string name="ConversationActivity_group_members">Membres du groupe</string>
|
<string name="ConversationActivity_group_members">Membres du groupe</string>
|
||||||
|
<string name="ConversationActivity_note_to_self">Note à mon intention</string>
|
||||||
|
<string name="ConversationActivity_message">Message</string>
|
||||||
<string name="ConversationActivity_invalid_recipient">Le destinataire est invalide !</string>
|
<string name="ConversationActivity_invalid_recipient">Le destinataire est invalide !</string>
|
||||||
<string name="ConversationActivity_added_to_home_screen">Ajouté à l’écran d’accueil</string>
|
<string name="ConversationActivity_added_to_home_screen">Ajouté à l’écran d’accueil</string>
|
||||||
<string name="ConversationActivity_calls_not_supported">Appels non pris en charge</string>
|
<string name="ConversationActivity_calls_not_supported">Appels non pris en charge</string>
|
||||||
|
@ -133,6 +133,8 @@
|
|||||||
<string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Адрес получателя не является ни номером телефона, ни адресом электронной почты.</string>
|
<string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Адрес получателя не является ни номером телефона, ни адресом электронной почты.</string>
|
||||||
<string name="ConversationActivity_message_is_empty_exclamation">Пустое сообщение!</string>
|
<string name="ConversationActivity_message_is_empty_exclamation">Пустое сообщение!</string>
|
||||||
<string name="ConversationActivity_group_members">Участники группы</string>
|
<string name="ConversationActivity_group_members">Участники группы</string>
|
||||||
|
<string name="ConversationActivity_note_to_self">Заметка для себя</string>
|
||||||
|
<string name="ConversationActivity_message">Соощение</string>
|
||||||
<string name="ConversationActivity_invalid_recipient">Неверный получатель!</string>
|
<string name="ConversationActivity_invalid_recipient">Неверный получатель!</string>
|
||||||
<string name="ConversationActivity_added_to_home_screen">Добавлено на главный экран</string>
|
<string name="ConversationActivity_added_to_home_screen">Добавлено на главный экран</string>
|
||||||
<string name="ConversationActivity_calls_not_supported">Звонки не поддерживаются</string>
|
<string name="ConversationActivity_calls_not_supported">Звонки не поддерживаются</string>
|
||||||
|
@ -151,6 +151,8 @@
|
|||||||
<string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Recipient is not a valid SMS or email address!</string>
|
<string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Recipient is not a valid SMS or email address!</string>
|
||||||
<string name="ConversationActivity_message_is_empty_exclamation">Message is empty!</string>
|
<string name="ConversationActivity_message_is_empty_exclamation">Message is empty!</string>
|
||||||
<string name="ConversationActivity_group_members">Group members</string>
|
<string name="ConversationActivity_group_members">Group members</string>
|
||||||
|
<string name="ConversationActivity_note_to_self">Note to self</string>
|
||||||
|
<string name="ConversationActivity_message">Message</string>
|
||||||
|
|
||||||
<string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
|
<string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
|
||||||
<string name="ConversationActivity_added_to_home_screen">Added to home screen</string>
|
<string name="ConversationActivity_added_to_home_screen">Added to home screen</string>
|
||||||
|
Loading…
Reference in New Issue
Block a user