keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/loki-project/session-android into store-permission-refactoring

Browse Source
pull/335/head
Anton Chekulaev 5 years ago
parent f20ebc31f3 fe0d382a00
commit e0fe8d10e2
30 changed files with 646 additions and 316 deletions
Show Stats Download Patch File Download Diff File

6
res/layout-sw400dp/fragment_enter_chat_url.xml
Unescape Escape View File

@ -7,6 +7,12 @@
android:gravity="center_horizontal"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<EditText
style="@style/SessionEditText"
android:id="@+id/chatURLEditText"

6
res/layout-sw400dp/fragment_enter_public_key.xml
Unescape Escape View File

@ -8,6 +8,12 @@
android:gravity="center_horizontal"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<EditText
style="@style/SessionEditText"
android:id="@+id/publicKeyEditText"

2
res/layout/activity_create_closed_group.xml
Unescape Escape View File

@ -73,7 +73,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_centerInParent="true"
app:SpinKit_Color="?android:colorControlNormal" />
app:SpinKit_Color="@android:color/white" />
</RelativeLayout>

11
res/layout/activity_home.xml
Unescape Escape View File

@ -14,7 +14,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorPrimary"
android:elevation="1dp"
app:contentInsetStart="0dp">
<LinearLayout
@ -65,6 +64,12 @@
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<org.thoughtcrime.securesms.loki.views.SeedReminderView
android:id="@+id/seedReminderView"
android:layout_width="match_parent"
@ -95,8 +100,8 @@
<org.thoughtcrime.securesms.loki.views.NewConversationButtonSetView
android:id="@+id/newConversationButtonSet"
android:layout_width="252dp"
android:layout_height="212dp"
android:layout_width="276dp"
android:layout_height="236dp"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true" />

2
res/layout/activity_join_public_chat.xml
Unescape Escape View File

@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_centerInParent="true"
app:SpinKit_Color="@color/text" />
app:SpinKit_Color="@android:color/white" />
</RelativeLayout>

2
res/layout/activity_settings.xml
Unescape Escape View File

@ -248,7 +248,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_centerInParent="true"
app:SpinKit_Color="@color/text" />
app:SpinKit_Color="@android:color/white" />
</RelativeLayout>

6
res/layout/conversation_activity.xml
Unescape Escape View File

@ -108,6 +108,12 @@
android:indeterminate="false"
android:progress="0" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<org.thoughtcrime.securesms.loki.views.SessionRestoreBannerView
android:id="@+id/sessionRestoreBannerView"
android:layout_width="match_parent"

15
res/layout/expiration_timer_menu.xml
Unescape Escape View File

@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="?android:attr/actionButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:focusable="true"
android:gravity="center">
xmlns:app="http://schemas.android.com/apk/res-auto"
style="?android:attr/actionButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:focusable="true"
android:gravity="center">
<ImageView
android:id="@+id/menu_badge_icon"
@ -25,6 +26,6 @@
android:paddingBottom="3dp"
android:paddingTop="1dp"
android:background="@color/transparent"
android:textColor="@android:color/white"
android:textColor="@color/text"
android:textSize="10sp" />
</FrameLayout>

6
res/layout/fragment_enter_chat_url.xml
Unescape Escape View File

@ -7,6 +7,12 @@
android:gravity="center_horizontal"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<EditText
style="@style/SmallSessionEditText"
android:id="@+id/chatURLEditText"

6
res/layout/fragment_enter_public_key.xml
Unescape Escape View File

@ -7,6 +7,12 @@
android:gravity="center_horizontal"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<EditText
style="@style/SmallSessionEditText"
android:id="@+id/publicKeyEditText"

6
res/layout/fragment_view_my_qr_code.xml
Unescape Escape View File

@ -4,6 +4,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?android:dividerHorizontal"
android:elevation="1dp" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"

181
res/values-in/strings.xml
Unescape Escape View File

@ -1252,5 +1252,184 @@ Diterima pesan pertukaran kunci untuk versi protokol yang tidak valid.
<string name="prompt_passphrase_activity__tap_to_unlock">KETUK UNTUK MEMBUKA</string>
<string name="RegistrationLockDialog_reminder">Peringatan:</string>
<string name="recipient_preferences__about">Tentang</string>
<!--EOF-->
<!-- Session -->
<string name="continue_2">Lanjut</string>
<string name="copy">Salin</string>
<string name="invalid_url">URL salah</string>
<string name="copied_to_clipboard">Salin ke clipboard</string>
<string name="device_linking_failed">Gagal menyambungkan perangkat</string>
<string name="next">Selanjutnya</string>
<string name="share">Bagikan</string>
<string name="invalid_session_id">Session salah</string>
<string name="cancel">Batal</string>
<string name="your_session_id">Session ID anda</string>
<string name="activity_landing_title_2">Session anda dimulai di sini</string>
<string name="activity_landing_register_button_title">Buat Session ID</string>
<string name="activity_landing_restore_button_title">Lanjutkan Session</string>
<string name="activity_landing_link_button_title">Tautkan dengan akun</string>
<string name="activity_landing_device_unlinked_dialog_title">Sukses memutus koneksi perangkat</string>
<string name="view_fake_chat_bubble_1">Apa itu Session?</string>
<string name="view_fake_chat_bubble_2">Session adalah aplikasi pesan terenkripsi yang terdesentralisasi</string>
<string name="view_fake_chat_bubble_3">Bagaimana dengan pengumpulan informasi personal atau metadata percakapan? Bagaimana cara kerjanya?</string>
<string name="view_fake_chat_bubble_4">Menggunakan kombinasi routing yang anonim canggih dan teknologi enkripsi ujung-ke-ujung (end-to-end encryption)</string>
<string name="view_fake_chat_bubble_5">Rekan yang baik tak membiarkan rekannya menggunakan aplikasi bertukar pesan yang tak aman. Terima kasih kembali.</string>
<string name="activity_register_title">Ucapkan halo pada Session ID anda</string>
<string name="activity_register_explanation">Session ID adalah alamat unik yang bisa digunakan untuk mengontak anda. Tanpa koneksi dengan identitas asli, Session ID anda didesain bersifat anonim dan rahasia.</string>
<string name="activity_register_public_key_copied_message">Salin ke clipboard</string>
<string name="activity_restore_title">Kembalikan akun</string>
<string name="activity_restore_explanation">Masukkan kata pemulihan yang diberikan saat anda mencoba masuk ke akun</string>
<string name="activity_restore_seed_edit_text_hint">masukan kata pemulihan</string>
<string name="activity_link_device_title">Tautkan perangkat</string>
<string name="activity_link_device_enter_session_id_tab_title">Masuk ke Session ID</string>
<string name="activity_link_device_scan_qr_code_tab_title">Pindai kode QR</string>
<string name="activity_link_device_scan_qr_code_explanation">Tautkan Perangkat" di perangkat anda, kemudian pindai QR code yang muncul untuk mulai proses menautkan</string>
<string name="fragment_enter_session_id_title">Tautkan perangkat</string>
<string name="fragment_enter_session_id_explanation">Tautkan perangkat" di perangkat lain dan masuk ke Session ID anda untuk memulai proses menautkan</string>
<string name="fragment_enter_session_id_edit_text_hint">Masuk ke Session ID</string>
<string name="activity_display_name_title_2">Pilih nama yang ditampilkan</string>
<string name="activity_display_name_explanation">Ini akan menjadi nama anda ketika menggunakan Session. Bisa merupakan nama asli, alias, atau apapun yang anda suka</string>
<string name="activity_display_name_edit_text_hint">Masukkan nama</string>
<string name="activity_display_name_display_name_missing_error">Pilih nama yang ditampilkan</string>
<string name="activity_display_name_display_name_invalid_error">Masukkan nama yang terdiri dari karakter 1-z, A-Z, 0-9, dan _</string>
<string name="activity_display_name_display_name_too_long_error">Nama yang dibuat terlalu panjang</string>
<string name="activity_pn_mode_recommended_option_tag">Direkomendasikan</string>
<string name="activity_pn_mode_no_option_picked_dialog_title">Pilih salah satu opsi</string>
<string name="activity_home_empty_state_message">Anda belum memiliki kontak</string>
<string name="activity_home_empty_state_button_title">Mulai sebuah Session</string>
<string name="activity_home_leave_group_dialog_message">Apakah anda yakin ingin meninggalkan grup ini?</string>
<string name="activity_home_leaving_group_failed_message">Tak bisa meninggalkan grup</string>
<string name="activity_home_delete_conversation_dialog_message">Apakah anda yakin ingin menghapus percakapan ini?</string>
<string name="activity_home_conversation_deleted_message">Percakapan terhapus</string>
<string name="activity_seed_title">Kata pemulihan anda</string>
<string name="activity_seed_title_2">Inilah kata pemulihan anda</string>
<string name="activity_seed_explanation">Kata pemulihan adalah kunci Session ID -- bisa digunakan untuk mengembalikan Session ID ketika anda kehilangan perangkat. Simpan kata pemulihan di tempat yang aman dan jangan berikan kepada siapapun</string>
<string name="activity_seed_reveal_button_title">Tekan untuk melihat</string>
<string name="view_seed_reminder_subtitle_1">Amankan akun anda dengan menyimpan kata pemulihan</string>
<string name="view_seed_reminder_subtitle_2">Ketuk dan tekan kata yang disensor untuk mengetahui kata pemulihan anda, lalu simpan baik-baik untuk mengamnkan Session ID anda</string>
<string name="view_seed_reminder_subtitle_3">Pastikan untuk menyimpan kata pemulihan di tempat yang aman</string>
<string name="activity_path_title">Path</string>
<string name="activity_path_explanation">Session menyembunyikan IP dengan memantulkan pesan melalui berbagai simpul layanan di jaringan Session yang terdesentralisasi. Ini adalah negara yang menjadi lokasi pesan anda dipantulkan</string>
<string name="activity_path_device_row_title">Anda</string>
<string name="activity_path_guard_node_row_title">Simpul masuk</string>
<string name="activity_path_service_node_row_title">Simpul layanan</string>
<string name="activity_path_destination_row_title">Tujuan</string>
<string name="activity_path_learn_more_button_title">Pelajari lebih lanjut</string>
<string name="activity_create_private_chat_title">Session baru</string>
<string name="activity_create_private_chat_enter_session_id_tab_title">Masukkan Session ID</string>
<string name="activity_create_private_chat_scan_qr_code_tab_title">Pindai kode QR</string>
<string name="activity_create_private_chat_scan_qr_code_explanation">Pindai kode QR pengguna lain untuk memulai Session. Kode QR bisa ditemukan dengan mengetukan gambar kode QR di pengaturan akun</string>
<string name="fragment_enter_public_key_edit_text_hint">Masukkan Session ID penerima</string>
<string name="fragment_enter_public_key_explanation">Pengguna bisa membagikan Session ID miliknya dengan masuk ke pengaturan akun dan mengetuk "Bagikan Session ID" atau dengan membagikan kode QR mereka</string>
<string name="fragment_scan_qr_code_camera_access_explanation">Session membutuhkan akses kamera untuk memindai kode QR</string>
<string name="fragment_scan_qr_code_grant_camera_access_button_title">Berikan akses kamera</string>
<string name="activity_create_closed_group_title">Grup tertutup baru</string>
<string name="activity_create_closed_group_edit_text_hint">Masukkan nama grup</string>
<string name="activity_create_closed_group_explanation">Grup tertutup maksimal berisi 10 anggota dan memiliki perlindungan privasi yang sama dengan Session antara dua pengguna</string>
<string name="activity_create_closed_group_empty_state_message">anda belum memiliki kontak</string>
<string name="activity_create_closed_group_empty_state_button_title">Mulai sebuah Session</string>
<string name="activity_create_closed_group_group_name_missing_error">Masukkan nama grup</string>
<string name="activity_create_closed_group_group_name_too_long_error">Masukkan nama grup yang lebih pendek</string>
<string name="activity_create_closed_group_not_enough_group_members_error">Pilih setidaknya 2 anggota grup</string>
<string name="activity_create_closed_group_too_many_group_members_error">Grup tertutup maksimal berisi 10 anggota</string>
<string name="activity_create_closed_group_invalid_session_id_error">Salah satu anggota di grup memiliki Session ID yang salah</string>
<string name="activity_join_public_chat_title">Gabung ke grup terbuka</string>
<string name="activity_join_public_chat_error">Tak bisa bergabung dengan grup</string>
<string name="activity_join_public_chat_enter_group_url_tab_title">Buka URL grup</string>
<string name="activity_join_public_chat_scan_qr_code_tab_title">Pindai kode QR</string>
<string name="activity_join_public_chat_scan_qr_code_explanation">Pindai kode QR grup terbuka yang ingin anda masuki</string>
<string name="fragment_enter_chat_url_edit_text_hint">Masukkan sebuah URL grup terbuka</string>
<string name="activity_settings_title">Pengaturan</string>
<string name="activity_settings_display_name_edit_text_hint">Masukkan nama</string>
<string name="activity_settings_display_name_missing_error">Pilih sebuah nama</string>
<string name="activity_settings_invalid_display_name_error">Masukkan nama yang terdiri dari karakter 1-z, A-Z, 0-9, dan _</string>
<string name="activity_settings_display_name_too_long_error">Nama yang dibuat terlalu panjang</string>
<string name="activity_settings_privacy_button_title">Privasi</string>
<string name="activity_settings_notifications_button_title">Notifikasi</string>
<string name="activity_settings_chats_button_title">Percakapan</string>
<string name="activity_settings_devices_button_title">Perangkat</string>
<string name="activity_settings_recovery_phrase_button_title">Kata pemulihan</string>
<string name="activity_settings_clear_all_data_button_title">Hapus data</string>
<string name="activity_notification_settings_title">Notifikasi</string>
<string name="activity_notification_settings_style_section_title">Gaya notifikasi</string>
<string name="activity_notification_settings_content_section_title">Isi notifikasi</string>
<string name="activity_privacy_settings_title">Privasi</string>
<string name="activity_chat_settings_title">Percakapan</string>
<string name="activity_linked_devices_title">Perangkat</string>
<string name="activity_linked_devices_multi_device_limit_reached_dialog_explanation">Saat ini anda tak diperbolehkan menautkan lebih dari satu perangkat</string>
<string name="activity_linked_devices_unlinking_failed_message">Tak bisa memutus perangkat</string>
<string name="activity_linked_devices_unlinking_successful_message">Sukses memutus perangkat</string>
<string name="activity_linked_devices_linking_failed_message">Tidak bisa menautkan perangkat</string>
<string name="activity_linked_devices_empty_state_message">anda belum menautkan satupun perangkat</string>
<string name="activity_linked_devices_empty_state_button_title">tautkan perangkat (beta)</string>
<string name="preferences_notifications_strategy_category_title">Strategi notofikasi</string>
<string name="dialog_link_device_slave_mode_title_1">Menunggu otorisasi</string>
<string name="dialog_link_device_slave_mode_title_2">Menautkan perangkat diotorisasi</string>
<string name="dialog_link_device_slave_mode_explanation_1">Pastikan kata di bawah sama dengan kata yang muncul di perangkat lainnya</string>
<string name="dialog_link_device_slave_mode_explanation_2">Perangkat sukses ditautkan</string>
<string name="dialog_link_device_master_mode_title_1">Menunggu perangkat</string>
<string name="dialog_link_device_master_mode_title_2">Permintaan penautan diterima</string>
<string name="dialog_link_device_master_mode_title_3">Mengotorisasi tautan perangkat</string>
<string name="dialog_link_device_master_mode_explanation_1">Unduh Session di perangkat baru anda lalu ketuk "Tautkan ke akun yang sudah ada" di bagian bawah layar. Jika ada akun lain di perangkat baru tersebut, anda harus menghapusnya terlebih dahulu</string>
<string name="dialog_link_device_master_mode_explanation_2">Pastikan kata di bawah sama dengan kata yang muncul di perangkat lainnya</string>
<string name="dialog_link_device_master_mode_explanation_3">Mohon tunggu, tautan perangkat sedang dibuat. Proses ini mungkin berlangsung hingga beberapa menit</string>
<string name="dialog_link_device_master_mode_authorize_button_title">Otorisasi</string>
<string name="fragment_device_list_bottom_sheet_change_name_button_title">Ubah nama</string>
<string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Putuskan koneksi dengan perangkat</string>
<string name="dialog_edit_device_name_edit_text_hint">Masukkan nama</string>
<string name="dialog_seed_title">Kata pemulihan anda</string>
<string name="dialog_seed_explanation">Ini adalah kata pemulihan anda. Gunakan untuk mengembalikan atau memindahkan Session ID anda ke perangkat lain</string>
<string name="dialog_clear_all_data_title">Hapus semua data</string>
<string name="dialog_clear_all_data_explanation">Pesan, Session, dan kontak anda akan dihapus secara permanen</string>
<string name="activity_qr_code_title">Kode QR</string>
<string name="activity_qr_code_view_my_qr_code_tab_title">Lihat kode QR saya</string>
<string name="activity_qr_code_view_scan_qr_code_tab_title">Pindai kode QR</string>
<string name="activity_qr_code_view_scan_qr_code_explanation">Pindai kode QR pengguna lain untuk memulai percakapan</string>
<string name="fragment_view_my_qr_code_explanation">Ini adalah kode QR anda. Pengguna lain bisa memindainya untuk memulai percakapan dengan anda</string>
<string name="fragment_view_my_qr_code_share_title">Bagikan kode QR</string>
<string name="session_reset_banner_message">Apakah anda ingin mengembalikan session dengan %1$s</string>
<string name="session_reset_banner_dismiss_button_title">Batalkan</string>
<string name="session_reset_banner_restore_button_title">Kembalikan</string>
<string name="fragment_contact_selection_contacts_title">Kontak</string>
<string name="fragment_contact_selection_closed_groups_title">Grup tertutup</string>
<string name="fragment_contact_selection_open_groups_title">Grup terbuka</string>
</resources>

182
res/values-ja/strings.xml
Unescape Escape View File

@ -1258,5 +1258,185 @@
<string name="prompt_passphrase_activity__tap_to_unlock">タップしてロック解除</string>
<string name="RegistrationLockDialog_reminder">備忘:</string>
<string name="recipient_preferences__about">Sessionについて</string>
<!--EOF-->
<!-- Session -->
<string name="continue_2">続行する</string>
<string name="copy">コピーする</string>
<string name="invalid_url">URL が無効です</string>
<string name="copied_to_clipboard">クリップボードにコピーされました</string>
<string name="device_linking_failed">デバイスをリンクできませんでした。</string>
<string name="next">次</string>
<string name="share">共有する</string>
<string name="invalid_session_id">Session ID が無効です</string>
<string name="cancel">取り消す</string>
<string name="your_session_id">あなたの Session ID</string>
<string name="activity_landing_title_2">ここから Session が始まります...</string>
<string name="activity_landing_register_button_title">Session ID を作成する</string>
<string name="activity_landing_restore_button_title">Session を続ける</string>
<string name="activity_landing_link_button_title">既存のアカウントにリンクする</string>
<string name="activity_landing_device_unlinked_dialog_title">デバイスは正常にリンク解除されました</string>
<string name="view_fake_chat_bubble_1">Session とは？</string>
<string name="view_fake_chat_bubble_2">分散型の暗号化されたメッセージングアプリです</string>
<string name="view_fake_chat_bubble_3">個人情報や会話のメタデータは収集されませんか？どのように機能しますか？</string>
<string name="view_fake_chat_bubble_4">高度な匿名ルーティングとエンドツーエンドの暗号化テクノロジーを組み合わせて使用します。</string>
<string name="view_fake_chat_bubble_5">友人は、セキュリティ侵害されたメッセンジャーを自らの友人に使用させません。どういたしまして。</string>
<string name="activity_register_title">Session ID をご紹介します</string>
<string name="activity_register_explanation">Session ID は、Session で連絡を取るために使用できる一意のアドレスです。本当のアイデンティティに関係なく、あなたの Session ID は設計上完全に匿名でプライベートです。</string>
<string name="activity_register_public_key_copied_message">クリップボードにコピーされました</string>
<string name="activity_restore_title">アカウントを復元する</string>
<string name="activity_restore_explanation">アカウントを復元するためにサインアップしたときに与えられたリカバリーフレーズを入力します。</string>
<string name="activity_restore_seed_edit_text_hint">リカバリーフレーズを入力してください</string>
<string name="activity_link_device_title">デバイスをリンクする</string>
<string name="activity_link_device_enter_session_id_tab_title">Session ID を入力してください</string>
<string name="activity_link_device_scan_qr_code_tab_title">QR コードをスキャンする</string>
<string name="activity_link_device_scan_qr_code_explanation">他のデバイスで [設定]&gt; [デバイス]&gt; [デバイスのリンク] に移動し、表示される QR コードをスキャンして、リンクプロセスを開始します。</string>
<string name="fragment_enter_session_id_title">デバイスをリンクする</string>
<string name="fragment_enter_session_id_explanation">[設定]&gt; [デバイス]&gt; [他のデバイスのデバイスをリンク] に移動し、Session ID を入力して、リンクプロセスを開始します。</string>
<string name="fragment_enter_session_id_edit_text_hint">Session ID を入力してください</string>
<string name="activity_display_name_title_2">表示名を選択してください</string>
<string name="activity_display_name_explanation">これは、Session を使用するときの名前になります。あなたの本当の名前、エイリアス、またはあなたが好きな他のものに設定することができます。</string>
<string name="activity_display_name_edit_text_hint">表示名を入力してください</string>
<string name="activity_display_name_display_name_missing_error">表示名を選択してください</string>
<string name="activity_display_name_display_name_invalid_error">AZ、AZ、0-9、_ の文字のみで構成される表示名を選択してください</string>
<string name="activity_display_name_display_name_too_long_error">短い表示名を選択してください</string>
<string name="activity_pn_mode_recommended_option_tag">オススメ</string>
<string name="activity_pn_mode_no_option_picked_dialog_title">オプションを選択してください</string>
<string name="activity_home_empty_state_message">まだ連絡先がありません</string>
<string name="activity_home_empty_state_button_title">Session を開始する</string>
<string name="activity_home_leave_group_dialog_message">このグループを退会しますか？</string>
<string name="activity_home_leaving_group_failed_message">グループを脱退できませんでした</string>
<string name="activity_home_delete_conversation_dialog_message">この会話を削除してもよろしいですか？</string>
<string name="activity_home_conversation_deleted_message">会話を削除しました</string>
<string name="activity_seed_title">あなたのリカバリーフレーズ</string>
<string name="activity_seed_title_2">リカバリーフレーズに合致する</string>
<string name="activity_seed_explanation">リカバリーフレーズは、Session ID のマスターキーです。デバイスにアクセスできなくなった場合、これを使用して Session ID を復元できます。リカバリーフレーズを安全な場所に保管し、誰にも教えないでください。</string>
<string name="activity_seed_reveal_button_title">明らかにする</string>
<string name="view_seed_reminder_subtitle_1">リカバリーフレーズを保存してアカウントを保護する</string>
<string name="view_seed_reminder_subtitle_2">編集された単語をタップして長押ししてリカバリーフレーズを表示し、それを安全に保管して Session ID を保護します。</string>
<string name="view_seed_reminder_subtitle_3">リカバリーフレーズは安全な場所に保管してください</string>
<string name="activity_path_title">パス</string>
<string name="activity_path_explanation">Session は、Sessionの分散型ネットワークの複数のサービスノードを介してメッセージをバウンスすることにより、IP を隠します。これらは、接続が現在バウンスされている国です。</string>
<string name="activity_path_device_row_title">あなた</string>
<string name="activity_path_guard_node_row_title">エントリーノード</string>
<string name="activity_path_service_node_row_title">サービスノード</string>
<string name="activity_path_destination_row_title">目的先</string>
<string name="activity_path_learn_more_button_title">詳細</string>
<string name="activity_create_private_chat_title">新しい Session</string>
<string name="activity_create_private_chat_enter_session_id_tab_title">Session ID を入力してください</string>
<string name="activity_create_private_chat_scan_qr_code_tab_title">QR コードをスキャンする</string>
<string name="activity_create_private_chat_scan_qr_code_explanation">ユーザーの QR コードをスキャンして、Session を開始します。QR コードは、アカウント設定の QR コードアイコンをタップすると見つかります。</string>
<string name="fragment_enter_public_key_edit_text_hint">受信者の Session ID を入力してください</string>
<string name="fragment_enter_public_key_explanation">ユーザーは、アカウント設定に移動して [Session ID を共有] をタップするか、QR コードを共有することで、Session ID を共有できます。</string>
<string name="fragment_scan_qr_code_camera_access_explanation">Session で QR コードをスキャンするにはカメラへのアクセスが必要です</string>
<string name="fragment_scan_qr_code_grant_camera_access_button_title">カメラへのアクセスを許可する</string>
<string name="activity_create_closed_group_title">新しいクローズドグループ</string>
<string name="activity_create_closed_group_edit_text_hint">グループ名を入力してください</string>
<string name="activity_create_closed_group_explanation">クローズドグループは最大 10 人のメンバーをサポートし、1 対 1 の Session と同じプライバシー保護を提供します。</string>
<string name="activity_create_closed_group_empty_state_message">まだ連絡先がありません</string>
<string name="activity_create_closed_group_empty_state_button_title">Session を開始する</string>
<string name="activity_create_closed_group_group_name_missing_error">グループ名を入力してください</string>
<string name="activity_create_closed_group_group_name_too_long_error">短いグループ名を入力してください</string>
<string name="activity_create_closed_group_not_enough_group_members_error">グループメンバーを少なくとも 2 人選択してください</string>
<string name="activity_create_closed_group_too_many_group_members_error">閉じたグループは 10 人を超えるメンバーを抱えることはできません</string>
<string name="activity_create_closed_group_invalid_session_id_error">グループのメンバーの 1 人の Session ID が無効です</string>
<string name="activity_join_public_chat_title">オープングループに参加する</string>
<string name="activity_join_public_chat_error">グループに参加できませんでした</string>
<string name="activity_join_public_chat_enter_group_url_tab_title">グループの URL を開く</string>
<string name="activity_join_public_chat_scan_qr_code_tab_title">QR コードをスキャンする</string>
<string name="activity_join_public_chat_scan_qr_code_explanation">参加したいオープングループの QR コードをスキャンする</string>
<string name="fragment_enter_chat_url_edit_text_hint">オープングループの URL を入力する</string>
<string name="activity_settings_title">設定</string>
<string name="activity_settings_display_name_edit_text_hint">表示名を入力してください</string>
<string name="activity_settings_display_name_missing_error">表示名を選択してください</string>
<string name="activity_settings_invalid_display_name_error">AZ、AZ、0-9、_ の文字のみで構成される表示名を選択してください</string>
<string name="activity_settings_display_name_too_long_error">短い表示名を選択してください</string>
<string name="activity_settings_privacy_button_title">プライバシー</string>
<string name="activity_settings_notifications_button_title">お知らせ</string>
<string name="activity_settings_chats_button_title">チャット</string>
<string name="activity_settings_devices_button_title">デバイス</string>
<string name="activity_settings_recovery_phrase_button_title">リカバリーフレーズ</string>
<string name="activity_settings_clear_all_data_button_title">データを消去する</string>
<string name="activity_notification_settings_title">お知らせ</string>
<string name="activity_notification_settings_style_section_title">通知スタイル</string>
<string name="activity_notification_settings_content_section_title">通知内容</string>
<string name="activity_privacy_settings_title">プライバシー</string>
<string name="activity_chat_settings_title">チャット</string>
<string name="activity_linked_devices_title">デバイス</string>
<string name="activity_linked_devices_multi_device_limit_reached_dialog_title">デバイス制限に達しました</string>
<string name="activity_linked_devices_multi_device_limit_reached_dialog_explanation">現在、複数のデバイスをリンクすることはできません。</string>
<string name="activity_linked_devices_unlinking_failed_message">デバイスのリンクを解除できませんでした。</string>
<string name="activity_linked_devices_unlinking_successful_message">デバイスは正常にリンク解除されました</string>
<string name="activity_linked_devices_linking_failed_message">デバイスをリンクできませんでした。</string>
<string name="activity_linked_devices_empty_state_message">まだデバイスをリンクしていません</string>
<string name="activity_linked_devices_empty_state_button_title">デバイスをリンクする（ベータ）</string>
<string name="preferences_notifications_strategy_category_title">通知戦略</string>
<string name="dialog_link_device_slave_mode_title_1">承認待ち</string>
<string name="dialog_link_device_slave_mode_title_2">承認されたデバイスリンク</string>
<string name="dialog_link_device_slave_mode_explanation_1">以下の単語が、他のデバイスに表示されている単語と一致することを確認してください。</string>
<string name="dialog_link_device_slave_mode_explanation_2">デバイスが正常にリンクされました</string>
<string name="dialog_link_device_master_mode_title_1">デバイス待ち</string>
<string name="dialog_link_device_master_mode_title_2">リンクリクエストを受け取りました</string>
<string name="dialog_link_device_master_mode_title_3">デバイスリンクの認証</string>
<string name="dialog_link_device_master_mode_explanation_1">他のデバイスでセッションをダウンロードし、ランディング画面の下部にある [既存のアカウントにリンク] をタップします。他のデバイスに既存のアカウントがある場合は、最初にそのアカウントを削除する必要があります。</string>
<string name="dialog_link_device_master_mode_explanation_2">以下の単語が、他のデバイスに表示されている単語と一致することを確認してください。</string>
<string name="dialog_link_device_master_mode_explanation_3">デバイスリンクが作成されるまでお待ちください。これには 1 分ほどかかる場合があります。</string>
<string name="dialog_link_device_master_mode_authorize_button_title">承認する</string>
<string name="fragment_device_list_bottom_sheet_change_name_button_title">名前を変更する</string>
<string name="fragment_device_list_bottom_sheet_unlink_device_button_title">デバイスのリンクを解除する</string>
<string name="dialog_edit_device_name_edit_text_hint">名前を入力する</string>
<string name="dialog_seed_title">あなたのリカバリーフレーズ</string>
<string name="dialog_seed_explanation">これはあなたのリカバリーフレーズです。これにより、Session ID を新しいデバイスに復元または移行できます。</string>
<string name="dialog_clear_all_data_title">すべてのデータを消去する</string>
<string name="dialog_clear_all_data_explanation">これにより、メッセージ、Session、連絡先が完全に削除されます。</string>
<string name="activity_qr_code_title">QR コード</string>
<string name="activity_qr_code_view_my_qr_code_tab_title">私の QR コードを表示する</string>
<string name="activity_qr_code_view_scan_qr_code_tab_title">QR コードをスキャンする</string>
<string name="activity_qr_code_view_scan_qr_code_explanation">誰かの QR コードをスキャンして、会話を始めましょう</string>
<string name="fragment_view_my_qr_code_explanation">これはあなたの QR コードです。他のユーザーはそれをスキャンして、あなたとの Session を開始できます。</string>
<string name="fragment_view_my_qr_code_share_title">QR コードを共有する</string>
<string name="session_reset_banner_message">...%sとの Session を復元しますか？</string>
<string name="session_reset_banner_dismiss_button_title">はねつける</string>
<string name="session_reset_banner_restore_button_title">戻す</string>
<string name="fragment_contact_selection_contacts_title">連絡先</string>
<string name="fragment_contact_selection_closed_groups_title">閉じたグループ</string>
<string name="fragment_contact_selection_open_groups_title">オープングループ</string>
</resources>

32
res/values-pl/strings.xml
Unescape Escape View File

@ -1357,7 +1357,6 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
<!-- Session -->
<!--
<string name="continue_2">Kontyntynuj</string>
<string name="copy">Kopiuj</string>
<string name="invalid_url">nieprawidłowy URL</string>
@ -1405,12 +1404,6 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
<string name="activity_display_name_display_name_invalid_error">Wybierz wyświetlaną nazwę, która składa się tylko z znaków az, AZ, 0–9 i _</string>
<string name="activity_display_name_display_name_too_long_error">Wybierz krótszą nazwę wyświetlaną</string>
<string name="activity_pn_mode_title">Powiadomienia push</string>
<string name="activity_pn_mode_explanation">Istnieją dwa sposoby obsługi powiadomień wypychanych przez sesję. Przeczytaj uważnie opisy, zanim wybierzesz.</string>
<string name="activity_pn_mode_fcm_option_title">Firebase Cloud Messaging</string>
<string name="activity_pn_mode_fcm_option_explanation">Sesja będzie korzystała z usługi Firebase Cloud Messaging do otrzymywania powiadomień push. Będziesz powiadamiany o nowych wiadomościach niezawodnie i natychmiast. Korzystanie z FCM oznacza, że Twój adres IP i token urządzenia zostaną udostępnione Google. Jeśli używasz powiadomień push dla innych aplikacji, tak już będzie. Twój adres IP i token urządzenia będą również narażone na działanie Lokiego, ale wiadomości będą nadal kierowane do cebuli i szyfrowane od końca do końca, więc zawartość wiadomości pozostanie całkowicie prywatna.</string>
<string name="activity_pn_mode_background_polling_option_title">Sondowanie w tle</string>
<string name="activity_pn_mode_background_polling_option_explanation">Sesja od czasu do czasu sprawdza nowe wiadomości w tle. Gwarantuje to pełną ochronę metadanych, ale powiadomienia mogą być znacznie opóźnione.</string>
<string name="activity_pn_mode_recommended_option_tag">Zalecana</string>
<string name="activity_pn_mode_no_option_picked_dialog_title">Wybierz opcję</string>
@ -1421,17 +1414,6 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
<string name="activity_home_delete_conversation_dialog_message">Czy na pewno chcesz usunąć tę rozmowę?</string>
<string name="activity_home_conversation_deleted_message">Rozmowa usunięta</string>
<string name="sheet_pn_mode_title">Powiadomienia push</string>
<string name="sheet_pn_mode_explanation">Sesja oferuje teraz dwa sposoby obsługi powiadomień wypychanych. Przeczytaj uważnie opisy, zanim wybierzesz.</string>
<string name="sheet_pn_mode_fcm_option_title">Firebase Cloud Messaging</string>
<string name="sheet_pn_mode_fcm_option_explanation">Sesja będzie korzystała z usługi Firebase Cloud Messaging do otrzymywania powiadomień push. Będziesz powiadamiany o nowych wiadomościach niezawodnie i natychmiast. Korzystanie z FCM oznacza, że Twój adres IP i token urządzenia zostaną udostępnione Google. Jeśli używasz powiadomień push dla innych aplikacji, tak już będzie. Twój adres IP i token urządzenia będą również narażone na działanie Lokiego, ale wiadomości będą nadal kierowane do cebuli i szyfrowane od końca do końca, więc zawartość wiadomości pozostanie całkowicie prywatna.</string>
<string name="sheet_pn_mode_background_polling_option_title">Sondowanie w tle</string>
<string name="sheet_pn_mode_background_polling_option_explanation">Sesja od czasu do czasu sprawdza nowe wiadomości w tle. Gwarantuje to pełną ochronę metadanych, ale powiadomienia mogą być znacznie opóźnione.</string>
<string name="sheet_pn_mode_recommended_option_tag">Zalecana</string>
<string name="sheet_pn_mode_no_option_picked_dialog_title">Wybierz opcję</string>
<string name="sheet_pn_mode_confirm_button_title">Potwierdzać</string>
<string name="sheet_pn_mode_skip_button_title">Pominąć</string>
<string name="activity_seed_title">Twoja fraza odzyskiwania</string>
<string name="activity_seed_title_2">Poznaj swoją frazę odzyskiwania</string>
<string name="activity_seed_explanation">Twoja fraza odzyskiwania jest kluczem głównym do identyfikatora Session - możesz go użyć do przywrócenia identyfikatora Session, jeśli stracisz dostęp do urządzenia. Przechowuj swoją frazę odzyskiwania w bezpiecznym miejscu i nikomu jej nie udostępniaj.</string>
@ -1477,7 +1459,6 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
<string name="activity_join_public_chat_scan_qr_code_explanation">Zeskanuj kod QR otwartej grupy, do której chcesz dołączyć</string>
<string name="fragment_enter_chat_url_edit_text_hint">Wprowadź adres URL otwartej grupy</string>
<string name="fragment_enter_chat_url_privacy_warning">Do otwartych grup może dołączyć każdy i nie zapewniają pełnej ochrony prywatności</string>
<string name="activity_settings_title">Ustawienia</string>
<string name="activity_settings_display_name_edit_text_hint">Wprowadź wyświetlaną nazwe</string>
@ -1509,8 +1490,6 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
<string name="activity_linked_devices_empty_state_button_title">Połącz urządzenie (Beta)</string>
<string name="preferences_notifications_strategy_category_title">Strategia powiadomień</string>
<string name="preferences_notifications_use_fcm_option_title">Użyj FCM</string>
<string name="preferences_notifications_use_fcm_option_explanation">Korzystanie z Firebase Cloud Messaging pozwala na bardziej niezawodne powiadomienia wypychane, ale udostępnia adres IP i token urządzenia Google i Lokiemu.</string>
<string name="dialog_link_device_slave_mode_title_1">Oczekiwanie na autoryzację</string>
<string name="dialog_link_device_slave_mode_title_2">Link do urządzenia autoryzowany</string>
@ -1544,16 +1523,6 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
<string name="fragment_view_my_qr_code_explanation">To jest twój kod QR. Inni użytkownicy mogą go zeskanować, aby rozpocząć z tobą sesję.</string>
<string name="fragment_view_my_qr_code_share_title">Udostępnij kod QR</string>
<string name="view_friend_request_accept_button_title">Zaakceptować</string>
<string name="view_friend_request_reject_button_title">Upadek</string>
<string name="view_friend_request_incoming_pending_message">%1$s wysłał Ci prośbę o sesję</string>
<string name="view_friend_request_incoming_accepted_message">Zaakceptowałeś prośbę o sesję %1$s</string>
<string name="view_friend_request_incoming_declined_message">Odrzuciłeś żądanie Session %1$s</string>
<string name="view_friend_request_incoming_expired_message">Żądanie Session %1$s wygasło</string>
<string name="view_friend_request_outgoing_pending_message">Wysłano %1$s żądanie Session</string>
<string name="view_friend_request_outgoing_accepted_message">%1$s zaakceptował Twoje żądanie Session</string>
<string name="view_friend_request_outgoing_expired_message">Twoje żądanie Session do %1$s wygasło</string>
<string name="session_reset_banner_message">Czy chcesz przywrócić sesję za pomocą %s?</string>
<string name="session_reset_banner_dismiss_button_title">Oddalić</string>
<string name="session_reset_banner_restore_button_title">Przywracać</string>
@ -1561,6 +1530,5 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
<string name="fragment_contact_selection_contacts_title">Łączność</string>
<string name="fragment_contact_selection_closed_groups_title">Grupy zamknięte</string>
<string name="fragment_contact_selection_open_groups_title">Otwórz grupy</string>
-->
</resources>

182
res/values-vi/strings.xml
Unescape Escape View File

@ -746,5 +746,185 @@ Các tin nhắn và cuộc gọi riêng tư miễn phí đến người dùng Si
<string name="AppProtectionPreferenceFragment_none">Không</string>
<string name="RegistrationActivity_too_many_attempts">Thử quá nhiều lần</string>
<string name="RegistrationLockDialog_disable">Tắt</string>
<!--EOF-->
<!-- Session -->
<string name="continue_2">Tiếp tục</string>
<string name="copy">Sao chép</string>
<string name="invalid_url">URL không hợp lệ</string>
<string name="copied_to_clipboard">Sao chép vào bộ nhớ tạm</string>
<string name="device_linking_failed">Không thể liên kết thiết bị.</string>
<string name="next">Tiếp</string>
<string name="share">Chia sẻ</string>
<string name="invalid_session_id">Session ID không hợp lệ</string>
<string name="cancel">Huỷ</string>
<string name="your_session_id">Session ID của bạn</string>
<string name="activity_landing_title_2">Session của bạn bắt đầu từ đây...</string>
<string name="activity_landing_register_button_title">Tạo Session ID</string>
<string name="activity_landing_restore_button_title">Tiếp tục Session của bạn</string>
<string name="activity_landing_link_button_title">Liên kết với một tài khoản đã tồn tại</string>
<string name="activity_landing_device_unlinked_dialog_title">Thiết bị của bạn đã được ngắt liên kết thành công</string>
<string name="view_fake_chat_bubble_1">Session là gì?</string>
<string name="view_fake_chat_bubble_2">Đây là một ứng dụng nhắn tin phân cấp và mã hoá</string>
<string name="view_fake_chat_bubble_3">Vậy ứng dụng có thu thập dữ liệu cá nhân của tôi hoặc siêu dữ liệu về cuộc hội thoại của tôi không? Ứng dụng hoạt động như thế nào?</string>
<string name="view_fake_chat_bubble_4">Sử dụng kết hợp công nghệ định tuyến ẩn danh nâng cao và công nghệ mã hoá đầu cuối.</string>
<string name="view_fake_chat_bubble_5">Đừng để bạn bè sử dụng những ứng dụng nhắn tin dễ bị tấn công.</string>
<string name="activity_register_title">Bắt đầu với Session ID của bạn</string>
<string name="activity_register_explanation">Session ID của bạn là địa chỉ duy nhất mà mọi người có thể dùng để liên lạc với bạn trên ứng dụng Session. Session ID của bạn được thiết kế đảm bảo tuyệt đối ẩn danh và riêng tư vì nó không liên kết với danh tính thật của bạn.</string>
<string name="activity_register_public_key_copied_message">Sao chép vào bộ nhớ tạm</string>
<string name="activity_restore_title">Khôi phục lại tài khoản của bạn</string>
<string name="activity_restore_explanation">Nhập cụm từ khôi phục mà bạn nhận được khi đăng ký khôi phục tài khoản.</string>
<string name="activity_restore_seed_edit_text_hint">Nhập cụm từ khôi phục của bạn.</string>
<string name="activity_link_device_title">Liên kết Thiết bị</string>
<string name="activity_link_device_enter_session_id_tab_title">Nhập Session ID</string>
<string name="activity_link_device_scan_qr_code_tab_title">Quét mã QR</string>
<string name="activity_link_device_scan_qr_code_explanation">Đi đến mục "Cài đặt" > "Thiết bị" > "Liên kết với một Thiết bị" trên thiết bị khác của bạn và quét mã QR hiện lên để bắt đầu quá trình liên kết.</string>
<string name="fragment_enter_session_id_title">Liên kết thiết bị của bạn</string>
<string name="fragment_enter_session_id_explanation"> Đi đến mục "Cài đặt" > "Thiết bị" > "Liên kết với một Thiết bị" trên thiết bị khác của bạn và quét mã QR hiện lên để bắt đầu quá trình liên kết.</string>
<string name="fragment_enter_session_id_edit_text_hint">Nhập Session ID của bạn</string>
<string name="activity_display_name_title_2">Chọn tên hiển thị của bạn</string>
<string name="activity_display_name_explanation">Đây là tên của bạn khi sử dụng Session. Nó có thể là tên thật, tên gọi khác của bạn hoặc bất kì tên nào bạn thích.</string>
<string name="activity_display_name_edit_text_hint">Nhập một tên hiển thị</string>
<string name="activity_display_name_display_name_missing_error">Vui lòng chọn một tên hiển thị</string>
<string name="activity_display_name_display_name_invalid_error">Vui lòng chọn tên hiện thị chỉ chứa các kí tự a-z, A-Z, 0-9 and _ </string>
<string name="activity_display_name_display_name_too_long_error">Vui lòng chọn tên hiển thị ngắn hơn</string>
<string name="activity_pn_mode_recommended_option_tag">Khuyến nghị</string>
<string name="activity_pn_mode_no_option_picked_dialog_title">Vui lòng lựa chọn </string>
<string name="activity_home_empty_state_message">Bạn chưa có danh bạ </string>
<string name="activity_home_empty_state_button_title">Bắt đầu một Session</string>
<string name="activity_home_leave_group_dialog_message">Bạn có chắc chắn rằng bạn muốn rời nhóm này không?</string>
<string name="activity_home_leaving_group_failed_message">"Không thể rời nhóm"</string>
<string name="activity_home_delete_conversation_dialog_message">Bạn có chắc chắn rằng bạn muốn xoá cuộc hội thoại này không?</string>
<string name="activity_home_conversation_deleted_message">Cuộc hội thoại đã được xoá </string>
<string name="activity_seed_title">Cụm từ khôi phục của bạn</string>
<string name="activity_seed_title_2">Làm quen với cụm từ khôi phục của bạn</string>
<string name="activity_seed_explanation">Cụm từ khôi phục của bạn là chìa khoá chủ cho Session ID của bạn — bạn có thể sử dụng nó để khôi phục Session ID khi bị mất tiếp cận với thiết bị của bạn. Hãy lưu cụm từ khôi phục của bạn ở một nơi an toàn và không cung cấp cho bất kì ai.</string>
<string name="activity_seed_reveal_button_title">Giữ để hiển thị.</string>
<string name="view_seed_reminder_subtitle_1">Bảo vệ tài khoản của bạn bằng việc bảo vệ cụm từ khôi phục của bạn</string>
<string name="view_seed_reminder_subtitle_2">Chạm và giữ cụm từ bị che để hiển thị cụm từ khôi phục của bạn, sau đó lưu nó cẩn thận để bảo vệ Session ID của bạn.</string>
<string name="view_seed_reminder_subtitle_3">Hãy lưu cụm từ khôi phục của bạn ở một nơi an toàn</string>
<string name="activity_path_title">Đường đi</string>
<string name="activity_path_explanation">Session ẩn IP của bạn bằng cách luân chuyển tin nhắn của bạn qua một số Nút Dịch vụ trong mạng lưới phân cấp của Session. Đây là các nước mà kết nối của bạn đang được luân chuyển: </string>
<string name="activity_path_device_row_title">Bạn</string>
<string name="activity_path_guard_node_row_title">Nút khởi đầu</string>
<string name="activity_path_service_node_row_title">Nút Dịch vụ</string>
<string name="activity_path_destination_row_title">Điểm đến</string>
<string name="activity_path_learn_more_button_title">Tìm hiểu thêm</string>
<string name="activity_create_private_chat_title">Session mới</string>
<string name="activity_create_private_chat_enter_session_id_tab_title">Nhập Session ID</string>
<string name="activity_create_private_chat_scan_qr_code_tab_title">Quét mã QR</string>
<string name="activity_create_private_chat_scan_qr_code_explanation">Quét mã QR của người dùng để bắt đầu session. Tìm mã QR bằng cách chạm vào biểu tượng mã QR trong mục cài đặt tài khoản.</string>
<string name="fragment_enter_public_key_edit_text_hint">Nhập Session ID của người nhận</string>
<string name="fragment_enter_public_key_explanation">Người dùng có thể chia sẻ Session ID của mình bằng cách tới mục cài đặt tài khoản và chạm vào “Chia sẻ Session ID”, hoặc bằng cách chia sẻ mã QR của họ.</string>
<string name="fragment_scan_qr_code_camera_access_explanation">Session cần truy cập máy ảnh để quét mã QR </string>
<string name="fragment_scan_qr_code_grant_camera_access_button_title">Cho phép truy cập máy ảnh</string>
<string name="activity_create_closed_group_title">Nhóm kín mới </string>
<string name="activity_create_closed_group_edit_text_hint">Nhập tên nhóm</string>
<string name="activity_create_closed_group_explanation">Nhóm kín hỗ trợ tối đa 10 thành viên và cung cấp dịch vụ bảo mật giống như các session một-một</string>
<string name="activity_create_closed_group_empty_state_message">Bạn chưa có danh bạ nào </string>
<string name="activity_create_closed_group_empty_state_button_title">Bắt đầu Session</string>
<string name="activity_create_closed_group_group_name_missing_error">Vui lòng nhập tên nhóm</string>
<string name="activity_create_closed_group_group_name_too_long_error">Vui lòng nhập một tên nhóm ngắn hơn </string>
<string name="activity_create_closed_group_not_enough_group_members_error">Vui lòng chọn ít nhất 2 thành viên trong nhóm </string>
<string name="activity_create_closed_group_too_many_group_members_error">Một nhóm kín không thể có nhiều hơn 10 thành viên </string>
<string name="activity_create_closed_group_invalid_session_id_error">Một trong các thành viên trong nhóm của bạn có Session ID không hợp lệ </string>
<string name="activity_join_public_chat_title">Tham gia nhóm mở</string>
<string name="activity_join_public_chat_error">Không thể tham gia nhóm</string>
<string name="activity_join_public_chat_enter_group_url_tab_title">URL của nhóm mở</string>
<string name="activity_join_public_chat_scan_qr_code_tab_title">Quét mã QR</string>
<string name="activity_join_public_chat_scan_qr_code_explanation"> Quét mã QR của nhóm mở mà bạn muốn tham gia</string>
<string name="fragment_enter_chat_url_edit_text_hint">Nhập URL của nhóm mở</string>
<string name="activity_settings_title">Cài đặt</string>
<string name="activity_settings_display_name_edit_text_hint">Nhập tên hiển thị</string>
<string name="activity_settings_display_name_missing_error">Vui lòng chọn một tên hiển thị </string>
<string name="activity_settings_invalid_display_name_error">Vui lòng chọn một tên hiển thị chỉ bao gồm các ký tự a-z, A-Z, 0-9 và _ </string>
<string name="activity_settings_display_name_too_long_error">Vui lòng chọn một tên hiển thị ngắn hơn </string>
<string name="activity_settings_privacy_button_title">Riêng tư</string>
<string name="activity_settings_notifications_button_title">Thông báo</string>
<string name="activity_settings_chats_button_title">Trò chuyện</string>
<string name="activity_settings_devices_button_title">Thiết bị</string>
<string name="activity_settings_recovery_phrase_button_title">Cụm từ khôi phục</string>
<string name="activity_settings_clear_all_data_button_title">Xóa dữ liệu</string>
<string name="activity_notification_settings_title">Thông báo</string>
<string name="activity_notification_settings_style_section_title">Kiểu thông báo</string>
<string name="activity_notification_settings_content_section_title">Nội dung thông báo</string>
<string name="activity_privacy_settings_title">Riêng tưy</string>
<string name="activity_chat_settings_title">Trò chuyện</string>
<string name="activity_linked_devices_title">Thiết bị</string>
<string name="activity_linked_devices_multi_device_limit_reached_dialog_title">Đã đạt tới giới hạn thiết bị</string>
<string name="activity_linked_devices_multi_device_limit_reached_dialog_explanation">Hiện tại không cho phép kết nối với nhiều hơn một thiết bị.</string>
<string name="activity_linked_devices_unlinking_failed_message">Không thể hủy liên kết thiết bị.</string>
<string name="activity_linked_devices_unlinking_successful_message">Thiết bị của bạn đã được hủy liên kết thành công</string>
<string name="activity_linked_devices_linking_failed_message">Không thể liên kết thiết bị.</string>
<string name="activity_linked_devices_empty_state_message">Bạn chưa liên kết thiết bị nào</string>
<string name="activity_linked_devices_empty_state_button_title">Kết nối một thiết bị (Beta)</string>
<string name="preferences_notifications_strategy_category_title">Chiến lược thông báo</string>
<string name="dialog_link_device_slave_mode_title_1">Đang chờ được cho phép</string>
<string name="dialog_link_device_slave_mode_title_2">Liên kết thiết bị được cho phép </string>
<string name="dialog_link_device_slave_mode_explanation_1">Hãy kiểm tra xem các từ bên dưới có khớp với các từ được hiển thị trên thiết bị khác của bạn không.</string>
<string name="dialog_link_device_slave_mode_explanation_2">Thiết bị của bạn đã được liên kết thành công </string>
<string name="dialog_link_device_master_mode_title_1">Đang đợi thiết bị </string>
<string name="dialog_link_device_master_mode_title_2">Đã nhận được yêu cầu liên kết</string>
<string name="dialog_link_device_master_mode_title_3">Đang cho phép liên kết thiết bị</string>
<string name="dialog_link_device_master_mode_explanation_1">Tải Session về thiết bị khác của bạn và chọn "Liên kết với một tài khoản đã tồn tại" ở phía cuối của màn hình đích. Nếu tại khoản hiện tại của bạn đang ở một thiết bị khác, bạn cần phải xóa tài khoản đó trước.</string>
<string name="dialog_link_device_master_mode_explanation_2"> Hãy kiểm tra xem các từ bên dưới có khớp với các từ được hiển thị trên thiết bị khác của bạn không.</string>
<string name="dialog_link_device_master_mode_explanation_3">Liên kết thiết bị đang được tạo, vui lòng chờ đợi. Quá trình này có thể mất khoảng một phút.</string>
<string name="dialog_link_device_master_mode_authorize_button_title">Cho phép</string>
<string name="fragment_device_list_bottom_sheet_change_name_button_title">Đổi tên</string>
<string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Hủy liên kết thiết bị</string>
<string name="dialog_edit_device_name_edit_text_hint">Nhập tên</string>
<string name="dialog_seed_title">Cụm từ khôi phục của bạn</string>
<string name="dialog_seed_explanation">Đây là cụm từ khôi phục của bạn. Bạn có thể dùng nó để khôi phục hoặc chuyển Session ID của mình sang một thiết bị mới.</string>
<string name="dialog_clear_all_data_title">Xóa tất cả dữ liệu</string>
<string name="dialog_clear_all_data_explanation">Thao tác này sẽ xóa vĩnh viễn các tin nhắn, sessions, và danh bạ của bạn.</string>
<string name="activity_qr_code_title">Mã QR</string>
<string name="activity_qr_code_view_my_qr_code_tab_title">Xem mã QR của tôi</string>
<string name="activity_qr_code_view_scan_qr_code_tab_title">Quét mã QR</string>
<string name="activity_qr_code_view_scan_qr_code_explanation">Quét mã QR của ai đó để bắt đầu trò chuyện với họ</string>
<string name="fragment_view_my_qr_code_explanation">Đây là mã QR của bạn. Những người dùng khác có thể quét mã này và bắt đầu session với bạn.</string>
<string name="fragment_view_my_qr_code_share_title">Chia sẻ mã QR </string>
<string name="session_reset_banner_message">Bạn có muốn khôi phục lại session của bạn với %s không?</string>
<string name="session_reset_banner_dismiss_button_title">Bỏ qua</string>
<string name="session_reset_banner_restore_button_title">Khôi phục</string>
<string name="fragment_contact_selection_contacts_title">Danh bạ</string>
<string name="fragment_contact_selection_closed_groups_title">Nhóm kín</string>
<string name="fragment_contact_selection_open_groups_title">Nhóm mở</string>
</resources>

4
res/values/strings.xml
Unescape Escape View File

@ -1830,11 +1830,11 @@
<string name="fragment_contact_selection_closed_groups_title">Closed Groups</string>
<string name="fragment_contact_selection_open_groups_title">Open Groups</string>
<!-- Next round of translation -->
<string name="menu_apply_button">Apply</string>
<string name="menu_done_button">Done</string>
<!-- Next round of translation -->
<string name="activity_edit_closed_group_title">Edit Group</string>
<string name="activity_edit_closed_group_edit_text_hint">Enter a new group name</string>
<string name="activity_edit_closed_group_edit_members">Members</string>

14
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
Unescape Escape View File

@ -30,6 +30,8 @@ import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.hardware.Camera;
import android.net.Uri;
import android.os.AsyncTask;
@ -61,6 +63,7 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar;
@ -158,6 +161,7 @@ import org.thoughtcrime.securesms.loki.database.LokiThreadDatabaseDelegate;
import org.thoughtcrime.securesms.loki.database.LokiUserDatabase;
import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol;
import org.thoughtcrime.securesms.loki.protocol.SessionManagementProtocol;
import org.thoughtcrime.securesms.loki.utilities.GeneralUtilitiesKt;
import org.thoughtcrime.securesms.loki.utilities.MentionManagerUtilities;
import org.thoughtcrime.securesms.loki.views.MentionCandidateSelectionView;
import org.thoughtcrime.securesms.loki.views.ProfilePictureView;
@ -235,7 +239,6 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
@ -737,10 +740,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
if (recipient.getExpireMessages() > 0) {
inflater.inflate(R.menu.conversation_expiring_on, menu);
final MenuItem item = menu.findItem(R.id.menu_expiring_messages);
final View actionView = MenuItemCompat.getActionView(item);
final TextView badgeView = actionView.findViewById(R.id.expiration_badge);
final MenuItem item = menu.findItem(R.id.menu_expiring_messages);
final View actionView = MenuItemCompat.getActionView(item);
final ImageView iconView = actionView.findViewById(R.id.menu_badge_icon);
final TextView badgeView = actionView.findViewById(R.id.expiration_badge);
@ColorInt int color = GeneralUtilitiesKt.getColorWithID(getResources(), R.color.text, getTheme());
iconView.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY));
badgeView.setText(ExpirationUtil.getExpirationAbbreviatedDisplayValue(this, recipient.getExpireMessages()));
actionView.setOnClickListener(v -> onOptionsItemSelected(item));
} else {

12
src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
Unescape Escape View File

@ -5,14 +5,16 @@ import android.content.Intent;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.BindableConversationItem;
import org.thoughtcrime.securesms.VerifyIdentityActivity;
import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
@ -20,6 +22,7 @@ import org.thoughtcrime.securesms.database.IdentityDatabase;
import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.loki.utilities.GeneralUtilitiesKt;
import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
@ -135,12 +138,13 @@ public class ConversationUpdateItem extends LinearLayout
}
private void setTimerRecord(final MessageRecord messageRecord) {
@ColorInt int color = GeneralUtilitiesKt.getColorWithID(getResources(), R.color.text, getContext().getTheme());
if (messageRecord.getExpiresIn() > 0) {
icon.setImageResource(R.drawable.ic_timer);
icon.setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY));
icon.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY));
} else {
icon.setImageResource(R.drawable.ic_timer_disabled);
icon.setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY));
icon.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY));
}
title.setText(ExpirationUtil.getExpirationDisplayValue(getContext(), (int)(messageRecord.getExpiresIn() / 1000)));

14
src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
Unescape Escape View File

@ -52,6 +52,7 @@ import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionM
import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.MultiDeviceProtocol
import org.whispersystems.signalservice.loki.protocol.shelved.syncmessages.SyncMessagesProtocol
import org.whispersystems.signalservice.loki.utilities.toHexString
import java.io.IOException
class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListener, SeedReminderViewDelegate, NewConversationButtonSetViewDelegate {
private lateinit var glide: GlideRequests
@ -361,10 +362,17 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
val isClosedGroup = recipient.address.isClosedGroup
// Send a leave group message if this is an active closed group
if (isClosedGroup && DatabaseFactory.getGroupDatabase(this).isActive(recipient.address.toGroupString())) {
val groupPublicKey = ClosedGroupsProtocol.doubleDecodeGroupID(recipient.address.toString()).toHexString()
val isSSKBasedClosedGroup = DatabaseFactory.getSSKDatabase(this).isSSKBasedClosedGroup(groupPublicKey)
var isSSKBasedClosedGroup: Boolean
var groupPublicKey: String?
try {
groupPublicKey = ClosedGroupsProtocol.doubleDecodeGroupID(recipient.address.toString()).toHexString()
isSSKBasedClosedGroup = DatabaseFactory.getSSKDatabase(this).isSSKBasedClosedGroup(groupPublicKey)
} catch (e: IOException) {
groupPublicKey = null
isSSKBasedClosedGroup = false
}
if (isSSKBasedClosedGroup) {
ClosedGroupsProtocol.leave(this, groupPublicKey)
ClosedGroupsProtocol.leave(this, groupPublicKey!!)
} else if (!ClosedGroupsProtocol.leaveLegacyGroup(this, recipient)) {
Toast.makeText(this, R.string.activity_home_leaving_group_failed_message, Toast.LENGTH_LONG).show()
return@setPositiveButton

2
src/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
Unescape Escape View File

@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit
class BackgroundPollWorker : PersistentAlarmManagerListener() {
companion object {
private val pollInterval = TimeUnit.MINUTES.toMillis(15)
private val pollInterval = TimeUnit.MINUTES.toMillis(30)
@JvmStatic
fun schedule(context: Context) {

49
src/org/thoughtcrime/securesms/loki/todo/IdenticonDrawable.kt
Unescape Escape View File

@ -1,49 +0,0 @@
package org.thoughtcrime.securesms.loki.todo
import android.graphics.*
import android.graphics.drawable.Drawable
/**
* Basically a [Bitmap] wrapper, the [Bitmap] size must be known when instantiating it
* but when drawing it will draw the [Bitmap] to fit the canvas.
*/
abstract class IdenticonDrawable(width: Int, height: Int, hash: Long) : Drawable() {
private val bitmapRect: Rect = Rect(0, 0, width, height)
private val destinationRect: Rect = Rect(0, 0, width, height)
private val bitmap: Bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
private val canvas: Canvas = Canvas(bitmap)
private val bitmapPaint = Paint(Paint.ANTI_ALIAS_FLAG)
var hash: Long = hash
set(value) {
field = value
onSetHash(value)
invalidateBitmap()
}
protected fun invalidateBitmap() {
drawBitmap(canvas)
invalidateSelf()
}
protected abstract fun drawBitmap(canvas: Canvas)
protected open fun onSetHash(newHash: Long) = Unit
override fun draw(canvas: Canvas) {
destinationRect.set(0, 0, canvas.width, canvas.height)
canvas.drawBitmap(bitmap, bitmapRect, destinationRect, bitmapPaint)
}
override fun setAlpha(i: Int) {
bitmapPaint.alpha = i
}
override fun setColorFilter(colorFilter: ColorFilter?) {
bitmapPaint.colorFilter = colorFilter
}
override fun getOpacity(): Int {
return bitmapPaint.alpha
}
}

22
src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonContactPhoto.kt
Unescape Escape View File

@ -1,22 +0,0 @@
package org.thoughtcrime.securesms.loki.todo
import android.content.Context
import android.graphics.drawable.Drawable
import androidx.appcompat.content.res.AppCompatResources
import network.loki.messenger.R
import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto
class JazzIdenticonContactPhoto(val hexEncodedPublicKey: String) : FallbackContactPhoto {
override fun asDrawable(context: Context, color: Int): Drawable {
return asDrawable(context, color, false)
}
override fun asDrawable(context: Context, color: Int, inverted: Boolean): Drawable {
val targetSize = context.resources.getDimensionPixelSize(R.dimen.contact_photo_target_size)
return JazzIdenticonDrawable(targetSize, targetSize, hexEncodedPublicKey)
}
override fun asCallCard(context: Context): Drawable? {
return AppCompatResources.getDrawable(context, R.drawable.ic_person_large)
}
}

132
src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonDrawable.kt
Unescape Escape View File

@ -1,132 +0,0 @@
package org.thoughtcrime.securesms.loki.todo
import android.graphics.Canvas
import android.graphics.Color
import android.graphics.Paint
import kotlin.math.*
class JazzIdenticonDrawable(width: Int, height: Int, hash: Long) : IdenticonDrawable(width, height, hash) {
constructor(width: Int, height: Int, hashString: String): this(width, height, 0) {
val hexRegex = Regex("^[0-9A-Fa-f]+\$")
if (hashString.length >= 12 && hashString.matches(hexRegex)) {
hash = hashString.substring(0 until 12).toLong(16)
}
}
companion object {
var colors = listOf(
"#01888c", // teal
"#fc7500", // bright orange
"#034f5d", // dark teal
"#E784BA", // light pink
"#81C8B6", // bright green
"#c7144c", // raspberry
"#f3c100", // goldenrod
"#1598f2", // lightning blue
"#2465e1", // sail blue
"#f19e02" // gold
).map{ Color.parseColor(it) }
}
private var generator: RNG = RNG(hash)
private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL }
// Settings
private val wobble: Float = 30f
private val shapeCount = 4
init {
invalidateBitmap()
}
override fun onSetHash(newHash: Long) {
super.onSetHash(newHash)
generator = RNG(newHash)
invalidateBitmap()
}
override fun drawBitmap(canvas: Canvas) {
generator.reset()
val newColors = hueShift(colors)
val shuffled = shuffleList(newColors)
canvas.drawColor(shuffled[0])
for (i in 0 until shapeCount) {
drawSquare(canvas, shuffled[i + 1], i, shapeCount - 1)
}
}
private fun drawSquare(canvas: Canvas, color: Int, index: Int, total: Int) {
val size = min(canvas.width, canvas.height)
val center = (size / 2).toFloat()
val firstRotation = generator.nextFloat()
val angle = PI * 2 * firstRotation
val a = size / total.toFloat()
val b = generator.nextFloat()
val c = index.toFloat() * a
val velocity = a * b + c
val tx = cos(angle) * velocity
val ty = sin(angle) * velocity
// Third random is a shape rotation on top of all that
val secondRotation = generator.nextFloat()
val rotation = (firstRotation * 360f) + (secondRotation * 180f)
// Paint it!
canvas.save()
paint.color = color
canvas.translate(tx.toFloat(), ty.toFloat())
canvas.rotate(rotation.round(1), center, center)
canvas.drawRect(0f, 0f, canvas.width.toFloat(), canvas.height.toFloat(), paint)
canvas.restore()
}
private fun hueShift(colors: List<Int>): List<Int> {
val amount = generator.nextFloat() * 30 - wobble / 2
return colors.map { color ->
val red = Color.red(color)
val green = Color.green(color)
val blue = Color.blue(color)
val hsv = FloatArray(3)
Color.RGBToHSV(red, green, blue, hsv)
// Normalise between 0 and 360
var newHue = hsv[0] + round(amount)
if (newHue < 0) { newHue += 360 }
if (newHue > 360) { newHue -= 360 }
hsv[0] = newHue
Color.HSVToColor(hsv)
}
}
private fun <T> shuffleList(list: List<T>): List<T> {
var currentIndex = list.count()
val newList = list.toMutableList()
while (currentIndex > 0) {
val randomIndex = generator.next().toInt() % currentIndex
currentIndex -= 1
// Swap
val temp = newList[currentIndex]
newList[currentIndex] = newList[randomIndex]
newList[randomIndex] = temp
}
return newList
}
}
private fun Float.round(decimals: Int): Float {
var multiplier = 1f
repeat(decimals) { multiplier *= 10 }
return round(this * multiplier) / multiplier
}

30
src/org/thoughtcrime/securesms/loki/todo/RNG.kt
Unescape Escape View File

@ -1,30 +0,0 @@
package org.thoughtcrime.securesms.loki.todo
class RNG(hash: Long) {
private var seed: Long
private val initial: Long
private val maxInt32 = Int.MAX_VALUE.toLong()
init {
seed = hash % maxInt32
if (seed <= 0) {
seed = maxInt32 - 1
}
initial = seed
}
fun next(): Long {
val newSeed = (seed * 16807) % maxInt32
seed = newSeed
return seed
}
fun nextFloat(): Float {
return (next() - 1).toFloat() / (maxInt32 - 1)
}
fun reset() {
seed = initial
}
}

4
src/org/thoughtcrime/securesms/loki/todo/AvatarPlaceholderGenerator.kt → src/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt
Unescape Escape View File

@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.loki.todo
package org.thoughtcrime.securesms.loki.utilities
import android.content.Context
import android.graphics.*
@ -30,7 +30,7 @@ object AvatarPlaceholderGenerator {
val colorSecondary = changeColorHueBy(colorPrimary, 12f)
val labelText = when {
!TextUtils.isEmpty(displayName) -> extractLabel(displayName!!)
!TextUtils.isEmpty(displayName) -> extractLabel(displayName!!.capitalize())
!TextUtils.isEmpty(hashString) -> extractLabel(hashString)
else -> EMPTY_LABEL
}

15
src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
Unescape Escape View File

@ -29,10 +29,10 @@ class NewConversationButtonSetView : RelativeLayout {
var delegate: NewConversationButtonSetViewDelegate? = null
// region Convenience
private val sessionButtonExpandedPosition: PointF get() { return PointF(width.toFloat() / 2 - sessionButton.expandedSize / 2, 0.0f) }
private val closedGroupButtonExpandedPosition: PointF get() { return PointF(width.toFloat() - closedGroupButton.expandedSize, height.toFloat() - bottomMargin - closedGroupButton.expandedSize) }
private val openGroupButtonExpandedPosition: PointF get() { return PointF(0.0f, height.toFloat() - bottomMargin - openGroupButton.expandedSize) }
private val buttonRestPosition: PointF get() { return PointF(width.toFloat() / 2 - mainButton.expandedSize / 2, height.toFloat() - bottomMargin - mainButton.expandedSize) }
private val sessionButtonExpandedPosition: PointF get() { return PointF(width.toFloat() / 2 - sessionButton.expandedSize / 2 - sessionButton.shadowMargin, 0.0f) }
private val closedGroupButtonExpandedPosition: PointF get() { return PointF(width.toFloat() - closedGroupButton.expandedSize - 2 * closedGroupButton.shadowMargin, height.toFloat() - bottomMargin - closedGroupButton.expandedSize - 2 * closedGroupButton.shadowMargin) }
private val openGroupButtonExpandedPosition: PointF get() { return PointF(0.0f, height.toFloat() - bottomMargin - openGroupButton.expandedSize - 2 * openGroupButton.shadowMargin) }
private val buttonRestPosition: PointF get() { return PointF(width.toFloat() / 2 - mainButton.expandedSize / 2 - mainButton.shadowMargin, height.toFloat() - bottomMargin - mainButton.expandedSize - 2 * mainButton.shadowMargin) }
// endregion
// region Settings
@ -60,8 +60,9 @@ class NewConversationButtonSetView : RelativeLayout {
val expandedSize by lazy { resources.getDimension(R.dimen.new_conversation_button_expanded_size) }
val collapsedSize by lazy { resources.getDimension(R.dimen.new_conversation_button_collapsed_size) }
private val expandedImageViewPosition by lazy { PointF(0.0f, 0.0f) }
private val collapsedImageViewPosition by lazy { PointF((expandedSize - collapsedSize) / 2, (expandedSize - collapsedSize) / 2) }
val shadowMargin by lazy { toPx(6, resources).toFloat() }
private val expandedImageViewPosition by lazy { PointF(shadowMargin, shadowMargin) }
private val collapsedImageViewPosition by lazy { PointF(shadowMargin + (expandedSize - collapsedSize) / 2, shadowMargin + (expandedSize - collapsedSize) / 2) }
private val imageView by lazy {
val result = NewConversationButtonImageView(context)
@ -95,7 +96,7 @@ class NewConversationButtonSetView : RelativeLayout {
this.iconID = iconID
this.isMain = isMain
disableClipping()
val size = resources.getDimension(R.dimen.new_conversation_button_expanded_size).toInt()
val size = resources.getDimension(R.dimen.new_conversation_button_expanded_size).toInt() + 2 * shadowMargin.toInt()
val layoutParams = LayoutParams(size, size)
this.layoutParams = layoutParams
addView(imageView)

2
src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
Unescape Escape View File

@ -13,7 +13,7 @@ import network.loki.messenger.R
import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto
import org.thoughtcrime.securesms.database.Address
import org.thoughtcrime.securesms.database.DatabaseFactory
import org.thoughtcrime.securesms.loki.todo.AvatarPlaceholderGenerator
import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator
import org.thoughtcrime.securesms.mms.GlideRequests
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.util.TextSecurePreferences

4
src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
Unescape Escape View File

@ -222,9 +222,9 @@ public class DefaultMessageNotifier implements MessageNotifier {
Recipient recipients = DatabaseFactory.getThreadDatabase(context)
.getRecipientForThreadId(threadId);
if (isVisible && recipients != null && SessionMetaProtocol.shouldSendReadReceipt(recipients.getAddress())) {
if (isVisible && recipients != null) {
List<MarkedMessageInfo> messageIds = threads.setRead(threadId, false);
MarkReadReceiver.process(context, messageIds);
if (SessionMetaProtocol.shouldSendReadReceipt(recipients.getAddress())) { MarkReadReceiver.process(context, messageIds); }
}
if (!TextSecurePreferences.isNotificationsEnabled(context) ||

2
src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
Unescape Escape View File

@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.loki.todo.AvatarPlaceholderGenerator;
import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator;
import org.thoughtcrime.securesms.loki.utilities.NotificationUtilities;
import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
import org.thoughtcrime.securesms.mms.GlideApp;

11
src/org/thoughtcrime/securesms/recipients/Recipient.java
Unescape Escape View File

@ -20,6 +20,7 @@ package org.thoughtcrime.securesms.recipients;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -43,7 +44,6 @@ import org.thoughtcrime.securesms.database.RecipientDatabase.RegisteredState;
import org.thoughtcrime.securesms.database.RecipientDatabase.UnidentifiedAccessMode;
import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.loki.todo.JazzIdenticonContactPhoto;
import org.thoughtcrime.securesms.loki.utilities.ProfilePictureModifiedEvent;
import org.thoughtcrime.securesms.notifications.NotificationChannels;
import org.thoughtcrime.securesms.recipients.RecipientProvider.RecipientDetails;
@ -465,15 +465,10 @@ public class Recipient implements RecipientModifiedListener {
}
public synchronized @NonNull FallbackContactPhoto getFallbackContactPhoto() {
// TODO: I believe this is now completely unused
if (isResolving()) return new TransparentContactPhoto();
else if (isGroupRecipient()) return new GeneratedContactPhoto(name, R.drawable.ic_profile_default);
else {
String userPublicKey = TextSecurePreferences.getLocalNumber(context);
String publicKey = address.serialize();
String userMasterPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context);
String publicKeyToUse = (publicKey.equalsIgnoreCase(userPublicKey) && userMasterPublicKey != null) ? userMasterPublicKey : publicKey;
return new JazzIdenticonContactPhoto(publicKeyToUse);
}
else { return new TransparentContactPhoto(); }
}
public synchronized @Nullable ContactPhoto getContactPhoto() {

Write Preview
Loading…
Cancel
Save