From 1fff1a064919354be3caf1535f8221b5cd25e192 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 8 Apr 2023 09:31:17 +0200 Subject: [PATCH] add ability to remove account from server --- .../ui/ManageAccountActivity.java | 24 +++---- .../services/XmppConnectionService.java | 16 +++++ .../conversations/ui/EditAccountActivity.java | 12 ++++ .../siacs/conversations/ui/XmppActivity.java | 63 +++++++++++++++++++ src/main/res/layout/dialog_delete_account.xml | 26 ++++++++ src/main/res/menu/editaccount.xml | 4 ++ src/main/res/values-ar/strings.xml | 1 - src/main/res/values-bg/strings.xml | 1 - src/main/res/values-ca/strings.xml | 1 - src/main/res/values-cs/strings.xml | 1 - src/main/res/values-da-rDK/strings.xml | 1 - src/main/res/values-de/strings.xml | 2 - src/main/res/values-el/strings.xml | 1 - src/main/res/values-es/strings.xml | 2 - src/main/res/values-eu/strings.xml | 1 - src/main/res/values-fa-rIR/strings.xml | 1 - src/main/res/values-fi/strings.xml | 1 - src/main/res/values-fr/strings.xml | 1 - src/main/res/values-gl/strings.xml | 2 - src/main/res/values-hu/strings.xml | 1 - src/main/res/values-id/strings.xml | 1 - src/main/res/values-it/strings.xml | 2 - src/main/res/values-iw/strings.xml | 1 - src/main/res/values-ja/strings.xml | 1 - src/main/res/values-ko/strings.xml | 1 - src/main/res/values-ml/strings.xml | 1 - src/main/res/values-nb-rNO/strings.xml | 1 - src/main/res/values-nl/strings.xml | 1 - src/main/res/values-pl/strings.xml | 2 - src/main/res/values-pt-rBR/strings.xml | 1 - src/main/res/values-pt/strings.xml | 1 - src/main/res/values-ro-rRO/strings.xml | 2 - src/main/res/values-ru/strings.xml | 1 - src/main/res/values-sk/strings.xml | 1 - src/main/res/values-sq-rAL/strings.xml | 1 - src/main/res/values-sr/strings.xml | 1 - src/main/res/values-sv/strings.xml | 1 - src/main/res/values-szl/strings.xml | 1 - src/main/res/values-tr-rTR/strings.xml | 1 - src/main/res/values-uk/strings.xml | 1 - src/main/res/values-vi/strings.xml | 1 - src/main/res/values-zh-rCN/strings.xml | 2 - src/main/res/values-zh-rTW/strings.xml | 1 - src/main/res/values/strings.xml | 5 +- 44 files changed, 132 insertions(+), 62 deletions(-) create mode 100644 src/main/res/layout/dialog_delete_account.xml diff --git a/src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java index 6aecf4b26faaf601f37152dcd3fdfb48ecd50442..888a1f13ec82b69f1bac7dc0b539fba076c19a8a 100644 --- a/src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -12,6 +12,8 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.AdapterView.AdapterContextMenuInfo; +import android.widget.Button; +import android.widget.CheckBox; import android.widget.ListView; import android.widget.Toast; @@ -196,6 +198,12 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda } } + @Override + protected void deleteAccount(final Account account) { + super.deleteAccount(account); + this.selectedAccount = null; + } + @Override public boolean onOptionsItemSelected(MenuItem item) { if (MenuDoubleTabUtil.shouldIgnoreTap()) { @@ -368,22 +376,6 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda } } - private void deleteAccount(final Account account) { - final AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(getString(R.string.mgmt_account_are_you_sure)); - builder.setIconAttribute(android.R.attr.alertDialogIcon); - builder.setMessage(getString(R.string.mgmt_account_delete_confirm_text)); - builder.setPositiveButton(getString(R.string.delete), - (dialog, which) -> { - xmppConnectionService.deleteAccount(account); - selectedAccount = null; - if (xmppConnectionService.getAccounts().size() == 0 && Config.MAGIC_CREATE_DOMAIN != null) { - WelcomeActivity.launch(this); - } - }); - builder.setNegativeButton(getString(R.string.cancel), null); - builder.create().show(); - } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index d3722053f88f9cf4f736c6290fea3a7fdf4db273..ebbbef4c4530783cde559270fc17d9dc09ce2a24 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -51,6 +51,7 @@ import androidx.annotation.IntegerRes; import androidx.annotation.NonNull; import androidx.core.app.RemoteInput; import androidx.core.content.ContextCompat; +import androidx.core.util.Consumer; import com.google.common.base.Objects; import com.google.common.base.Optional; @@ -78,6 +79,7 @@ import java.util.ListIterator; import java.util.Map; import java.util.Set; import java.util.WeakHashMap; +import java.util.concurrent.Callable; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; @@ -2473,6 +2475,20 @@ public class XmppConnectionService extends Service { }); } + public void unregisterAccount(final Account account, final Consumer callback) { + final IqPacket iqPacket = new IqPacket(IqPacket.TYPE.SET); + final Element query = iqPacket.addChild("query",Namespace.REGISTER); + query.addChild("remove"); + sendIqPacket(account, iqPacket, (a, response) -> { + if (response.getType() == IqPacket.TYPE.RESULT) { + deleteAccount(a); + callback.accept(true); + } else { + callback.accept(false); + } + }); + } + public void deleteAccount(final Account account) { final boolean connected = account.getStatus() == Account.State.ONLINE; synchronized (this.conversations) { diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index c0c43dda7e83af96b066dac6b1cfa4931ec361d8..b4812477fd814861d2fa4c99ebfe13d149ac1304 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -648,6 +648,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat final MenuItem showBlocklist = menu.findItem(R.id.action_show_block_list); final MenuItem showMoreInfo = menu.findItem(R.id.action_server_info_show_more); final MenuItem changePassword = menu.findItem(R.id.action_change_password_on_server); + final MenuItem deleteAccount = menu.findItem(R.id.action_delete_account); final MenuItem renewCertificate = menu.findItem(R.id.action_renew_certificate); final MenuItem mamPrefs = menu.findItem(R.id.action_mam_prefs); final MenuItem changePresence = menu.findItem(R.id.action_change_presence); @@ -663,6 +664,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat if (!mAccount.getXmppConnection().getFeatures().register()) { changePassword.setVisible(false); + deleteAccount.setVisible(false); } mamPrefs.setVisible(mAccount.getXmppConnection().getFeatures().mam()); changePresence.setVisible(!mInitMode); @@ -670,6 +672,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat showBlocklist.setVisible(false); showMoreInfo.setVisible(false); changePassword.setVisible(false); + deleteAccount.setVisible(false); mamPrefs.setVisible(false); changePresence.setVisible(false); } @@ -875,6 +878,9 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat case R.id.action_change_password_on_server: gotoChangePassword(null); break; + case R.id.action_delete_account: + deleteAccount(); + break; case R.id.action_mam_prefs: editMamPrefs(); break; @@ -888,6 +894,12 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat return super.onOptionsItemSelected(item); } + private void deleteAccount() { + this.deleteAccount(mAccount,()->{ + finish(); + }); + } + private boolean inNeedOfSaslAccept() { return mAccount != null && mAccount.getLastErrorStatus() == Account.State.DOWNGRADE_ATTACK && mAccount.getPinnedMechanismPriority() >= 0 && !accountInfoEdited(); } diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 644bd7ec55244059146ab2a1b1ef384d7672e564..b22bdf52abc1d997708414cd8f0473d9116d595d 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -41,6 +41,8 @@ import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.widget.Button; +import android.widget.CheckBox; import android.widget.ImageView; import android.widget.Toast; @@ -83,6 +85,7 @@ import eu.siacs.conversations.utils.AccountUtils; import eu.siacs.conversations.utils.Compatibility; import eu.siacs.conversations.utils.ExceptionHelper; import eu.siacs.conversations.ui.util.SettingsUtils; +import eu.siacs.conversations.utils.SignupUtils; import eu.siacs.conversations.utils.ThemeHelper; import eu.siacs.conversations.xmpp.Jid; import eu.siacs.conversations.xmpp.OnKeyStatusUpdated; @@ -289,6 +292,66 @@ public abstract class XmppActivity extends ActionBarActivity { builder.create().show(); } + protected void deleteAccount(final Account account) { + this.deleteAccount(account, null); + } + + protected void deleteAccount(final Account account, final Runnable postDelete) { + final AlertDialog.Builder builder = new AlertDialog.Builder(this); + final View dialogView = getLayoutInflater().inflate(R.layout.dialog_delete_account, null); + final CheckBox deleteFromServer = + dialogView.findViewById(R.id.delete_from_server); + builder.setView(dialogView); + builder.setTitle(R.string.mgmt_account_delete); + builder.setPositiveButton(getString(R.string.delete),null); + builder.setNegativeButton(getString(R.string.cancel), null); + final AlertDialog dialog = builder.create(); + dialog.setOnShowListener(dialogInterface->{ + final Button button = dialog.getButton(AlertDialog.BUTTON_POSITIVE); + button.setOnClickListener(v -> { + final boolean unregister = deleteFromServer.isChecked(); + if (unregister) { + if (account.isOnlineAndConnected()) { + deleteFromServer.setEnabled(false); + button.setText(R.string.please_wait); + button.setEnabled(false); + xmppConnectionService.unregisterAccount(account, result -> { + if (result) { + dialog.dismiss(); + if (postDelete != null) { + postDelete.run(); + } + if (xmppConnectionService.getAccounts().size() == 0 && Config.MAGIC_CREATE_DOMAIN != null) { + final Intent intent = SignupUtils.getSignUpIntent(this); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + startActivity(intent); + } + } else { + deleteFromServer.setEnabled(true); + button.setText(R.string.delete); + button.setEnabled(true); + Toast.makeText(this,R.string.could_not_delete_account_from_server,Toast.LENGTH_LONG).show(); + } + }); + } else { + Toast.makeText(this,R.string.not_connected_try_again,Toast.LENGTH_LONG).show(); + } + } else { + xmppConnectionService.deleteAccount(account); + dialog.dismiss(); + if (xmppConnectionService.getAccounts().size() == 0 && Config.MAGIC_CREATE_DOMAIN != null) { + final Intent intent = SignupUtils.getSignUpIntent(this); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + startActivity(intent); + } else if (postDelete != null) { + postDelete.run(); + } + } + }); + }); + dialog.show(); + } + abstract void onBackendConnected(); protected void registerListeners() { diff --git a/src/main/res/layout/dialog_delete_account.xml b/src/main/res/layout/dialog_delete_account.xml new file mode 100644 index 0000000000000000000000000000000000000000..e39054efe944a0a031be894321eb72e214e738db --- /dev/null +++ b/src/main/res/layout/dialog_delete_account.xml @@ -0,0 +1,26 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 8cd95f5ea66cf3e37228c50ddbab031e65d257b1..103aebb5d474ddf8b2310e55aa596508e16f6b82 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -55,6 +55,10 @@ app:showAsAction="never" android:title="@string/change_password"/> + + أنشر المفتاح العمومي OpenPGP حذف مفتاح OpenPGP العمومي تفعيل الحساب - هل أنت متأكد ؟ تسجيل صوت عنوان XMPP احجب عنوان XMPP diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index e0b7643ad6e15d59f462cf6e8234372bc4beace4..5b8982917b7e5d081dc757bc8a62a312313e5557 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -184,7 +184,6 @@ Наистина ли искате да премахнете своя публичен OpenPGP ключ от известяването си за присъствие?\nКонтактите Ви вече няма да могат да Ви изпращат съобщение, шифровани чрез OpenPGP. Публичният OpenPGP ключ е публикуван. Активиране на профила - Наистина ли искате това? Изтриването на профила Ви ще изтрие и цялата история на разговорите Ви Запис на глас XMPP адрес diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 96fd125ff1b525e55a615a294905598ab29bee54..2259a74b03685570483c7eb6cc4382481ce32c89 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -176,7 +176,6 @@ Esteu segur que voleu eliminar la vostra clau pública d\'OpenPGP de l\'anunci de la vostra presència?\nEls vostres contactes ja no podran enviar missatges xifrats amb OpenPGP. S\'ha publicat la clau pública de OpenPGP. Habilita el compte - N\'esteu segur? En esborrar el teu compte s\'esborra tot l\'historial de converses Enregistra veu Adreça XMPP diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 6f80dfb63d3d75408e5f13df2c427305283a17a4..316e8200bab2974051ba9ec16e16a9c6d6de2838 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -188,7 +188,6 @@ Skutečně chcete odstranit Váš současný veřejný OpenPGP klíč?\nVaše kontakty Vám nebudou moci nadále posílat zprávy šifrované pomocí OpenPGP. OpenPGP veřejný klíč zveřejněn. Povolit účet - Jste si jisti? Smazáním Vašeho účtu dojde k vymazání celé Vaší historie konverzací. Nahrát hlas Adresa XMPP diff --git a/src/main/res/values-da-rDK/strings.xml b/src/main/res/values-da-rDK/strings.xml index 10204f1b4528fbae1215db2aaf65ecebe658d0e0..6915a903d9d2fb8fc7cec793598c045ded163bce 100644 --- a/src/main/res/values-da-rDK/strings.xml +++ b/src/main/res/values-da-rDK/strings.xml @@ -185,7 +185,6 @@ Er du sikker på, at du vil fjerne din OpenPGP-nøgle fra din nærværsmeddelelse?\nDine kontakter kan ikke længere sende dig OpenPGP-krypterede meddelelser. OpenPGP offentlig nøgle er offentliggjort Aktiver konto - Er du sikker? Sletning af din konto sletter hele din samtalehistorik Optag lyd XMPP-adresse diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 708493d220e31f62d72c8a5bee90dc743a4094a6..89592c97db63676b1aa0398103cacbf79af65bb7 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -184,7 +184,6 @@ Bist du sicher, dass du deinen öffentlichen OpenPGP-Schlüssel aus deiner Anwesenheitsmitteilung entfernen möchtest?\nDeine Kontakte können dir dann keine OpenPGP-verschlüsselten Nachrichten senden. Öffentlicher OpenPGP-Schlüssel veröffentlicht. Konto aktivieren - Bist du dir sicher? Die Löschung deines Kontos löscht deinen gesamten Gesprächsverlauf Sprache aufzeichnen XMPP-Adresse @@ -1006,5 +1005,4 @@ Eingehender Anruf (%s) · %s Ausgehender Anruf (%s) · %s Ausgehender Anruf · %s - Die Channelsuche verwendet einen Drittanbieterservice namens <a href=https://search.jabber.network>search.jabber.network</a>.<br><br>Wenn du diese Funktion verwendest, werden deine IP-Adresse und deine Suchbegriffe an diesen Dienst übertragen. Weitere Informationen findest du in deren <a href=https://search.jabber.network/privacy>Datenschutzerklärung</a>. \ No newline at end of file diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 9bc6fccf698252844445c32c285d975f9d004915..bb9697c8be8529b28f64c0a4a2900ef63ccc4adf 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -184,7 +184,6 @@ Είστε βέβαιοι ότι θέλετε να αφαιρέσετε το δημόσιο κλειδί σας OpenPGP από την ανακοίνωση παρουσίας σας;\nΟι επαφές σας δεν θα είναι πλέον δυνατόν να σας στείλουν κρυπτογραφημένα μηνύματα με OpenPGP. Το δημόσιο κλειδί OpenPGP έχει δημοσιευτεί. Ενεργοποίηση λογαριασμού - Είστε βέβαιοι; Η διαγραφή του λογαριασμού σας διαγράφει όλο το ιστορικό συζητήσεών σας Εγγραφή φωνής Διεύθυνση XMPP diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index b5592406ae1b3bf48cb890f970c11a6e1cb3591c..68fccc3fb0f094ff7fa5651fe97416506601a297 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -187,7 +187,6 @@ ¿Estás seguro de que quieres eliminar tu clave pública OpenPGP de tu anuncio de presencia?\nTus contactos no podrán enviarte mensajes cifrados con OpenPGP. La clave pública OpenPGP ha sido publicada. Habilitar - ¿Estás seguro? Si eliminas tu cuenta tu historial de conversaciones completo se perderá Grabar audio Dirección XMPP @@ -1016,7 +1015,6 @@ Servidor push Un servidor push elegido por el usuario para transmitir mensajes push a través de XMPP a su dispositivo. Ninguno (desactivado) - El descubrimiento de canales utiliza un servicio de terceros llamado <a href=https://search.jabber.network>search.jabber.network</a>.<br><br>El uso de esta función transmitirá tú dirección IP y términos de búsqueda a ese servicio Consulta tú <a href=https://search.jabber.network/privacy>Política de privacidad</a> para obtener más información. Llamada entrante (%s) · %s Llamada saliente (%s) · %s Llamadas salientes · %s diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 23e78fd216783b1f711a210d3284631ceb47d429..fb0ed16834e83d5643d77af90b7bdb181ad8fdf8 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -146,7 +146,6 @@ OpenPGP gako publikoa kendu Ziur zure OpenPGP gako publikoa zure presentzia eguneraketetatik kendu nahi duzula?\nZure kontaktuek ezin dizute gehiago OpenPGPz enkriptatutako mezuak bidali. Kontua gaitu - Ziur al zaude? Ahotsa grabatu XMPP helbidea XMPP helbidea blokeatu diff --git a/src/main/res/values-fa-rIR/strings.xml b/src/main/res/values-fa-rIR/strings.xml index 9ba3e4d45a8e239f94e2dbdda88756849836e042..1c0c918974c0349a720499e49f5fdf324a07ac62 100644 --- a/src/main/res/values-fa-rIR/strings.xml +++ b/src/main/res/values-fa-rIR/strings.xml @@ -118,7 +118,6 @@ انتشار کلید عمومی OpenPGP حذف کلید عمومی OpenPGP فعال سازی حساب کاربری - آیا مطمئن هستید؟ ضبط صدا username@example.com کلمه عبور diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index 2df38d21f1d57451fabde24ba63ef702b694d7d0..c42059667dadf63ac59811a3c71501c4b9920693 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -179,7 +179,6 @@ Haluatko varmasti poistaa OpenPGP-avaimesi tilamainostuksistasi?\nYhteystietosi eivät voi enää lähettää sinulle OpenPGP-salattuja viestejä. OpenPGP julkinen avain julkaistu. Ota tunnus käyttöön - Oletko varma? Tilin poistaminen pyyhkii koko keskusteluhistoriasi Nauhoita ääntä XMPP-osoite diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 671c1809829d65ad3d508b62dd2ec0f10651d978..578d676c8ed16d7741da5f6b95301cca20d1ddca 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -181,7 +181,6 @@ Êtes-vous sûr de vouloir supprimer votre clé publique OpenPGP de votre annonce de présence ?\nVos contacts ne pourront plus vous envoyer de message chiffrés avec OpenPGP. Clé publique OpenPGP publiée Activer - Êtes-vous sûr ? Supprimer votre compte effacera l\'historique de vos conversations Enregistrer un son Adresse XMPP diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 60501fed20686e4e530f2be7ff3104259232d3cf..332e7e89ae9aac154a76dce5bf7b82f8195f2950 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -188,7 +188,6 @@ Tes a certeza de que queres eliminar a túa chave pública OpenPGP do anuncio de presenza? \nOs teus contactos non poderán enviarche mensaxes cifradas con OpenPGP. Publicada a chave pública OpenPGP. Habilitar - Seguro? Ao eliminar a conta eliminas todo o historial de conversas Gravar audio Enderezo XMPP @@ -1009,5 +1008,4 @@ Chamada entrante (%s) · %s Chamada saínte (%s) · %s Chamada saínte · %s - O descubrimento de canles usa un servizo de terceiros chamado <a href=https://search.jabber.network>search.jabber.network</a>.<br><br>Ao usar esta ferramenta transmites o teu enderezo IP e termos de busca a ese servizo. Para saber máis le a súa <a href=https://search.jabber.network/privacy>Política de Privacidade</a>. \ No newline at end of file diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index fe859309d679f00380a704532919da8b3447a3bc..c9bcf6ba1a271bb82498e18ec6271c98ac218260 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -184,7 +184,6 @@ Biztosan el szeretné távolítani az OpenPGP nyilvános kulcsát a jelenléti közleményéből?\nA partnerei többé nem lesznek képesek OpenPGP titkosítású üzeneteket küldeni Önnek. Az OpenPGP nyilvános kulcs közzé lett téve. Fiók engedélyezése - Biztos benne? A fiók törlésével az összes beszélgetési előzményei is eltávolításra kerülnek Hang rögzítése XMPP-cím diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml index f2a62187614f18544715e70780491c225bcfce52..701e5ec76bd6b18ca77cf9ea2e7095e65bb9ef2b 100644 --- a/src/main/res/values-id/strings.xml +++ b/src/main/res/values-id/strings.xml @@ -173,7 +173,6 @@ Yakin ingin menghapus kunci publik OpenPGP Anda dari pengumuman kehadiran?\nKontak Anda tidak lagi dapat mengirimi Anda pesan terenkripsi OpenPGP. Kunci publik OpenPGP diumumkan Aktifkan Akun - Apakah Anda yakin.? Menghapus akun akan menghilangkan semua riwayat percakapan Rekam suara alamat XMPP diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 956714b2726b990a88b39174c2f5af164bef6dd5..603fc31008a17d3c5f1a70eb266ad9eb15f2171e 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -185,7 +185,6 @@ Sei sicuro di volere rimuovere la tua chiave pubblica OpenPGP dalla dichiarazione di presenza?\nI tuoi contatti non potranno più inviarti messaggi cifrati con OpenPGP. Chiave pubblica OpenPGP pubblicata. Attiva profilo - Sei sicuro? L\'eliminazione del tuo profilo cancellerà tutta la cronologia dielle conversazioni Registra la voce Indirizzo XMPP @@ -1020,5 +1019,4 @@ Chiamata in arrivo (%s) · %s Chiamata in uscita (%s) · %s Chiamata in uscita · %s - La scoperta dei canali usa un servizio di terze parti chiamato <a href=https://search.jabber.network>search.jabber.network</a>.<br><br>L\'uso di questa funzione invierà il tuo indirizzo IP e i termini di ricerca a quel servizio. Vedi la sua <a href=https://search.jabber.network/privacy>informativa sulla privacy</a> per maggiori informazioni. \ No newline at end of file diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 8488cce22c74ed0ff3aece70b2728d6b9680f028..9b43fcbbc56e5700b5284696d9d6406246a69a85 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -106,7 +106,6 @@ פרסם תמונת פרופיל פרסם מפתח ציבורי של OpenPGP הפעל חשבון - האם אתה בטוח? הקלט קול username@example.com סיסמה diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 53f0053f5ba0a53a645e00e8ea1f8661a294d28a..11cd9a8fbea4b78b7d83201772ac7c3fbda3a9de 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -181,7 +181,6 @@ 出席情報告知から OpenPGP 公開鍵を削除してもよろしいですか?\n連絡先はあなたに OpenPGP 暗号化メッセージを送信できなくなります。 OpenPGP 公開鍵を公開しました。 アカウントを有効化 - よろしいですか? アカウントを削除すると会話履歴がすべて消去されます 音声を録音 XMPP アドレス diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index f6589435a70c65033da1b2890df34cac4f994a7b..82afd51ba34f58c84c56d691804920b5b591dc41 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -123,7 +123,6 @@ 아바타 공개 OpenPGP 공개 키 공개 계정 사용 - 확실합니까? 녹음 username@example.com 암호 diff --git a/src/main/res/values-ml/strings.xml b/src/main/res/values-ml/strings.xml index 7adca9d89d252a4945f75279628366118facb29a..cf9ca60a3d2dd949c5a18b07d8d08fa8e3cd3177 100644 --- a/src/main/res/values-ml/strings.xml +++ b/src/main/res/values-ml/strings.xml @@ -120,7 +120,6 @@ അവതാർ പ്രസിദ്ധീകരിക്കൂ OpenPGP പബ്ലിക് കീ പ്രസിദ്ധീകരിക്കുക OpenPGP പബ്ലിക് കീ നീക്കം ചെയ്യുക - നിങ്ങള്ക്ക് ഉറപ്പാണോ? ശബ്‌ദം റെക്കോർഡുചെയ്യൂ XMPP വിലാസം XMPP വിലാസം തടയുക diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml index fdbb541d86d576d564cc1662204f4748906d83dd..73b5b73117ea77c9daa22247de39944011467476 100644 --- a/src/main/res/values-nb-rNO/strings.xml +++ b/src/main/res/values-nb-rNO/strings.xml @@ -133,7 +133,6 @@ Fjern offentlig OpenPGP-nøkkel Er du sikker på at du vil fjerne din offentlige OpenPGP-nøkkel fra din tilstedeværelseskunngjøring?\nDine kontakter vil ikke lenger kunne sende deg OpenPGP-krypterte meldinger. Skru på konto - Bekreft. Ta opp stemme brukernavn@eksempel.no Passord diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 829b2e3a066a8a1d654af8404ec464058463b832..a8ec45e61f9fd996f757cde41a9c5f3ce456dd93 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -171,7 +171,6 @@ Weet je zeker dat je je OpenPGP-publieke sleutel uit je aanwezigheidsaankondiging wil verwijderen?\nJe contacten zullen je geen OpenPGP-versleutelde berichten meer kunnen sturen. OpenPGP-publieke sleutel gepubliceerd. Account inschakelen - Weet je het zeker? Stem opnemen XMPP-adres XMPP-adres blokkeren diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 8916356304e9eedcb1e780eee4a7d60b6d73652b..125dd7ee56f2a84a8a7077400aef6f85e7381069 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -188,7 +188,6 @@ Czy na pewno chcesz usunąć klucz publiczny OpenPGP ze swojej propagacji obecności?\nTwoje kontakty nie będą już mogły wysyłać Ci wiadomości zaszyfrowanych OpenPGP. Klucz publiczny OpenPGP został opublikowany. Włącz konto - Czy na pewno? Usunięcie konta usuwa całą historię rozmów Nagraj głos Adres XMPP @@ -1038,6 +1037,5 @@ Odrzuć Połączenie przychodzące (%s) · %s Połączenie wychodzące (%s) · %s - Wykrywanie kanałów korzysta z usługi innej firmy o nazwie <a href=https://search.jabber.network>search.jabber.network</a>.<br><br>Użycie tej funkcji spowoduje przesłanie adresu IP i wyszukiwanych terminów do tej usługi. Zobacz ich <a href=https://search.jabber.network/privacy>Politykę prywatności</a>, aby uzyskać więcej informacji. Połączenie wychodzące · %s \ No newline at end of file diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index d24843306dadc039de9dbadb7566cd4bcd1286bf..624d93c8380809ec8872db81812417e5c7662e9d 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -188,7 +188,6 @@ Tem certeza que deseja remover sua chave pública OpenPGP do seu anúncio de presença?\nSeus contatos não poderão mais enviar mensagens criptografadas com o OpenPGP para você. A chave pública do OpenPGP foi publicada. Habilitar a conta - Tem certeza? Se você excluir a sua conta todo o seu histórico de conversas será apagado Gravar voz Endereço XMPP diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 125a0af4c526aff471eaf748f28ced1a1e1b8e35..8afde7af143897e659619b6038a5c9a2bc9e5e3a 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -128,7 +128,6 @@ Publicar chave pública OpenPGP Remover chave pública OpenPGP Ativar conta - Tem a certeza? Gravar voz nomedeutilizador@exemplo.com Palavra-passe diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml index f6f83aab09d322b4e47e9274967312d7d7d5bd92..6cab585c0a18dae05ba8f71c1840081a50fdd017 100644 --- a/src/main/res/values-ro-rRO/strings.xml +++ b/src/main/res/values-ro-rRO/strings.xml @@ -187,7 +187,6 @@ Sigur doriți să vă ștergeți cheia publică OpenPGP din mesajele de prezență?\nContactele dumneavoastră nu vor mai putea să vă trimită mesaje criptate cu OpenPGP. Cheia publică OpenPGP a fost publicată. Activează cont - Sigur doriți asta? Dacă vă ștergeți contul, întregul istoric de conversații va fi pierdut Înregistrare voce Adresă XMPP @@ -1028,5 +1027,4 @@ Apel primit (%s) · %s Apel efectuat (%s) · %s Apel efectuat · %s - Descoperirea de canale publice folosește un serviciu terț numit <a href=https://search.jabber.network>search.jabber.network</a>.<br><br>Folosind această funcție se va transmite adresa dumneavoastră IP și cuvintele căutate către acest serviciu. Pentru mai multe informații citiți <a href=https://search.jabber.network/privacy>Politica de confidențialitate</a> a serviciului. \ No newline at end of file diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index b471ac8bf3ee65367b39c1da02b3d7065b7d1982..16113a1f0c1f18d313c326089acae90ee58c8755 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -183,7 +183,6 @@ Вы действительно хотите удалить ваш OpenPGP публичный ключ из опубликованных?\nВаши собеседники не смогут больше отправлять вам зашифрованные OpenPGP сообщения. Публичный ключ OpenPGP опубликован. Включить аккаунт - Вы уверены? Удаление аккаунта также удалит всю историю вашей переписки Запись голоса XMPP-адрес diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index 5a6e75329afb6f693072893c924f2441bd3e93bc..d9e0f2a51b84f87e98667fcd17de64507aac64b2 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -184,7 +184,6 @@ Zverejniť OpenPGP kľúč Odstrániť OpenPGP  verejný kľúč Povoliť účet - Ste si istý? Nahrať hlas XMPP adresa Zablokovať adresu XMPP diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml index c27cbce887e71fca53d3eca9bf92be9876f9e697..a4f1548f45224e294121ae84650934122b54c13a 100644 --- a/src/main/res/values-sq-rAL/strings.xml +++ b/src/main/res/values-sq-rAL/strings.xml @@ -148,7 +148,6 @@ Hiq kyç publik OpenPGP Kyçi publik OpenPGP u bë publik. Aktivizoje llogarinë - Jeni i sigurt\? Incizoni zë Adresë XMPP Bllokoj adresë XMPP diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index df624e9d8da75762a6e4400832a79f4f794a1947..7c1a1e16d86bbe9f691ae83797eb813eae7a3ccf 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -183,7 +183,6 @@ Желите ли заиста да уклоните ваш ОпенПГП кључ из ваше објаве присутности?\nВаши контакти више неће моћи да вам шаљу ОпенПГП шифроване поруке. ОпенПГП кључ је објављен. Укључи налог - Да ли сте сигурни? Брисањем налога бришете и целу историју ваших разговора. Сними глас ИксМПП адреса diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index ff3bc2798b60deb893a4acad1d97f3278e8d3f92..bd2edb39796168e38e9996b4f3ba82138f3a0b66 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -185,7 +185,6 @@ Är du säker på att du vill ta bort din OpenPGP publik nyckel från din tillgänglighetsuppdatering?\nDina kontakter kommer inte längre att kunna skicka dig OpenPGP-krypterade meddelande. OpenPGP-nyckel har publicerats. Aktivera konto - Är du säker? Om du tar bort ditt konto raderas hela din konversationshistorik Spela in röst XMPP-adress diff --git a/src/main/res/values-szl/strings.xml b/src/main/res/values-szl/strings.xml index 532ca082c404a777caaa380c523de6e7d3e548c5..cfa9b612f5fb12b13d7589977ef3ef3615338d66 100644 --- a/src/main/res/values-szl/strings.xml +++ b/src/main/res/values-szl/strings.xml @@ -198,7 +198,6 @@ \nTwoje kōntakty niy bydōm już mogły wysyłać ci wiadōmości zaszyfrowanych OpenPGP. Klucz publiczny OpenPGP ôstoł ôpublikowany. Włōncz kōnto - Na zicher\? Wymazanie kōnta wymazuje cołko historyjo godek Nagrej głos Adresa XMPP diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml index 9ac08990e68a9b3b24a00e6d64b5d09d1197ccfb..f1dfef5b360d4b73d8ad88522fecf71c27c80d35 100644 --- a/src/main/res/values-tr-rTR/strings.xml +++ b/src/main/res/values-tr-rTR/strings.xml @@ -182,7 +182,6 @@ OpenPGP genel anahtarınız Çevrim içi durum anonsunuzdan kaldırmak istediğinizden emin misiniz?\nArtık kişileriniz size şifrelenmiş OpenPGP mesajları gönderemeyecek. OpenPGP genel anahtarı yayınlandı. Hesabı etkinleştir - Emin misiniz? Hesabınızın silinmesi bütün konuşma geçmişinizi siler Ses kaydet XMPP adresi diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index d856569db7a9a497858d3fab44aecb047462e936..c1cf1640c92c3747638f9c70484acf37b317935b 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -168,7 +168,6 @@ Ви впевнені, що хочете вилучити ваш публічний ключ OpenPGP з вашого оголошення про присутність?\nВаші контакти більше не зможуть надсилати вам повідомлення, зашифровані OpenPGP. Публічний ключ OpenPGP опубліковано. Увімкнути обліковий запис - Ви впевнені? Вилучення облікового запису вилучіть всю історію спілкування Записати голос Адреса XMPP diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 4d65268bacd39df8cfd3703449de620ffa761698..502243ea87752afb49d74cd4b52e0aff91141f6f 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -181,7 +181,6 @@ Bạn có chắc bạn muốn xoá mã khoá OpenPGP công khai của bạn khỏi sự thông báo có mặt của bạn không?\nCác liên hệ của bạn sẽ không thể gửi các tin nhắn được mã hoá bằng OpenPGP cho bạn nữa. Đã xuất bản mã khoá OpenPGP công khai. Bật tài khoản - Bạn chắc chứ? Việc xoá tài khoản sẽ xoá toàn bộ lịch sử cuộc hội thoại của bạn Ghi âm Địa chỉ XMPP diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 420ec069b41c0a52446ca5b74b6aa05cf76c215c..851de9e08525cb3bd375e9d9f81631569341d12c 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -185,7 +185,6 @@ 您确定要从在线状态中移除OpenPGP公钥吗？\n您的联系人将无法再向您发送 OpenPGP 加密信息。 OpenPGP 公钥已发布。 启用账户 - 确定? 如果您删除帐户，您的所有聊天记录将会丢失 录制音频 XMPP地址 @@ -997,5 +996,4 @@ 来电 (%s) · %s 去电 (%s) · %s 去电 · %s - 频道发现功能使用第三方服务 <a href=https://search.jabber.network>search.jabber.network</a>。<br><br>使用此功能会发送你的 IP 地址和搜索词条到该服务。更多信息见 <a href=https://search.jabber.network/privacy>隐私政策</a>。 \ No newline at end of file diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 77c9c5da34c54affab95b0b59a6c409c54385f0c..0c58b94c270439beb7a5aa5541e10ffe597a2392 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -172,7 +172,6 @@ 確定要移除上線狀態中的 OpenPGP 公開金鑰嗎？\n這樣一來，你的聯絡人就無法傳送以 OpenPGP 加密的訊息給你了。 OpenPGP 公開金鑰已發佈 啟用帳戶 - 確定? 刪除帳戶將清除您全部的會話記錄 錄音 XMPP 位址 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 8945909dceb21e1468b6629754a712dc82e0095d..f64e9bbd012475af04c392081e9b57e65ab98124 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -183,8 +183,7 @@ Are you sure you want to remove your OpenPGP public key from your presence announcement?\nYour contacts will no longer be able to send you OpenPGP encrypted messages. OpenPGP public key published. Enable account - Are you sure? - Deleting your account erases your entire conversation history + Are you sure you want to delete your account? Deleting your account erases your entire conversation history Record voice XMPP address Block XMPP address @@ -1007,5 +1006,7 @@ A user-chosen push server to relay push messages via XMPP to your device. None (deactivated) Decline + Remove account from server + Could not delete account from server