Add option to reset a user's encryption key.

MessengerProj/build.gradle

@@ -129,7 +129,7 @@ android {
     defaultConfig {
         minSdkVersion 14 // 14: Android 4.0 Ice Cream Sandwich 2011 (Telegram default), 21: Android 5.0 Lollipop 2014 (recommended for InstantRun)
         targetSdkVersion 23
-        versionName "0.1.13"
+        versionName "0.1.14"
     }
 }
 

MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java

@@ -125,7 +125,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
     private AvatarUpdater avatarUpdater;
     private int[] sortedUserIds;
 
-    private final static int ID_BLOCK_CONTACT = 2;
+    private final static int ID_STOP_ENCRYPTION_FOR_THIS_USER = 2;
+    private final static int ID_BLOCK_CONTACT = 3;
     private final static int ID_DELETE_CONTACT = 5;
     private final static int ID_INVITE_TO_GROUP = 9;
     private final static int ID_ADD_SHORTCUT = 14;
@@ -261,7 +262,13 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                 }
                 if (id == -1) {
                     finishFragment();
-                } else if (id == ID_BLOCK_CONTACT) {
+                }
+                else if( id==ID_STOP_ENCRYPTION_FOR_THIS_USER )
+                {
+                    Toast.makeText(getParentActivity(), LocaleController.getString("NotYetImplemented", R.string.NotYetImplemented), Toast.LENGTH_SHORT).show();
+                }
+                else if (id == ID_BLOCK_CONTACT)
+                {
                     if( userBlocked() ) {
                         MrMailbox.blockContact(user_id, 0);
                         finishFragment(); /* got to the parent, this is important eg. when editing blocking in the BlockedUserActivitiy. Moreover, this saves us updating all the states in the profile */
@@ -279,7 +286,9 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                         builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
                         showDialog(builder.create());
                     }
-                } else if (id == ID_DELETE_CONTACT) {
+                }
+                else if (id == ID_DELETE_CONTACT)
+                {
                     AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
                     builder.setMessage(LocaleController.getString("AreYouSureDeleteContact", R.string.AreYouSureDeleteContact));
                     builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() {
@@ -295,7 +304,9 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                     });
                     builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
                     showDialog(builder.create());
-                } else if (id == ID_ADD_SHORTCUT) {
+                }
+                else if (id == ID_ADD_SHORTCUT)
+                {
                     try {
                         // draw avatar into a bitmap
                         int wh = avatarImage.imageReceiver.getImageWidth();
@@ -1188,6 +1199,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
         }
 
         if (user_id != 0) {
+            item.addSubItem(ID_STOP_ENCRYPTION_FOR_THIS_USER, LocaleController.getString("ResetUserKey", R.string.ResetUserKey), 0);
             item.addSubItem(ID_BLOCK_CONTACT, userBlocked()? LocaleController.getString("UnblockContact", R.string.UnblockContact) : LocaleController.getString("BlockContact", R.string.BlockContact), 0);
             item.addSubItem(ID_DELETE_CONTACT, LocaleController.getString("DeleteContact", R.string.DeleteContact), 0);
         }

MessengerProj/src/main/res/values-de/strings.xml

@@ -75,7 +75,7 @@
     <string name="ReplyToUser">%1$s antworten</string>
     <string name="NotificationMessagesPeopleDisplayOrder">%1$s %2$s</string>
     <!--contacts view-->
-    <string name="NoContacts">Noch keine Kontakte</string>
+    <string name="NoContacts">Keine Benutzer.</string>
     <string name="TodayAt">um</string>
     <string name="YesterdayAt">gestern um</string>
     <string name="LastSeen">zul. online</string>
@@ -530,7 +530,7 @@
     <string name="InviteText">Ich verwende nun auch den Delta Chat Messenger - %1$s - und bin dort unter %2$s erreichbar.</string>
     <string name="AdvancedSettings">Fortgeschrittene Einstellungen</string>
     <string name="CannotConnect"></string>
-    <string name="AskResetNotifications">Alle Benachrichtigungseinstellungen und Töne dieser Seite, der Kontakte und der Gruppen zurücksetzen?</string>
+    <string name="AskResetNotifications">Alle Benachrichtigungseinstellungen und Töne dieser Seite und auch der einzelnen Chats zurücksetzen?</string>
     <string name="AttachFiles">Dateien anhängen</string>
     <string name="ErrGroupNameEmpty">Bitte einen Namen für die Gruppe eingeben.</string>
     <string name="MsgNewGroupDraft">Hallo, ich habe die Gruppe \"##\" für uns erstellt.</string>
@@ -548,4 +548,5 @@
     <string name="SendNRcvReadReceipts">Lesebestätigungen empfangen/senden</string>
     <string name="E2EManagePrivateKeys">Private Schlüssel verwalten</string>
     <string name="E2ECompareKeys">Schlüssel vergleichen</string>
+    <string name="ResetUserKey">Benutzerschlüssel zurücksetzen</string>
 </resources>

MessengerProj/src/main/res/values/strings.xml

@@ -75,7 +75,7 @@
     <string name="ReplyToUser">Reply to %1$s</string>
     <string name="NotificationMessagesPeopleDisplayOrder">%1$s %2$s</string>
     <!--contacts view-->
-    <string name="NoContacts">No contacts yet</string>
+    <string name="NoContacts">No users yet.</string>
     <string name="TodayAt">at</string>
     <string name="YesterdayAt">yesterday at</string>
     <string name="LastSeen">last seen</string>
@@ -93,8 +93,8 @@
     <!--contact info view-->
     <string name="ShareContact">Share</string>
     <string name="AddContact">Add</string>
-    <string name="NewContactTitle">New contact</string>
-    <string name="BlockContact">Block contact</string>
+    <string name="NewContactTitle">New user</string>
+    <string name="BlockContact">Block user</string>
     <string name="DeleteContact">Delete user</string>
     <string name="Info">Info</string>
     <!--stickers view-->
@@ -114,7 +114,7 @@
     <!--settings view-->
     <string name="TextSize">Messages font size</string>
     <string name="EnableAnimations">Transition animation</string>
-    <string name="UnblockContact">Unblock contact</string>
+    <string name="UnblockContact">Unblock user</string>
     <string name="NoBlocked">No blocked users yet</string>
     <string name="NormalMessages">Normal messages</string>
     <string name="Alert">Alert</string>
@@ -126,7 +126,7 @@
     <string name="Reset">Reset</string>
     <string name="ResetAllNotifications">Reset all notifications</string>
     <string name="NotificationsAndSounds">Notifications and sounds</string>
-    <string name="BlockedUsers">Blocked contacts</string>
+    <string name="BlockedUsers">Blocked users</string>
     <string name="Default">Default</string>
     <string name="OnlyIfSilent">Only if silent</string>
     <string name="ChatBackground">Chat background</string>
@@ -548,4 +548,5 @@
     <string name="E2EEncryption">End-to-end-encryption</string>
     <string name="E2EManagePrivateKeys">Manage private keys</string>
     <string name="E2ECompareKeys">Compare keys</string>
+    <string name="ResetUserKey">Reset user\'s key</string>
 </resources>