Merge branch 'stable' into adb/issue-2675

jni/dc_wrapper.c

@@ -1909,15 +1909,6 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcContact_isVerified(JNIEnv *env, job
 }
 
 
-JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getVerifierAddr(JNIEnv *env, jobject obj)
-{
-    char* temp = dc_contact_get_verifier_addr(get_dc_contact(env, obj));
-        jstring ret = JSTRING_NEW(temp);
-    dc_str_unref(temp);
-    return ret;
-}
-
-
 JNIEXPORT jint Java_com_b44t_messenger_DcContact_getVerifierId(JNIEnv *env, jobject obj)
 {
     return dc_contact_get_verifier_id(get_dc_contact(env, obj));

res/values-bg/strings.xml

@@ -714,7 +714,6 @@
     <string name="emoji_symbols">Символи</string>
     <string name="emoji_flags">Знамена</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Изтриване на старите съобщения</string>
     <string name="autodel_device_title">Изтриване на съобщенията от устройството</string>

res/values-bqi/strings.xml

@@ -341,7 +341,6 @@
     <string name="emoji_symbols">nemāďā</string>
     <string name="emoji_flags">bêyraqā</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">pāk kerdên payomā qaďimi</string>
     <string name="autodel_device_title">pāk kerdên payomā zê dasgā</string>

res/values-ckb/strings.xml

@@ -474,7 +474,6 @@
     <string name="emoji_symbols">هێماکان</string>
     <string name="emoji_flags">ئاڵاکان</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">سڕینەوەی پەیامە کۆنەکان</string>
     <string name="autodel_device_title">سڕینەوەی پەیامەکان لەسەر مۆبایەلەکت</string>

res/values-cs/strings.xml

@@ -534,7 +534,6 @@
     <string name="emoji_symbols">Symboly</string>
     <string name="emoji_flags">Vlajky</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Vymaž staré zprávy</string>
     <string name="autodel_device_title">Vymaž zprávy z přístroje</string>

res/values-da/strings.xml

@@ -553,7 +553,6 @@
     <string name="emoji_symbols">Symboler</string>
     <string name="emoji_flags">Flag</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Slet gamle beskeder</string>
     <string name="autodel_device_title">Slet beskeder fra enhed</string>

res/values-de/strings.xml

@@ -644,6 +644,8 @@
     <string name="pref_manage_keys">Schlüssel verwalten</string>
     <string name="pref_use_system_emoji">System-Emoji benutzen</string>
     <string name="pref_use_system_emoji_explain">Eingebaute Emoji-Unterstützung von Delta Chat deaktivieren</string>
+    <string name="pref_use_inapp_camera">In-App Kamera verwenden</string>
+    <string name="pref_use_inapp_camera_explain">Die In-App-Kamera hat in der Regel weniger Funktionen als die Systemkamera</string>
     <string name="pref_app_access">App-Zugriff</string>
     <string name="pref_chats">Chats</string>
     <string name="pref_in_chat_sounds">In-Chat-Klänge</string>
@@ -720,7 +722,6 @@
     <string name="emoji_symbols">Symbole</string>
     <string name="emoji_flags">Flaggen</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Alte Nachrichten löschen</string>
     <string name="autodel_device_title">Nachrichten vom Gerät löschen</string>
@@ -895,6 +896,7 @@
     <string name="contact_not_verified">Kann %1$s nicht verifizieren</string>
     <!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that verified the contact shown. -->
     <string name="verified_by">Verifiziert von %1$s</string>
+    <string name="verified_by_you">Verifiziert von Ihnen</string>
     <!-- translators: "setup" is the "encryption setup" here, as in "Autocrypt Setup Message" -->
     <string name="contact_setup_changed">Geändertes Setup für %1$s</string>
     <string name="verified_group_explain">Verifizierte Gruppen (experimentell) bieten Schutz gegen aktive Angriffe mittels Zwei-Faktor-Authentifizierung aller Mitglieder und immer aktiver Ende-zu-Ende-Verschlüsselung.</string>

res/values-el/strings.xml

@@ -674,7 +674,6 @@
     <string name="emoji_symbols">Σύμβολα</string>
     <string name="emoji_flags">Σημαίες</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Διαγραφή Παλιών Μηνυμάτων</string>
     <string name="autodel_device_title">Διαγραφή Μηνυμάτων από Συσκευή</string>

res/values-es/strings.xml

@@ -734,7 +734,6 @@
     <string name="emoji_symbols">Símbolos</string>
     <string name="emoji_flags">Banderas</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Borrar mensajes antiguos</string>
     <string name="autodel_device_title">Borrar mensajes del dispositivo</string>

res/values-fa/strings.xml

@@ -726,7 +726,6 @@ https://meet.jit.si/$ROOM
     <string name="emoji_symbols">نمادها</string>
     <string name="emoji_flags">پرچم‌ها</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">پاک کردن پیام‌های قدیمی</string>
     <string name="autodel_device_title">پاک کردن پیام‌ها از دستگاه</string>

res/values-fi/strings.xml

@@ -674,7 +674,6 @@
     <string name="emoji_symbols">Symbolit</string>
     <string name="emoji_flags">Liput</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Poista vanhat viestit</string>
     <string name="autodel_device_title">Poista viestit laitteelta</string>

res/values-fr/strings.xml

@@ -735,7 +735,6 @@
     <string name="emoji_symbols">Symboles</string>
     <string name="emoji_flags">Drapeaux</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Supprimer les anciens messages</string>
     <string name="autodel_device_title">Supprimer les messages de l\'appareil</string>

res/values-gl/strings.xml

@@ -681,7 +681,6 @@
     <string name="emoji_symbols">Símbolos</string>
     <string name="emoji_flags">Bandeiras</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Eliminar mensaxes antigas</string>
     <string name="autodel_device_title">Borrar mensaxes do dispositivo</string>

res/values-it/strings.xml

@@ -735,7 +735,6 @@
     <string name="emoji_symbols">Simboli</string>
     <string name="emoji_flags">Bandiere</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Elimina i Vecchi Messaggi</string>
     <string name="autodel_device_title">Elimina Messaggi dal Dispositivo</string>

res/values-ja/strings.xml

@@ -528,7 +528,6 @@ https://delta.chat</string>
     <string name="emoji_symbols">シンボル</string>
     <string name="emoji_flags">フラッグ</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">古いメッセージの削除</string>
     <string name="autodel_device_title">端末からメッセージを削除する</string>

res/values-km/strings.xml

@@ -608,7 +608,6 @@
     <string name="emoji_symbols">និមិត្តសញ្ញា</string>
     <string name="emoji_flags">ទង់ជាតិ</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">លុបសារចាស់</string>
     <string name="autodel_device_title">លុបសារពីឧបករណ៍</string>

res/values-lt/strings.xml

@@ -597,7 +597,6 @@
     <string name="emoji_symbols">Simboliai</string>
     <string name="emoji_flags">Vėliavos</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Ištrinti senas žinutes</string>
     <string name="autodel_device_title">Ištrinti žinutes iš įrenginio</string>

res/values-nl/strings.xml

@@ -720,7 +720,6 @@
     <string name="emoji_symbols">Symbolen</string>
     <string name="emoji_flags">Vlaggen</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Oude berichten verwijderen</string>
     <string name="autodel_device_title">Berichten verwijderen van apparaat</string>

res/values-pl/strings.xml

@@ -750,7 +750,6 @@
     <string name="emoji_symbols">Symbole</string>
     <string name="emoji_flags">Flagi</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Usuwanie starych wiadomości</string>
     <string name="autodel_device_title">Usuń wiadomości z urządzenia</string>

res/values-pt-rBR/strings.xml

@@ -734,7 +734,6 @@
     <string name="emoji_symbols">Símbolos</string>
     <string name="emoji_flags">Bandeiras</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Apagar mensagens antigas</string>
     <string name="autodel_device_title">Apagar mensagens do dispositivo</string>

res/values-ru/strings.xml

@@ -750,7 +750,6 @@
     <string name="emoji_symbols">Символы</string>
     <string name="emoji_flags">Флаги</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Удалить старые сообщения</string>
     <string name="autodel_device_title">Удалять сообщения с устройства</string>

res/values-sk/strings.xml

@@ -700,7 +700,6 @@
     <string name="emoji_symbols">Symboly</string>
     <string name="emoji_flags">Vlajky</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Odstraňovať staré správy</string>
     <string name="autodel_device_title">Odstráňte správy zo zariadenia</string>

res/values-sq/strings.xml

@@ -717,7 +717,6 @@
     <string name="emoji_symbols">Simbole</string>
     <string name="emoji_flags">Flamuj</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Fshiji mesazhet e vjetër</string>
     <string name="autodel_device_title">Fshini mesazhe prej pajisjes</string>

res/values-sr/strings.xml

@@ -701,7 +701,6 @@
     <string name="emoji_symbols">Симболи</string>
     <string name="emoji_flags">Заставе</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Избриши старе поруке</string>
     <string name="autodel_device_title">Избриши поруке са уређаја</string>

res/values-tr/strings.xml

@@ -720,7 +720,6 @@
     <string name="emoji_symbols">Semboller</string>
     <string name="emoji_flags">Bayraklar</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Eski İletileri Sil</string>
     <string name="autodel_device_title">İletileri Aygıttan Sil</string>

res/values-uk/strings.xml

@@ -31,6 +31,7 @@
     <string name="back">Назад</string>
     <string name="verified">Підтверджено</string>
     <string name="close">Закрити</string>
+    <string name="close_window">Закрити вікно</string>
     <string name="forward">Переслати</string>
     <!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
     <string name="resend">Відправити знову</string>
@@ -749,7 +750,6 @@
     <string name="emoji_symbols">Символи</string>
     <string name="emoji_flags">Прапори</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">Видалити старі повідомлення</string>
     <string name="autodel_device_title">Видалити повідомлення з пристрою</string>

res/values-zh-rCN/strings.xml

@@ -705,7 +705,6 @@
     <string name="emoji_symbols">符号</string>
     <string name="emoji_flags">旗帜</string>
 
-
     <!-- automatically delete message -->
     <string name="delete_old_messages">删除旧消息</string>
     <string name="autodel_device_title">从设备删除消息</string>

res/values/strings.xml

@@ -644,8 +644,8 @@
     <string name="pref_manage_keys">Manage Keys</string>
     <string name="pref_use_system_emoji">Use System Emoji</string>
     <string name="pref_use_system_emoji_explain">Turn off Delta Chat\'s built-in emoji support</string>
-    <string name="pref_use_builtin_camera">Use Built-In Camera</string>
-    <string name="pref_use_builtin_camera_explain">Built-in camera usually has less features</string>
+    <string name="pref_use_inapp_camera">Use In-App Camera</string>
+    <string name="pref_use_inapp_camera_explain">In-app camera usually has less features than the system camera</string>
     <string name="pref_app_access">App Access</string>
     <string name="pref_chats">Chats</string>
     <string name="pref_in_chat_sounds">In-Chat Sounds</string>
@@ -723,7 +723,6 @@
     <string name="emoji_flags">Flags</string>
 
     <!-- Reactions -->
-    <string name="ReactionsConversationView_plus">+%1$d</string>
     <string name="reactions_details_title">Reactions</string>
 
     <!-- automatically delete message -->
@@ -900,6 +899,7 @@
     <string name="contact_not_verified">Cannot verify %1$s.</string>
     <!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that verified the contact shown. -->
     <string name="verified_by">Verified by %1$s</string>
+    <string name="verified_by_you">Verified by you</string>
     <!-- translators: "setup" is the "encryption setup" here, as in "Autocrypt Setup Message" -->
     <string name="contact_setup_changed">Changed setup for %1$s.</string>
     <string name="verified_group_explain">Verified groups (experimental) provide safety against active attacks. Members are verified with a second factor by other members and messages are always end-to-end-encrypted.</string>

res/xml/preferences_advanced.xml

@@ -61,8 +61,8 @@
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_builtin_camera"
-            android:title="@string/pref_use_builtin_camera"
-            android:summary="@string/pref_use_builtin_camera_explain"/>
+            android:title="@string/pref_use_inapp_camera"
+            android:summary="@string/pref_use_inapp_camera_explain"/>
     </PreferenceCategory>
 
 

src/com/b44t/messenger/DcContact.java

@@ -58,7 +58,6 @@ public class DcContact {
     public native boolean wasSeenRecently();
     public native boolean isBlocked      ();
     public native boolean isVerified     ();
-    public native String  getVerifierAddr();
     public native int     getVerifierId  ();
 
     // working with raw c-data

src/org/thoughtcrime/securesms/ProfileSettingsAdapter.java

@@ -313,9 +313,15 @@ public class ProfileSettingsAdapter extends RecyclerView.Adapter
       itemDataContact = dcContact;
       if (!chatIsDeviceTalk) {
         if (dcContact.isVerified()) {
-          String verifiedInfo = context.getString(R.string.verified);
-          if (!dcContact.getVerifierAddr().isEmpty()) {
-            verifiedInfo = context.getString(R.string.verified_by, dcContact.getVerifierAddr());
+          int verifierId = dcContact.getVerifierId();
+
+          String verifiedInfo;
+          if (verifierId == DcContact.DC_CONTACT_ID_SELF) {
+            verifiedInfo = context.getString(R.string.verified_by_you);
+          } else if (verifierId != 0) {
+            verifiedInfo = context.getString(R.string.verified_by, dcContext.getContact(verifierId).getAddr());
+          } else {
+            verifiedInfo = context.getString(R.string.verified);
           }
           itemData.add(new ItemData(ItemData.CATEGORY_INFO, INFO_VERIFIED, verifiedInfo, 0, R.drawable.ic_verified));
         }

src/org/thoughtcrime/securesms/ProfileSettingsFragment.java

@@ -240,7 +240,7 @@ public class ProfileSettingsFragment extends Fragment
     DcContact dcContact = dcContext.getContact(contactId);
     if (dcContact.isVerified()) {
       int verifierId = dcContact.getVerifierId();
-      if (verifierId != 0 && verifierId != contactId) {
+      if (verifierId != 0 && verifierId != DcContact.DC_CONTACT_ID_SELF && verifierId != contactId) {
         Intent intent = new Intent(getContext(), ProfileActivity.class);
         intent.putExtra(ProfileActivity.CONTACT_ID_EXTRA, verifierId);
         startActivity(intent);

src/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java

@@ -109,7 +109,7 @@ public class ReactionsConversationView extends LinearLayout {
     } else {
       emojiView.setVisibility(GONE);
       spacer.setVisibility(GONE);
-      countView.setText(context.getString(R.string.ReactionsConversationView_plus, reaction.getCount()));
+      countView.setText("+" + reaction.getCount());
     }
 
     if (reaction.isFromSelf()) {