bump version

enable STATIC_LOGIN mech

.github/CONTRIBUTING.md

@@ -0,0 +1,25 @@
+# Thank you for contributing to Delta Chat.
+
+Delta Chat is divided in two parts: Android and [Core](https://github.com/deltachat/deltachat-core).
+
+In short, the Android part is about the User Interface. The Interface is translated using [Transifex](https://www.transifex.com/delta-chat/delta-chat-android). The Core part is about handling the connection to the mail server and the chat or e-mail messages as well as providing secure communication by using [Autocrypt](https://autocrypt.org/en/latest/).
+
+Delta Chat Core is used in the Android and in the [iOS](https://github.com/deltachat/deltachat-ios) version.
+
+Please try to create your issue to the respective Issue tracker: Here, or in [Core](https://github.com/deltachat/deltachat-core/issues). Don't worry, if you are not sure. The issue will be handled anyway.
+
+If you intend to create a **feature request** for Delta Chat, please check the exiting requests for
+* [Android](https://github.com/deltachat/deltachat-android/issues?q=is%3Aissue+label%3A%22feature+request%22+sort%3Aupdated-desc) and
+* [Core](https://github.com/deltachat/deltachat-core/issues?q=is%3Aissue+label%3A%22feature+request%22+sort%3Aupdated-desc) 
+
+first.
+
+If you intend to send a **bug report** for Delta Chat, search for bugs (including closed) in
+* [Android](https://github.com/deltachat/deltachat-android/issues?&q=is%3Aissue) and
+* [Core](https://github.com/deltachat/deltachat-core/issues?&q=is%3Aissue)
+
+A **bug** is a reproducable misbehaviour, when something happens but something else should happen instead. 
+
+Did you know there is a [Help](https://delta.chat/en/help) page for Delta Chat?
+
+To ask questions, you are invited to join our IRC channel **#deltachat** on [Freenode](https://webchat.freenode.net/?uio=MTE9MjA16a&channels=%23deltachat).

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,34 @@
+_Please read the guidelines linked above, especially when you are a first time contributor. Remove this text and provide some basic informations below, if applicable. Remove template content that is not applicable._
+
+**Delta Chat version**
+
+See settings dialog …
+
+**Expected behavior**
+
+What is the expected output?
+
+**Actual behavior**
+
+What do you see instead?
+
+**Steps to reproduce the problem**
+
+1. …
+2. …
+
+**Screen snapshots**
+
+If applicable …
+
+**Debug logs**
+
+If applicable, debug logs can be copied from within the Delta Chat app: 
+
+Open the _Settings_ menu -> _About_ -> _version number|Info_.
+
+Alternatively from the Android system log:
+
+` adb logcat -v time -s DeltaChat `
+
+This log contains private data (e.g. mail address, provider information) which shall be removed or anonymised prior to posting.

.gitignore

@@ -9,3 +9,6 @@ libs/
 
 # ignore private scripts and directories, eg. local2github.prv.sh
 *.prv*
+
+# transifex temporary files
+tools/translations/

CHANGELOG.md

@@ -1,5 +1,148 @@
 # Delta Chat Changelog
 
+## v0.17.2
+2018-05-15
+
+* Fix problem with adding formerly uncontacted members to groups
+* Unblock manually blocked members when they are created manually as contact again
+
+## v0.17.1
+2018-05-11
+
+* Improve QR code scanning screens
+* Add a labs-option to disabled the new QR logo overlay
+* Update Russian translations
+
+## v0.17.0
+2018-05-07
+
+* Show shared chats in user profiles
+* If a contact has changed his encryption setups, this is shown as a system messages in the middle of the chat view
+* Show added group members, changed group titles etc. as system messages
+* Show direct buttons to create a new group or contact in the "New Chat" dialog
+* Improve "Add contact" dialog
+* Move subject and most chat metadata to the encrypted part following the "Memoryhole" proposal
+* Show read-timestamps in message info
+* Do not add contacts from Bcc to group-memberlist to avoid privacy leaks and to get a unique memberlist for all group-members
+* In a mail contains plaintext and encrypted parts, the whole mail is treated as not being encrypted correctly
+* Restructure settings and advanced settings
+* Fix problems with Office 365 and similar services
+* Fix a problem where incoming messages are shown as being sent by oneself
+* Experimental QR code scanning options can be enabled in the advanced settings
+* Update Albanian, Catalan, Dutch, French, German, Italian, Norwegian, Polish, Russian, Spanish, Turkish and Ukrainian translations
+* Add Basque translation
+* Add Chinese translation
+* Add Japanese translation
+
+## v0.16.0
+2018-03-19
+
+* Messages from normal clients to more than one recipient create an implicit "ad-hoc group"
+* Allow group creation though contact requests
+* Always display the _sending_ time in the chat list; the list itself is sorted by _receiving_ time and "Message info" shows both times now
+* If parts but the footnote are cut from mails, this is indicated "..."; use "Message info" to get the full text
+* Highlight the subject in the "Message info"
+* Autoconfigure prefers 'https' over 'http'
+* Bug fixes, eg. avoid freezes if the connection is lost
+* Update Russian, Tamil and Turkish translations
+
+This version requires access to the camera for upcoming QR code scanning options which can be tested already in this version, see commit
+[74ffbf4](https://github.com/deltachat/deltachat-android/commit/74ffbf48befbb0416337673d73d9f2482728cac6).
+
+## v0.15.0
+2018-02-27
+
+* Render the waveform for voice messages
+* Fix problems with voice messages on various devices
+* Improve deletion of message that were moved around by another e-mail client
+* Really delete messages on the server, do not only mark them for deletion
+* Ignore subsequent keys or blocks in OpenPGP files
+* Leave incoming Autocrypt Setup Messages in the inbox so that any number of other e-mail-clients can process them
+* Avoid messages sent to the "Me" chat appearing twice in other e-mail clients
+* Update Albanian translation
+
+## v0.14.0
+2018-02-20
+
+* Evaluate gossiped keys
+* Option to transfer the Autocrypt Setup to another device or e-mail client
+* Accept Autocrypt Setup transferred from other devices or e-mail client
+* Send any data from device to device using the chat "Me - Messages I sent to myself"
+* Do not send messages when there is an access error
+* Request for contact permissions only once
+* Bug fixes
+* Update French and Turkish translations
+
+## v0.13.0
+2018-01-18
+
+* Reply encrypted if the sender has enabled encryption manually (esp. useful when chatting with clients as K-9 or Enigmail)
+* Update welcome screen graphics
+* Update Norwegian, Russian and Turkish translations
+
+## v0.12.0
+2018-01-07
+
+* Gossip keys of other group members in the encrypted payload (will also be evaluated in one of the next versions)
+* Use SHA-256 instead of SHA-1 in signatures
+* Make the permanent notification clickable
+* Update permanent notification after import
+* Fix rendering of system messages
+* Various bug fixes
+* Update Albanian, French, Italian, Norwegian, Polish, Russian and Turkish translations
+
+## v0.11.4
+2017-12-17
+
+* Add option to initiate Autocrypt Key Transfer
+* Connect after importing a backup
+* Reading memory hole headers
+* Add Albanian translation
+* Update German, Italian, Polish, Portuguese, Russian, Turkish and Ukrainian translations
+
+## v0.10.0
+2017-11-29
+
+* Fix usage of multiple private keys
+* Fix various memory leaks
+* Update English, Portuguese and Turkish translations
+
+## v0.9.9
+2017-11-18
+
+* Alternate include order for F-Droid
+* Add Serbian translation
+* Update Catalan, Dutch, English, French, German, Hungarian, Italian, Polish, Portuguese, Russian, Spanish, Tamil, Telugu and Ukrainian translations
+
+## v0.9.8
+2017-11-15
+
+* Fix a bug that avoids chat creation under some circumstances (bug introduced in 0.9.7)
+
+## v0.9.7
+2017-11-14
+
+* Archive chats or delete chats by a long press
+* Notify the user in the chatlist about contact requests of known users or of other Delta Chat clients
+* Show messages only for explicitly wanted chats
+* Show more detailed reasons about failed end-to-end-encryptions
+* Explicit option to leave a group
+* Do not show the padlock if end-to-end-encryption is disabled by the user
+* Also import images from a backup when using a different device with different paths
+* Add copy-to-clipboard function for "About / Info"
+* Rework Emoji-code
+* Add Norwegian Bokmål translation
+* Add Tamil translation
+* Add Turkish translation
+* Update Catalan, German, French, Italian, Korean, Dutch, Polish, Portuguese, Russian, Telugu and Ukrainian translations
+
+## v0.9.6
+2017-10-18
+
+* Support keys generated with multiple subkeys eg. from K-9
+* Show PDFs and other attachments with bad names
+* Bug fixes
+
 ## v0.9.5
 2017-10-08
 

MessengerProj/build.gradle

@@ -27,12 +27,14 @@ dependencies {
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.googlecode.mp4parser:isoparser:1.0.6'
     compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
+    compile 'com.google.zxing:core:3.3.0'
+    compile 'com.journeyapps:zxing-android-embedded:3.4.0'
     compile fileTree(dir: "$buildDir/native-libs", include: 'native-libs.jar')
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 25       // should be ...
+    buildToolsVersion '25.0.2' // ... in sync unless you know exactly what you're doing
 
     useLibrary 'org.apache.http.legacy'
     defaultConfig.applicationId = "com.b44t.messenger"
@@ -79,13 +81,12 @@ android {
         }
     }
 
-    defaultConfig.versionCode = 44
-
     sourceSets.main {
         jniLibs.srcDir 'libs'
         jni.srcDirs = [] //disable automatic ndk-build call
     }
 
+    flavorDimensions "none"
     productFlavors {
         /*
         x86 {
@@ -108,19 +109,22 @@ android {
         }
         */
         fat {
-            versionCode = 3
+            dimension "none"
+            //versionCode = 3
         }
     }
 
-    applicationVariants.all { variant ->
+    /*applicationVariants.all { variant ->
         def abiVersion = variant.productFlavors.get(0).versionCode
         variant.mergedFlavor.versionCode = defaultConfig.versionCode * 10 + abiVersion;
-    }
+    }*/
 
     defaultConfig {
         minSdkVersion 14     // 14: Android 4.0 Ice Cream Sandwich 2011 (Telegram default), 21: Android 5.0 Lollipop 2014 (recommended for InstantRun)
         targetSdkVersion 25  // 25: Nougat. CAVE: Do NOT target "Andoid O" without checking the background tasks carefully, see https://developer.android.com/preview/behavior-changes.html#back-all . As long as we target "Nougat", everything works as expected even for "Andoid O" or later
                              // in general, we should not change the target without reason; eg. after the switch to Nougat, the camera stops working (see https://inthecheesefactory.com/blog/how-to-share-access-to-file-with-fileprovider-on-android-nougat/en )
-        versionName "0.9.5"  // do NOT forget to increase defaultConfig.versionCode!
+
+        versionName "0.17.2" // do NOT forget to increase defaultConfig.versionCode!
+        versionCode 519
     }
 }

MessengerProj/jni/Android.mk

@@ -1633,35 +1633,42 @@ LOCAL_SRC_FILES     += \
 ./messenger-backend/libs/netpgp/src/writer.c \
 ./messenger-backend/src/mraheader.c \
 ./messenger-backend/src/mrapeerstate.c \
+./messenger-backend/src/mrarray.c \
 ./messenger-backend/src/mrchat.c \
 ./messenger-backend/src/mrchatlist.c \
-./messenger-backend/src/mrcmdline.c \
 ./messenger-backend/src/mrcontact.c \
 ./messenger-backend/src/mrdehtml.c \
+./messenger-backend/src/mrhash.c \
 ./messenger-backend/src/mrimap.c \
 ./messenger-backend/src/mrjob.c \
 ./messenger-backend/src/mrkey.c \
 ./messenger-backend/src/mrkeyring.c \
 ./messenger-backend/src/mrloginparam.c \
+./messenger-backend/src/mrlot.c \
 ./messenger-backend/src/mrmailbox.c \
 ./messenger-backend/src/mrmailbox_configure.c \
+./messenger-backend/src/mrmailbox_connect.c \
 ./messenger-backend/src/mrmailbox_e2ee.c \
 ./messenger-backend/src/mrmailbox_imex.c \
+./messenger-backend/src/mrmailbox_keyhistory.c \
 ./messenger-backend/src/mrmailbox_log.c \
-./messenger-backend/src/mrmailbox_tools.c \
+./messenger-backend/src/mrmailbox_qr.c \
+./messenger-backend/src/mrmailbox_receive_imf.c \
+./messenger-backend/src/mrmailbox_securejoin.c \
 ./messenger-backend/src/mrmimefactory.c \
 ./messenger-backend/src/mrmimeparser.c \
 ./messenger-backend/src/mrmsg.c \
-./messenger-backend/src/mrosnative.c \
 ./messenger-backend/src/mrparam.c \
 ./messenger-backend/src/mrpgp.c \
-./messenger-backend/src/mrpoortext.c \
 ./messenger-backend/src/mrsaxparser.c \
 ./messenger-backend/src/mrsimplify.c \
 ./messenger-backend/src/mrsmtp.c \
 ./messenger-backend/src/mrsqlite3.c \
 ./messenger-backend/src/mrstock.c \
+./messenger-backend/src/mrtoken.c \
 ./messenger-backend/src/mrtools.c \
+./messenger-backend/src/mruudecode.c \
+./messenger-backend/cmdline/cmdline.c \
 ./mrwrapper.c
 
 include $(BUILD_SHARED_LIBRARY)

MessengerProj/jni/cyrussasl/include/sasl/config.h

@@ -403,7 +403,7 @@
 /* #undef STATIC_LDAPDB */
 
 /* Link LOGIN Staticly */
-/* #undef STATIC_LOGIN */
+#define STATIC_LOGIN
 
 /* Link NTLM Staticly */
 /* #undef STATIC_NTLM */

MessengerProj/src/main/AndroidManifest.xml

@@ -41,7 +41,7 @@
     <uses-permission android:name="android.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <!-- <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" /> - required for AndroidUtilities.uninstallShortcut() -->
-    <!-- <uses-permission android:name="android.permission.CAMERA" /> - also disabled in T'gram; we're using the camera via an intent only -->
+    <uses-permission android:name="android.permission.CAMERA" /> <!-- needed for qr code scanning, not needed for taking photos (we're using an intent for this) -->
 
     <application
         android:name=".ApplicationLoader"
@@ -53,7 +53,7 @@
         android:supportsRtl="true">
 
         <activity
-            android:name="com.b44t.ui.LaunchActivity"
+            android:name=".LaunchActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan">
@@ -105,10 +105,24 @@
                 <category android:name="android.intent.category.BROWSABLE"/>
             </intent-filter>
         </activity>
+
         <activity
-            android:name="com.b44t.ui.WelcomeActivity"
+            android:name=".WelcomeActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
         </activity>
+
+        <activity
+            android:name=".QRshowActivity"
+            android:theme="@style/Theme.MessengerProj.AppCompat"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+        </activity>
+
+        <activity
+            android:name=".QRscanActivity"
+            android:theme="@style/Theme.MessengerProj.AppCompat"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+        </activity>
+
         <activity
             android:name="com.b44t.messenger.OpenChatReceiver"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"

MessengerProj/src/main/java/com/b44t/messenger/ActionBar/ActionBar.java

@@ -21,14 +21,13 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.view.Gravity;
@@ -40,7 +39,7 @@ import android.widget.ImageView;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
 import com.b44t.messenger.ApplicationLoader;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;
 
 import java.util.ArrayList;
 
@@ -72,7 +71,6 @@ public class ActionBar extends FrameLayout {
     private boolean interceptTouches = true;
     private AnimatorSet actionModeAnimation;
 
-    private boolean allowOverlayTitle;
     private CharSequence lastTitle;
     private boolean castShadows = true;
 
@@ -542,10 +540,6 @@ public class ActionBar extends FrameLayout {
         }
     }
 
-    public void setAllowOverlayTitle(boolean value) {
-        allowOverlayTitle = value;
-    }
-
     public boolean isSearchFieldVisible() {
         return isSearchFieldVisible;
     }

MessengerProj/src/main/java/com/b44t/messenger/ActionBar/ActionBarLayout.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -49,7 +49,7 @@ import android.widget.LinearLayout;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.R;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;
 
 import java.util.ArrayList;
 

MessengerProj/src/main/java/com/b44t/messenger/ActionBar/ActionBarMenu.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -32,7 +32,7 @@ import android.widget.Toast;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class ActionBarMenu extends LinearLayout {
 
@@ -104,6 +104,7 @@ public class ActionBarMenu extends LinearLayout {
                     case R.drawable.photo_tools:       hint = ApplicationLoader.applicationContext.getString(R.string.EditImage); break;
                     case R.drawable.ic_ab_search:      hint = ApplicationLoader.applicationContext.getString(R.string.Search); break;
                     case R.drawable.ic_ab_lock_screen: hint = ApplicationLoader.applicationContext.getString(R.string.Passcode); break;
+                    case R.drawable.ic_ab_qr:          hint = ApplicationLoader.applicationContext.getString(R.string.QrScan); break;
                 }
                 if( hint != null ) {
                     if( s_menuItemHint != null ) {

MessengerProj/src/main/java/com/b44t/messenger/ActionBar/ActionBarMenuItem.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -47,9 +47,7 @@ import android.widget.TextView;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.LayoutHelper;
-
-import java.lang.reflect.Field;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class ActionBarMenuItem extends FrameLayout {
 
@@ -214,7 +212,7 @@ public class ActionBarMenuItem extends FrameLayout {
         subMenuOpenSide = side;
     }
 
-    public TextView addSubItem(int id, String text, int icon) {
+    public TextView addSubItem(int id, String text) {
         if (popupLayout == null) {
             rect = new Rect();
             location = new int[2];
@@ -251,15 +249,6 @@ public class ActionBarMenuItem extends FrameLayout {
         textView.setMinWidth(AndroidUtilities.dp(196));
         textView.setTag(id);
         textView.setText(text);
-        if (icon != 0) {
-            textView.setCompoundDrawablePadding(AndroidUtilities.dp(12));
-            if (!LocaleController.isRTL) {
-                textView.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(icon), null, null, null);
-            } else {
-                textView.setCompoundDrawablesWithIntrinsicBounds(null, null, getResources().getDrawable(icon), null);
-            }
-        }
-        //popupLayout.setShowedFromBotton(showFromBottom);
         popupLayout.addView(textView);
         LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) textView.getLayoutParams();
         layoutParams.gravity = Gravity.START;

MessengerProj/src/main/java/com/b44t/messenger/ActionBar/ActionBarPopupWindow.java

@@ -23,7 +23,7 @@
 
 //Thanks to https://github.com/JakeWharton/ActionBarSherlock/
 
-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -44,7 +44,7 @@ import android.widget.ScrollView;
 
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;

MessengerProj/src/main/java/com/b44t/messenger/ActionBar/BackDrawable.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;
 
 import android.graphics.Canvas;
 import android.graphics.Color;

MessengerProj/src/main/java/com/b44t/messenger/ActionBar/BaseFragment.java

@@ -21,9 +21,8 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;
 
-import android.animation.AnimatorSet;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
@@ -308,7 +307,7 @@ public class BaseFragment {
         }
         try {
             visibleDialog = dialog;
-            visibleDialog.setCanceledOnTouchOutside(true);
+            //visibleDialog.setCanceledOnTouchOutside(true); -- we do overwrite this from time to time manually, eg. for showing the setup code. so, not all dialogs should be cancelled when touching outside!
             visibleDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
                 @Override
                 public void onDismiss(DialogInterface dialog) {

MessengerProj/src/main/java/com/b44t/messenger/ActionBar/BottomSheet.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -60,7 +60,7 @@ import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
 import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;
 
 import java.util.ArrayList;
 

MessengerProj/src/main/java/com/b44t/messenger/ActionBar/SimpleTextView.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;
 
 import android.content.Context;
 import android.graphics.Canvas;

MessengerProj/src/main/java/com/b44t/messenger/ActionBar/Theme.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.ActionBar;
+package com.b44t.messenger.ActionBar;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -39,7 +39,7 @@ import android.os.Build;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.ChatAttachAlert;
+import com.b44t.messenger.Components.ChatAttachAlert;
 
 public class Theme {
 
@@ -60,22 +60,17 @@ public class Theme {
 
     public static final int ATTACH_SHEET_TEXT_COLOR = 0xff757575;
 
-    public static final int DIALOGS_TITLE_TEXT_COLOR = 0xff000000;
-    public static final int DIALOGS_MESSAGE_TEXT_COLOR = 0xff8f8f8f;
-    public static final int DIALOGS_NAME_TEXT_COLOR = 0xff555555;
-    public static final int DIALOGS_SELF_TEXT_COLOR = 0xff00a60e; // from encrypted chat title: 0xff00a60e, alternative: 0xff3c912e
-    public static final int DIALOGS_PRINTING_TEXT_COLOR = 0xff4d83b3;
-    public static final int DIALOGS_DRAFT_TEXT_COLOR = 0xffdd4b39;
+    public static final int CHATLIST_BACKGROUND_COLOR = 0xffffffff;
+    public static final int CHATLIST_DEADDROP_BACKGROUND_COLOR = 0xffd3d3d3;
+    public static final int CHATLIST_TITLE_TEXT_COLOR = 0xff000000;
+    public static final int CHATLIST_MESSAGE_TEXT_COLOR = 0xff8f8f8f;
+    public static final int CHATLIST_NAME_TEXT_COLOR = 0xff555555;
+    public static final int CHATLIST_SELF_TEXT_COLOR = 0xff00a60e; // from encrypted chat title: 0xff00a60e, alternative: 0xff3c912e
+    public static final int CHATLIST_DRAFT_TEXT_COLOR = 0xffdd4b39;
 
     public static final int CHAT_BOTTOM_OVERLAY_TEXT_COLOR = 0xff7f7f7f;
     public static final int CHAT_EMPTY_VIEW_TEXT_COLOR = 0xffffffff;
 
-    public static final int STICKERS_SHEET_TITLE_TEXT_COLOR = 0xff212121;
-    public static final int STICKERS_SHEET_SEND_TEXT_COLOR = 0xff3a8ccf;
-    public static final int STICKERS_SHEET_ADD_TEXT_COLOR = 0xff3a8ccf;
-    public static final int STICKERS_SHEET_CLOSE_TEXT_COLOR = 0xff3a8ccf;
-    public static final int STICKERS_SHEET_REMOVE_TEXT_COLOR = 0xffcd5a5a;
-
     public static final int MSG_SELECTED_BACKGROUND_COLOR = 0x6633b5e5;
     public static final int MSG_STICKER_NAME_TEXT_COLOR = 0xffffffff;
     public static final int MSG_IN_TIME_N_FWD_TEXT_COLOR = 0xff9ea7b0;
@@ -96,6 +91,8 @@ public class Theme {
     public static final int MSG_AUDIO_SEEKBAR_DARK_COLOR = 0xFFf68751; // same color as in audio-icon, also used for the record-button
     public static final int MSG_AUDIO_SEEKBAR_LITE_COLOR = 0xFFfbc8af;
 
+    public static final int MSG_SYSTEM_CMD_COLOR = MSG_AUDIO_NAME_COLOR; // just the same color, there is no other dependency between system commands and audio messages
+
     public static Drawable backgroundDrawableIn;
     public static Drawable backgroundDrawableInSelected;
     public static Drawable backgroundDrawableOut;

MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java

@@ -61,15 +61,11 @@ import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.webkit.MimeTypeMap;
-import android.widget.AbsListView;
-import android.widget.EdgeEffect;
-import android.widget.EditText;
 import android.widget.ListView;
-import android.widget.TextView;
 import android.widget.Toast;
 
-import com.b44t.ui.Components.ForegroundDetector;
-import com.b44t.ui.Components.TypefaceSpan;
+import com.b44t.messenger.Components.ForegroundDetector;
+import com.b44t.messenger.Components.TypefaceSpan;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -84,9 +80,7 @@ import java.nio.channels.FileChannel;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Hashtable;
 import java.util.Locale;
-import java.util.regex.Pattern;
 
 public class AndroidUtilities {
 
@@ -101,24 +95,6 @@ public class AndroidUtilities {
     public static boolean usingHardwareInput;
     private static int adjustOwnerClassGuid = 0;
 
-    static {
-        try {
-            final String GOOD_IRI_CHAR = "a-zA-Z0-9\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF";
-            final Pattern IP_ADDRESS = Pattern.compile(
-                    "((25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9])\\.(25[0-5]|2[0-4]"
-                            + "[0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1]"
-                            + "[0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}"
-                            + "|[1-9][0-9]|[0-9]))");
-            final String IRI = "[" + GOOD_IRI_CHAR + "]([" + GOOD_IRI_CHAR + "\\-]{0,61}[" + GOOD_IRI_CHAR + "]){0,1}";
-            final String GOOD_GTLD_CHAR = "a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF";
-            final String GTLD = "[" + GOOD_GTLD_CHAR + "]{2,63}";
-            final String HOST_NAME = "(" + IRI + "\\.)+" + GTLD;
-            final Pattern DOMAIN_NAME = Pattern.compile("(" + HOST_NAME + "|" + IP_ADDRESS + ")");
-        } catch (Exception e) {
-
-        }
-    }
-
     static {
         density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
         leftBaseline = 72;
@@ -844,8 +820,8 @@ public class AndroidUtilities {
     public static void openForViewOrShare(Activity activity, int msg_id, String cmd)
     {
         MrMsg msg = MrMailbox.getMsg(msg_id);
-        String path = msg.getParam('f', "");
-        String mimeType = getMimetype(path, msg.getParam('m', "application/octet-stream"));
+        String path = msg.getFile();
+        String mimeType = getMimetype(path, msg.getFilemime());
         try {
             File file = new File(path);
             if( !file.exists() ) {
@@ -916,8 +892,8 @@ public class AndroidUtilities {
 
         MrMsg        msg = MrMailbox.getMsg(msg_id);
         final int    msg_type = msg.getType();
-        String       msg_file_path = msg.getParam('f', "");
-        final String msg_mime = msg.getParam('m', "application/octet-stream");
+        String       msg_file_path = msg.getFile();
+        final String msg_mime = msg.getFilemime();
         final String msg_file_name = msg.getFilename();
         final File sourceFile = new File(msg_file_path);
         if( !sourceFile.exists() ) {

MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java

@@ -24,9 +24,7 @@
 package com.b44t.messenger;
 
 import android.app.Activity;
-import android.app.AlarmManager;
 import android.app.Application;
-import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -40,11 +38,9 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Handler;
 import android.os.PowerManager;
-import android.os.SystemClock;
 import android.util.Log;
 
-import com.b44t.ui.Components.ForegroundDetector;
-import com.b44t.ui.SettingsAdvActivity;
+import com.b44t.messenger.Components.ForegroundDetector;
 
 import java.io.File;
 
@@ -207,9 +203,10 @@ public class ApplicationLoader extends Application {
 
         // make sure, the notifications for the "deaddrop" dialog are muted by default
         SharedPreferences notificationPreferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
-        if( notificationPreferences.getInt("notify2_"+MrChat.MR_CHAT_ID_DEADDROP, 666)==666 ) {
+        if( notificationPreferences.getInt("deaddrop_initialized", 0)!=1 ) {
             SharedPreferences.Editor editor = notificationPreferences.edit();
             editor.putInt("notify2_"+MrChat.MR_CHAT_ID_DEADDROP, 2);
+            editor.putInt("deaddrop_initialized", 1);
             editor.apply();
         }
 
@@ -223,7 +220,7 @@ public class ApplicationLoader extends Application {
 
         // create other default objects
         SharedPreferences mainPreferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
-        fontSize = mainPreferences.getInt("msg_font_size", SettingsAdvActivity.defMsgFontSize());
+        fontSize = mainPreferences.getInt("msg_font_size", SettingsAdvFragment.defMsgFontSize());
 
         ImageLoader.getInstance();
         MediaController.getInstance();

MessengerProj/src/main/java/com/b44t/messenger/AudioSelectActivity.java

@@ -20,7 +20,7 @@
  *
  ******************************************************************************/
 
-package com.b44t.ui;
+package com.b44t.messenger;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -32,24 +32,13 @@ import android.widget.AdapterView;
 import android.widget.FrameLayout;
 import android.widget.ListView;
 
-import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
-import com.b44t.messenger.MediaController;
-import com.b44t.messenger.MessageObject;
-import com.b44t.messenger.MrContact;
-import com.b44t.messenger.NotificationCenter;
-import com.b44t.messenger.ApplicationLoader;
-import com.b44t.messenger.FileLoader;
-import com.b44t.messenger.R;
-import com.b44t.messenger.TLRPC;
-import com.b44t.messenger.Utilities;
-import com.b44t.ui.ActionBar.ActionBar;
-import com.b44t.ui.ActionBar.BaseFragment;
-import com.b44t.ui.Adapters.BaseFragmentAdapter;
-import com.b44t.ui.Cells.AudioCell;
-import com.b44t.ui.Components.EmptyTextProgressView;
-import com.b44t.ui.Components.LayoutHelper;
-import com.b44t.ui.Components.PickerBottomLayout;
+import com.b44t.messenger.ActionBar.ActionBar;
+import com.b44t.messenger.ActionBar.BaseFragment;
+import com.b44t.messenger.Components.BaseFragmentAdapter;
+import com.b44t.messenger.Cells.AudioCell;
+import com.b44t.messenger.Components.EmptyTextProgressView;
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.Components.PickerBottomLayout;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -96,7 +85,6 @@ public class AudioSelectActivity extends BaseFragment implements NotificationCen
     @Override
     public View createView(Context context) {
         actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-        actionBar.setAllowOverlayTitle(true);
         actionBar.setTitle(context.getString(R.string.AttachMusic));
         actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
             @Override
@@ -225,8 +213,7 @@ public class AudioSelectActivity extends BaseFragment implements NotificationCen
                         TLRPC.TL_message message = new TLRPC.TL_message();
                         message.out = true;
                         message.id = id;
-                        message.to_id = new TLRPC.TL_peerUser();
-                        message.to_id.user_id = message.from_id = MrContact.MR_CONTACT_ID_SELF;
+                        message.from_id = MrContact.MR_CONTACT_ID_SELF;
                         message.date = (int) (System.currentTimeMillis() / 1000);
                         message.message = "-1";
                         message.attachPath = audioEntry.path;

MessengerProj/src/main/java/com/b44t/messenger/BlockedUsersActivity.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui;
+package com.b44t.messenger;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -36,18 +36,12 @@ import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.b44t.messenger.ApplicationLoader;
-import com.b44t.messenger.LocaleController;
-import com.b44t.messenger.MrContact;
-import com.b44t.messenger.MrMailbox;
-import com.b44t.messenger.NotificationCenter;
-import com.b44t.messenger.R;
-import com.b44t.ui.Adapters.BaseFragmentAdapter;
-import com.b44t.ui.Cells.UserCell;
-import com.b44t.ui.ActionBar.ActionBar;
-import com.b44t.ui.ActionBar.ActionBarMenu;
-import com.b44t.ui.ActionBar.BaseFragment;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.BaseFragmentAdapter;
+import com.b44t.messenger.Cells.UserCell;
+import com.b44t.messenger.ActionBar.ActionBar;
+import com.b44t.messenger.ActionBar.ActionBarMenu;
+import com.b44t.messenger.ActionBar.BaseFragment;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class BlockedUsersActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, ContactsActivity.ContactsActivityDelegate {
 
@@ -79,7 +73,6 @@ public class BlockedUsersActivity extends BaseFragment implements NotificationCe
     @Override
     public View createView(final Context context) {
         actionBar.setBackButtonImage(R.drawable.ic_ab_back);
-        actionBar.setAllowOverlayTitle(true);
         actionBar.setTitle(ApplicationLoader.applicationContext.getString(R.string.BlockedContacts));
         actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
             @Override
@@ -243,11 +236,11 @@ public class BlockedUsersActivity extends BaseFragment implements NotificationCe
         @Override
         public View getView(int i, View view, ViewGroup viewGroup) {
             if (view == null) {
-                view = new UserCell(mContext, 1, 0);
+                view = new UserCell(mContext,0);
             }
             if (i>=0 && i<blockedUserIds.length) {
                 MrContact mrContact = MrMailbox.getContact(blockedUserIds[i]);
-                    ((UserCell) view).setData(mrContact, 0);
+                    ((UserCell) view).setData(mrContact);
             }
             return view;
         }

MessengerProj/src/main/java/com/b44t/messenger/Cells/AudioCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.Paint;
@@ -38,8 +38,8 @@ import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.MediaController;
 import com.b44t.messenger.MessageObject;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.CheckBoxView;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.CheckBoxView;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class AudioCell extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/BaseCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;

MessengerProj/src/main/java/com/b44t/messenger/Cells/ChatActionCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -35,7 +35,7 @@ import android.view.MotionEvent;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.MessageObject;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.ActionBar.Theme;
 
 public class ChatActionCell extends BaseCell {
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/ChatMessageCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -55,16 +55,16 @@ import com.b44t.messenger.MessageObject;
 import com.b44t.messenger.MrChat;
 import com.b44t.messenger.MrContact;
 import com.b44t.messenger.MrMailbox;
-import com.b44t.messenger.MrPoortext;
+import com.b44t.messenger.MrLot;
 import com.b44t.messenger.R;
 import com.b44t.messenger.TLRPC;
-import com.b44t.ui.Components.AvatarDrawable;
-import com.b44t.ui.Components.LinkPath;
-import com.b44t.ui.Components.SeekBar;
-import com.b44t.ui.Components.SeekBarWaveform;
-import com.b44t.ui.Components.StaticLayoutEx;
-import com.b44t.ui.ActionBar.Theme;
-import com.b44t.ui.PhotoViewer;
+import com.b44t.messenger.Components.AvatarDrawable;
+import com.b44t.messenger.Components.LinkPath;
+import com.b44t.messenger.Components.SeekBar;
+import com.b44t.messenger.Components.SeekBarWaveform;
+import com.b44t.messenger.Components.StaticLayoutEx;
+import com.b44t.messenger.ActionBar.Theme;
+import com.b44t.messenger.PhotoViewer;
 
 import java.util.ArrayList;
 import java.util.Locale;
@@ -75,6 +75,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
 
     public interface ChatMessageCellDelegate {
         void didPressedUserAvatar(ChatMessageCell cell, TLRPC.User user);
+        void didPressedSetupMessage(ChatMessageCell cell);
         void didLongPressed(ChatMessageCell cell);
         void didPressedUrl(MessageObject messageObject, ClickableSpan url, boolean longPress);
         void didPressedImage(ChatMessageCell cell);
@@ -207,6 +208,8 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
     private AvatarDrawable avatarDrawable;
     private boolean avatarPressed;
 
+    private boolean setupmessagePressed;
+
     private boolean drawNewchatButton;
     private boolean newchatPressed;
     private int newchatStartX;
@@ -514,7 +517,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                         imagePressed = true;
                         result = true;
                     }
-                } else if (currentMessageObject.type != MessageObject.MO_TYPE13_STICKER || currentMessageObject.getInputStickerSet() != null) {
+                } else if (currentMessageObject.type != MessageObject.MO_TYPE13_STICKER ) {
                     if (x >= photoImage.getImageX() && x <= photoImage.getImageX() + backgroundWidth && y >= photoImage.getImageY() && y <= photoImage.getImageY() + photoImage.getImageHeight()) {
                         imagePressed = true;
                         result = true;
@@ -658,7 +661,11 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                         newchatPressed = true;
                         result = true;
                         invalidate();
+                    } else if( currentMessageObject.messageOwner.is_setup_message && currentBackgroundDrawable.getBounds().contains((int)x, (int)y) ) {
+                        setupmessagePressed = true;
+                        result = true;
                     }
+
                     if (result) {
                         startCheckLongPress();
                     }
@@ -683,6 +690,18 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                             avatarPressed = false;
                         }
                     }
+                } else if(setupmessagePressed) {
+                    if (event.getAction() == MotionEvent.ACTION_UP) {
+                        setupmessagePressed = false;
+                        delegate.didPressedSetupMessage(this);
+                    }
+                    else if(event.getAction() == MotionEvent.ACTION_CANCEL) {
+                        setupmessagePressed = false;
+                    } else if (event.getAction() == MotionEvent.ACTION_MOVE) {
+                        if( !currentBackgroundDrawable.getBounds().contains((int)x, (int)y) ) {
+                            setupmessagePressed = false;
+                        }
+                    }
                 } else if (newchatPressed) {
                     if (event.getAction() == MotionEvent.ACTION_UP) {
                         newchatPressed = false;
@@ -1014,7 +1033,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
 
             maxWidth = maxWidth - dp(86);
 
-            MrPoortext pt = MrMailbox.getMsg(messageObject.getId()).getMediainfo();
+            MrLot pt = MrMailbox.getMsg(messageObject.getId()).getMediainfo();
             CharSequence stringFinal = TextUtils.ellipsize(pt.getText2(), audioTitlePaint, maxWidth, TextUtils.TruncateAt.MIDDLE);
             songLayout = new StaticLayout(stringFinal, audioTitlePaint, maxWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
             if (songLayout.getLineCount() > 0) {
@@ -1052,7 +1071,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
             int minutes = duration / 60;
             int seconds = duration - minutes * 60;
             String infoString = String.format("%d:%02d, %s", minutes, seconds, formatFileSize(documentAttach.size));
-            if( MrMailbox.getMsg(messageObject.getId()).isIncreation()!=0 ) {
+            if( MrMailbox.getMsg(messageObject.getId()).isIncreation() ) {
                 infoString = ApplicationLoader.applicationContext.getString(R.string.OneMoment);
             }
             infoWidth = (int) Math.ceil(infoPaint.measureText(infoString));
@@ -1170,7 +1189,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
         }
     }
 
-    public void setMessageObject(MessageObject messageObject) {
+    public void setMessageObject(MessageObject messageObject, boolean drawNewchatButton_) {
         boolean messageChanged = currentMessageObject != messageObject || messageObject.forceUpdate;
         boolean dataChanged = currentMessageObject == messageObject && isUserDataChanged();
         if (messageChanged || dataChanged || isPhotoDataChanged(messageObject)) {
@@ -1181,7 +1200,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
             isCheckPressed = true;
             isAvatarVisible = false;
             wasLayout = false;
-            drawNewchatButton = checkNeedDrawNewchatButton(messageObject);
+            drawNewchatButton = drawNewchatButton_;
             currentUser = null;
             drawNameLayout = false;
 
@@ -1296,7 +1315,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                 photoImage.setForcePreview(false);
                 if (messageObject.type == MessageObject.MO_TYPE9_FILE) {
                     backgroundWidth = Math.min(displaySize.x - dp(isGroupChat && messageObject.isFromUser() && !messageObject.isOutOwner() ? 102 : 50), dp(270));
-                    if (checkNeedDrawNewchatButton(messageObject)) {
+                    if (drawNewchatButton) {
                         backgroundWidth -= dp(20);
                     }
                     int maxWidth = backgroundWidth - dp(86 + 52);
@@ -1368,7 +1387,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                     int maxPhotoWidth;
                     maxPhotoWidth = photoWidth = (int) (Math.min(displaySize.x, displaySize.y) * 0.7f);
                     photoHeight = photoWidth + dp(100);
-                    if (checkNeedDrawNewchatButton(messageObject)) {
+                    if (drawNewchatButton) {
                         maxPhotoWidth -= dp(20);
                         photoWidth -= dp(20);
                     }
@@ -2008,10 +2027,10 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
     }
 
     private void measureTime(MessageObject messageObject) {
-        currentTimeString = LocaleController.getInstance().formatterDay.format((long) (messageObject.messageOwner.date) * 1000);
+        currentTimeString = LocaleController.getInstance().getFormatterDay().format((long) (messageObject.messageOwner.date) * 1000);
         timeWidth = (int) Math.ceil(timePaint.measureText(currentTimeString));
         timeEncrWidth = 0;
-        if( messageObject.messageOwner.e2ee ) {
+        if( messageObject.messageOwner.show_padlock) {
             timeEncrWidth = Theme.encrOutDrawable.getIntrinsicWidth();
             timeWidth += timeEncrWidth;
         }
@@ -2021,13 +2040,6 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
         return isPressed() && isCheckPressed || !isCheckPressed && isPressed || isHighlighted;
     }
 
-    private boolean checkNeedDrawNewchatButton(MessageObject messageObject) {
-        if( messageObject.getDialogId()== MrChat.MR_CHAT_ID_DEADDROP) {
-            return true;
-        }
-        return false;
-    }
-
     private void setMessageObjectInternal(MessageObject messageObject) {
 
         if (currentMessageObject.isFromUser()) {

MessengerProj/src/main/java/com/b44t/messenger/Cells/ChatUnreadCell.java

@@ -21,21 +21,20 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.Typeface;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.LayoutHelper;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.ActionBar.Theme;
 
 public class ChatUnreadCell extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/ChatlistCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -39,26 +39,24 @@ import android.text.style.ForegroundColorSpan;
 import android.view.MotionEvent;
 
 import com.b44t.messenger.AndroidUtilities;
+import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.ContactsController;
+import com.b44t.messenger.EmojiInputView;
 import com.b44t.messenger.LocaleController;
-import com.b44t.messenger.MessageObject;
 import com.b44t.messenger.MrChat;
+import com.b44t.messenger.MrLot;
 import com.b44t.messenger.MrMailbox;
 import com.b44t.messenger.MrMsg;
-import com.b44t.messenger.MrPoortext;
-import com.b44t.messenger.TLRPC;
-import com.b44t.messenger.Emoji;
 import com.b44t.messenger.R;
 import com.b44t.messenger.ImageReceiver;
-import com.b44t.ui.ActionBar.Theme;
-import com.b44t.ui.Components.AvatarDrawable;
+import com.b44t.messenger.ActionBar.Theme;
+import com.b44t.messenger.Components.AvatarDrawable;
 
 
-public class DialogCell extends BaseCell {
+public class ChatlistCell extends BaseCell {
 
     private static TextPaint namePaint;
     private static TextPaint messagePaint;
-    private static TextPaint messagePrintingPaint;
     private static TextPaint timePaint;
     private static TextPaint countPaint;
 
@@ -67,35 +65,29 @@ public class DialogCell extends BaseCell {
     private static Drawable clockDrawable;
     private static Drawable errorDrawable;
     private static Drawable countDrawable;
-    private static Drawable countDrawableGrey;
     private static Drawable groupDrawable;
     private static Drawable muteDrawable;
+    private static Drawable verifiedDrawable;
+    private static Drawable closeDrawable;
 
     private static Paint linePaint;
-    private static Paint backPaint;
 
-    private long currentDialogId;
-    private final boolean isDialogCell = true; // if it is no dialog cell, it is a search cell ...
+    private long currentChatId;
     private int unreadCount;
-    private int lastSendState;
-    private boolean dialogMuted;
-    private final MessageObject message = null;
-    private int index;
+    private boolean chatMuted;
+    private boolean chatVerified;
 
     private ImageReceiver avatarImage;
-    private AvatarDrawable avatarDrawable;
-
-    private final Object user = null;
-    private final Object chat = null;
 
     public boolean useSeparator = false;
 
     private int nameLeft;
     private StaticLayout nameLayout;
-    private boolean drawNameGroup;
-    private int nameMuteLeft;
+    private boolean drawGroupIcon;
+    private int nameVerifiedLeft;
     private int nameLockLeft;
     private int nameLockTop;
+    private int muteLeft;
 
     private int timeLeft;
     private int timeTop = AndroidUtilities.dp(17);
@@ -122,37 +114,35 @@ public class DialogCell extends BaseCell {
     private int countWidth;
     private StaticLayout countLayout;
 
-    private int avatarTop = AndroidUtilities.dp(10);
+    private boolean drawFlag; // draw a flag as eg. "Archived" below the time
+    private int flagLeft;
+    private int flagWidth;
+    private StaticLayout flagLayout;
 
-    private boolean isSelected;
+    private int avatarLeft;
+    private int avatarTop = AndroidUtilities.dp(10);
+    private int avatarWH = AndroidUtilities.dp(52);
 
     private MrChat m_mrChat = new MrChat(0);
-    private MrPoortext m_summary = new MrPoortext(0);
+    private MrLot m_summary = new MrLot(0);
     private boolean m_showUnreadCount;
 
-    public DialogCell(Context context) {
+    public ChatlistCell(Context context) {
         super(context);
 
         if (namePaint == null) {
             namePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
             namePaint.setTextSize(AndroidUtilities.dp(17));
-            namePaint.setColor(Theme.DIALOGS_TITLE_TEXT_COLOR);
+            namePaint.setColor(Theme.CHATLIST_TITLE_TEXT_COLOR);
 
             messagePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
             messagePaint.setTextSize(AndroidUtilities.dp(16));
-            messagePaint.setColor(Theme.DIALOGS_MESSAGE_TEXT_COLOR);
-            messagePaint.linkColor = Theme.DIALOGS_MESSAGE_TEXT_COLOR;
+            messagePaint.setColor(Theme.CHATLIST_MESSAGE_TEXT_COLOR);
+            messagePaint.linkColor = Theme.CHATLIST_MESSAGE_TEXT_COLOR;
 
             linePaint = new Paint();
             linePaint.setColor(0xffdcdcdc);
 
-            backPaint = new Paint();
-            backPaint.setColor(0x0f000000);
-
-            messagePrintingPaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
-            messagePrintingPaint.setTextSize(AndroidUtilities.dp(16));
-            messagePrintingPaint.setColor(Theme.DIALOGS_PRINTING_TEXT_COLOR);
-
             timePaint = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
             timePaint.setTextSize(AndroidUtilities.dp(13));
             timePaint.setColor(0xff999999);
@@ -167,34 +157,33 @@ public class DialogCell extends BaseCell {
             clockDrawable = getResources().getDrawable(R.drawable.msg_clock);
             errorDrawable = getResources().getDrawable(R.drawable.msg_warning);
             countDrawable = getResources().getDrawable(R.drawable.dialogs_badge);
-            countDrawableGrey = getResources().getDrawable(R.drawable.dialogs_badge2);
             groupDrawable = getResources().getDrawable(R.drawable.list_group);
             muteDrawable = getResources().getDrawable(R.drawable.mute_grey);
+            verifiedDrawable = getResources().getDrawable(R.drawable.verified);
+            closeDrawable = getResources().getDrawable(R.drawable.ic_dismiss_deaddrop);
         }
 
-        setBackgroundResource(R.drawable.list_selector);
-
         avatarImage = new ImageReceiver(this);
         avatarImage.setRoundRadius(AndroidUtilities.dp(26));
-        avatarDrawable = new AvatarDrawable();
     }
 
-    public void setDialog(MrChat mrChat, MrPoortext mrSummary, int i, boolean showUnreadCount) { // called for the chats overview
-
+    public void setChat(MrChat mrChat, MrLot mrSummary, int i, boolean showUnreadCount) {
         m_mrChat  = mrChat;
         m_summary = mrSummary;
         m_showUnreadCount = showUnreadCount;
 
-        currentDialogId = mrChat.getId();
-        index = i;
+        currentChatId = mrChat.getId();
+
+        if(currentChatId==MrChat.MR_CHAT_ID_DEADDROP) {
+            setBackgroundColor(Theme.CHATLIST_DEADDROP_BACKGROUND_COLOR);
+        }
+        else {
+            setBackgroundResource(R.drawable.list_selector);
+        }
 
         update(0);
     }
 
-    public long getDialogId() {
-        return currentDialogId;
-    }
-
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
@@ -214,7 +203,7 @@ public class DialogCell extends BaseCell {
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        if (currentDialogId == 0) {
+        if (currentChatId == 0) {
             super.onLayout(changed, left, top, right, bottom);
             return;
         }
@@ -223,6 +212,7 @@ public class DialogCell extends BaseCell {
         }
     }
 
+    static public boolean deaddropClosePressed;
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         if (Build.VERSION.SDK_INT >= 21 && getBackground() != null) {
@@ -230,102 +220,86 @@ public class DialogCell extends BaseCell {
                 getBackground().setHotspot(event.getX(), event.getY());
             }
         }
+
+        if( currentChatId==MrChat.MR_CHAT_ID_DEADDROP ) {
+            if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                float x = event.getX();
+                deaddropClosePressed = (x < avatarLeft + avatarWH);
+            }
+        }
+
         return super.onTouchEvent(event);
     }
 
     public void buildLayout() {
         String nameString = "";
         String timeString = "";
-        String countString = null;
         CharSequence messageString = "";
-        //CharSequence printingString = null;
-        /* EDIT BY MR -- we currently do not support stuff as "ist just typing", "uploads an images" etc.
-        if (isDialogCell) {
-            printingString = MessagesController.getInstance().printingStrings.get(currentDialogId);
-        }
-        */
         TextPaint currentNamePaint = namePaint;
         TextPaint currentMessagePaint = messagePaint;
-        boolean checkMessage = true;
 
-        drawNameGroup = false;
+        drawGroupIcon = false;
 
-        {
-            if (m_mrChat.getType()==MrChat.MR_CHAT_GROUP) { // EDIT BY MR
-                //if (chat.id < 0 || ChatObject.isChannel(chat) && !chat.megagroup) {
-                //    drawNameBroadcast = true;
-                //    nameLockTop = AndroidUtilities.dp(16.5f);
-                //} else {
-                    drawNameGroup = true;
-                    nameLockTop = AndroidUtilities.dp(17.5f);
-                //}
+        if (m_mrChat.isGroup() && currentChatId!=MrChat.MR_CHAT_ID_DEADDROP) {
+            drawGroupIcon = true;
+            nameLockTop = AndroidUtilities.dp(17.5f);
 
-                if (!LocaleController.isRTL) {
-                    nameLockLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline);
-                    nameLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline + 4) + (groupDrawable.getIntrinsicWidth());
-                } else {
-                    nameLockLeft = getMeasuredWidth() - AndroidUtilities.dp(AndroidUtilities.leftBaseline) - (groupDrawable.getIntrinsicWidth());
-                    nameLeft = AndroidUtilities.dp(14);
-                }
+            if (!LocaleController.isRTL) {
+                nameLockLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline);
+                nameLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline + 4) + (groupDrawable.getIntrinsicWidth());
             } else {
-                if (!LocaleController.isRTL) {
-                    nameLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline);
-                } else {
-                    nameLeft = AndroidUtilities.dp(14);
-                }
+                nameLockLeft = getMeasuredWidth() - AndroidUtilities.dp(AndroidUtilities.leftBaseline) - (groupDrawable.getIntrinsicWidth());
+                nameLeft = AndroidUtilities.dp(14);
+            }
+        } else {
+            if (!LocaleController.isRTL) {
+                nameLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline);
+            } else {
+                nameLeft = AndroidUtilities.dp(14);
             }
         }
 
+        String mess = m_summary.getText2();
+        if (mess.length() > 150) {
+            mess = mess.substring(0, 150);
+        }
+        String title = m_summary.getText1();
+        if( !title.isEmpty() )
         {
-                checkMessage = false;
-                String mess = m_summary.getText2();
-                if (mess.length() > 150) {
-                    mess = mess.substring(0, 150);
-                }
-                String title = m_summary.getText1();
-                if( !title.isEmpty() )
-                {
-                    int title_meaning = m_summary.getText1Meaning();
-                    int title_color = Theme.DIALOGS_NAME_TEXT_COLOR;
-                    switch( title_meaning ) {
-                        case MrPoortext.MR_TEXT1_SELF:  title_color = Theme.DIALOGS_SELF_TEXT_COLOR; break;
-                        case MrPoortext.MR_TEXT1_DRAFT: title_color = Theme.DIALOGS_DRAFT_TEXT_COLOR; break;
-                    }
-                    SpannableStringBuilder stringBuilder = SpannableStringBuilder.valueOf(String.format("%s: %s", title, mess));
-                    stringBuilder.setSpan(new ForegroundColorSpan(title_color), 0, title.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-                    messageString = Emoji.replaceEmoji(stringBuilder, messagePaint.getFontMetricsInt(), AndroidUtilities.dp(20), false);
-                }
-                else
-                {
-                    messageString = mess;
-                }
-
-                long timestmp =m_summary.getTimestamp();
-                if( timestmp!=0 ) {
-                    timeString = LocaleController.stringForMessageListDate(timestmp);
-                }
-                else {
-                    timeString = "";
-                }
-
-                drawCheck1 = false;
-                drawCheck2 = false;
-                drawClock = false;
-                drawCount = false;
-                drawError = false;
-                switch( m_summary.getState() ) {
-                    case MrMsg.MR_OUT_ERROR: drawError = true; break;
-                    case MrMsg.MR_OUT_PENDING: drawClock = true; break;
-                    case MrMsg.MR_OUT_DELIVERED: drawCheck2 = true; break;
-                    case MrMsg.MR_OUT_MDN_RCVD: drawCheck1 = true; drawCheck2 = true; break;
-                }
+            int title_meaning = m_summary.getText1Meaning();
+            int title_color = Theme.CHATLIST_NAME_TEXT_COLOR;
+            switch( title_meaning ) {
+                case MrLot.MR_TEXT1_SELF:  title_color = Theme.CHATLIST_SELF_TEXT_COLOR; break;
+                case MrLot.MR_TEXT1_DRAFT: title_color = Theme.CHATLIST_DRAFT_TEXT_COLOR; break;
+            }
+            SpannableStringBuilder stringBuilder = SpannableStringBuilder.valueOf(String.format("%s: %s", title, mess));
+            stringBuilder.setSpan(new ForegroundColorSpan(title_color), 0, title.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            messageString = EmojiInputView.replaceEmoji(stringBuilder, false);
+        }
+        else
+        {
+            messageString = mess;
         }
 
-        if (unreadCount != 0) {
-            drawCount = true;
-            countString = String.format("%d", unreadCount);
-        } else {
-            drawCount = false;
+        long timestmp =m_summary.getTimestamp();
+        if( timestmp!=0 ) {
+            timeString = LocaleController.dateForChatlist(timestmp);
+        }
+        else {
+            timeString = "";
+        }
+
+        drawCheck1 = false;
+        drawCheck2 = false;
+        drawClock = false;
+        drawCount = false;
+        drawFlag = false;
+        drawError = false;
+        switch( m_summary.getState() ) {
+            case MrMsg.MR_OUT_ERROR: drawError = true; break;
+            case MrMsg.MR_OUT_PENDING: drawClock = true; break;
+            case MrMsg.MR_OUT_DELIVERED: drawCheck2 = true; break;
+            case MrMsg.MR_OUT_MDN_RCVD: drawCheck1 = true; drawCheck2 = true; break;
         }
 
         int timeWidth = (int) Math.ceil(timePaint.measureText(timeString));
@@ -347,7 +321,7 @@ public class DialogCell extends BaseCell {
             nameLeft += timeWidth;
         }
 
-        if (drawNameGroup) {
+        if (drawGroupIcon) {
             nameWidth -= AndroidUtilities.dp(4) + groupDrawable.getIntrinsicWidth();
         }
 
@@ -383,14 +357,15 @@ public class DialogCell extends BaseCell {
             }
         }
 
-        if (dialogMuted) {
-            int w = AndroidUtilities.dp(6) + muteDrawable.getIntrinsicWidth();
+        if (chatVerified) {
+            int w = AndroidUtilities.dp(6) + verifiedDrawable.getIntrinsicWidth();
             nameWidth -= w;
             if (LocaleController.isRTL) {
                 nameLeft += w;
             }
         }
 
+        // build name
         nameWidth = Math.max(AndroidUtilities.dp(12), nameWidth);
         CharSequence nameStringFinal = TextUtils.ellipsize(nameString.replace('\n', ' '), currentNamePaint, nameWidth - AndroidUtilities.dp(12), TextUtils.TruncateAt.END);
         try {
@@ -399,8 +374,8 @@ public class DialogCell extends BaseCell {
 
         }
 
+        // build avatar
         int messageWidth = getMeasuredWidth() - AndroidUtilities.dp(AndroidUtilities.leftBaseline + 16);
-        int avatarLeft;
         if (!LocaleController.isRTL) {
             messageLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline);
             avatarLeft = AndroidUtilities.dp(9);
@@ -408,7 +383,15 @@ public class DialogCell extends BaseCell {
             messageLeft = AndroidUtilities.dp(16);
             avatarLeft = getMeasuredWidth() - AndroidUtilities.dp(61);
         }
-        avatarImage.setImageCoords(avatarLeft, avatarTop, AndroidUtilities.dp(52), AndroidUtilities.dp(52));
+
+        if( currentChatId==MrChat.MR_CHAT_ID_DEADDROP ) {
+
+        }
+        else {
+            avatarImage.setImageCoords(avatarLeft, avatarTop, avatarWH, avatarWH);
+        }
+
+        // build counter
         if (drawError) {
             int w = errorDrawable.getIntrinsicWidth() + AndroidUtilities.dp(8);
             messageWidth -= w;
@@ -418,7 +401,30 @@ public class DialogCell extends BaseCell {
                 errorLeft = AndroidUtilities.dp(16);
                 messageLeft += w;
             }
-        } else if (countString != null) {
+        } else if(m_mrChat.getArchived()!=0 || currentChatId==MrChat.MR_CHAT_ID_ARCHIVED_LINK ) {
+            String str;
+            TextPaint strPaint;
+            if( currentChatId==MrChat.MR_CHAT_ID_ARCHIVED_LINK ) {
+                str = m_mrChat.getName();
+                strPaint = messagePaint;
+            }
+            else {
+                str = ApplicationLoader.applicationContext.getString(R.string.Archived);
+                strPaint = timePaint;
+            }
+
+            flagWidth = Math.max(AndroidUtilities.dp(12), (int)Math.ceil(strPaint.measureText(str)));
+            flagLayout = new StaticLayout(str, strPaint, flagWidth, Layout.Alignment.ALIGN_CENTER, 1.0f, 0.0f, false);
+            int w = flagWidth + AndroidUtilities.dp(15);
+            if (!LocaleController.isRTL) {
+                messageWidth -= w;
+                flagLeft = getMeasuredWidth() - flagWidth - AndroidUtilities.dp(15);
+            } else {
+                flagLeft = AndroidUtilities.dp(15);
+            }
+            drawFlag = true;
+        } else if (unreadCount != 0 && currentChatId!=MrChat.MR_CHAT_ID_DEADDROP) {
+            String countString = String.format("%d", unreadCount);
             countWidth = Math.max(AndroidUtilities.dp(12), (int)Math.ceil(countPaint.measureText(countString)));
             countLayout = new StaticLayout(countString, countPaint, countWidth, Layout.Alignment.ALIGN_CENTER, 1.0f, 0.0f, false);
             int w = countWidth + AndroidUtilities.dp(18);
@@ -430,21 +436,17 @@ public class DialogCell extends BaseCell {
                 messageLeft += w;
             }
             drawCount = true;
-        } else {
-            drawCount = false;
         }
 
-        if (checkMessage) {
-            if (messageString == null) {
-                messageString = "";
+        if (chatMuted) {
+            muteLeft = messageLeft;
+            int w = AndroidUtilities.dp(6) + muteDrawable.getIntrinsicWidth();
+            messageWidth -= w;
+            if (!LocaleController.isRTL) {
+                messageLeft += w;
             }
-            String mess = messageString.toString();
-            if (mess.length() > 150) {
-                mess = mess.substring(0, 150);
-            }
-            mess = mess.replace('\n', ' ');
-            messageString = Emoji.replaceEmoji(mess, messagePaint.getFontMetricsInt(), AndroidUtilities.dp(17), false);
         }
+
         messageWidth = Math.max(AndroidUtilities.dp(12), messageWidth);
         CharSequence messageStringFinal = TextUtils.ellipsize(messageString, currentMessagePaint, messageWidth - AndroidUtilities.dp(12), TextUtils.TruncateAt.END);
         try {
@@ -459,8 +461,8 @@ public class DialogCell extends BaseCell {
             if (nameLayout != null && nameLayout.getLineCount() > 0) {
                 left = nameLayout.getLineLeft(0);
                 widthpx = Math.ceil(nameLayout.getLineWidth(0));
-                if (dialogMuted) {
-                    nameMuteLeft = (int) (nameLeft + (nameWidth - widthpx) - AndroidUtilities.dp(6) - muteDrawable.getIntrinsicWidth());
+                if (chatVerified) {
+                    nameVerifiedLeft = (int) (nameLeft + (nameWidth - widthpx) - AndroidUtilities.dp(6) - muteDrawable.getIntrinsicWidth());
                 }
                 if (left == 0) {
                     if (widthpx < nameWidth) {
@@ -486,8 +488,8 @@ public class DialogCell extends BaseCell {
                         nameLeft -= (nameWidth - widthpx);
                     }
                 }
-                if (dialogMuted) {
-                    nameMuteLeft = (int) (nameLeft + left + AndroidUtilities.dp(6));
+                if (chatVerified) {
+                    nameVerifiedLeft = (int) (nameLeft + left + AndroidUtilities.dp(6));
                 }
             }
             if (messageLayout != null && messageLayout.getLineCount() > 0) {
@@ -502,60 +504,24 @@ public class DialogCell extends BaseCell {
         }
     }
 
-    public void setDialogSelected(boolean value) {
-        if (isSelected != value) {
-            invalidate();
-        }
-        isSelected = value;
-    }
-
-    public void checkCurrentDialogIndex() {
-        if (index < MrMailbox.m_currChatlist.getCnt()) { // EDIT BY MR - was: index < getDialogsArray().size()
-            TLRPC.TL_dialog dialog = MrMailbox.m_currChatlist.get_TLRPC_TL_dialog(index); // EDIT BY MR - was: getDialogsArray().get(index);
-            final MessageObject newMessageObject = null;
-            if (currentDialogId != dialog.id ||
-                    message != null && message.getId() != dialog.top_message ||
-                    unreadCount != dialog.unread_count ||
-                    message != newMessageObject ||
-                    message == null && newMessageObject != null ) {
-                currentDialogId = dialog.id;
-                update(0);
-            }
-        }
-    }
-
     public void update(int mask) {
         if( m_showUnreadCount ) {
-            unreadCount = m_mrChat.getFreshMsgCount();
+            unreadCount = MrMailbox.getFreshMsgCount(m_mrChat.getId());
         }
 
         if (mask != 0) {
             boolean continueUpdate = false;
             if (!continueUpdate && (mask & MrMailbox.UPDATE_MASK_AVATAR) != 0) {
-                if (chat == null) {
-                    continueUpdate = true;
-                }
+                continueUpdate = true;
             }
             if (!continueUpdate && (mask & MrMailbox.UPDATE_MASK_NAME) != 0) {
-                if (chat == null) {
-                    continueUpdate = true;
-                }
+                continueUpdate = true;
             }
             if (!continueUpdate && (mask & MrMailbox.UPDATE_MASK_CHAT_AVATAR) != 0) {
-                if (user == null) {
-                    continueUpdate = true;
-                }
+                continueUpdate = true;
             }
             if (!continueUpdate && (mask & MrMailbox.UPDATE_MASK_CHAT_NAME) != 0) {
-                if (user == null) {
-                    continueUpdate = true;
-                }
-            }
-            if (!continueUpdate && (mask & MrMailbox.UPDATE_MASK_SEND_STATE) != 0) {
-                if (message != null && lastSendState != message.messageOwner.send_state) {
-                    lastSendState = message.messageOwner.send_state;
-                    continueUpdate = true;
-                }
+                continueUpdate = true;
             }
 
             if (!continueUpdate) {
@@ -563,25 +529,23 @@ public class DialogCell extends BaseCell {
             }
         }
 
-        dialogMuted = isDialogCell && MrMailbox.isDialogMuted(currentDialogId);
-        //user = null;
-        //chat = null;
 
-        /*int lower_id = (int)currentDialogId;
-        int high_id = (int)(currentDialogId >> 32);
-        if (lower_id != 0) {
-            if (high_id == 1) {
-                chat = MessagesController.getInstance().getChat(lower_id);
-            } else {
-                if (lower_id < 0) {
-                    chat = MessagesController.getInstance().getChat(-lower_id);
-                } else {
-                    user = MessagesController.getInstance().getUser(lower_id);
-                }
+
+        if( currentChatId == MrChat.MR_CHAT_ID_DEADDROP ) {
+            chatMuted = false; // never draw mute icon, the deaddrop is always muted
+            chatVerified = false;
+        }
+        else {
+            chatMuted = MrMailbox.isDialogMuted(currentChatId);
+            ContactsController.setupAvatar(this, avatarImage, new AvatarDrawable(), null, m_mrChat);
+            chatVerified = m_mrChat.isVerified();
+
+            // can be deleted if this gets out-of-labs
+            if( chatVerified && MrMailbox.getConfigInt("qr_enabled", 0)==0 ) {
+                chatVerified = false;
             }
-        }*/
-
-        ContactsController.setupAvatar(this, avatarImage, avatarDrawable, null, m_mrChat);
+            // /can be deleted if this gets out-of-labs
+        }
 
         if (getMeasuredWidth() != 0 || getMeasuredHeight() != 0) {
             buildLayout();
@@ -594,21 +558,20 @@ public class DialogCell extends BaseCell {
 
     @Override
     protected void onDraw(Canvas canvas) {
-        if (currentDialogId == 0) {
+        if( currentChatId == MrChat.MR_CHAT_ID_ARCHIVED_LINK ) {
+            canvas.save();
+            canvas.translate(getMeasuredWidth()/2-flagWidth/2, getMeasuredHeight()/2-flagLayout.getHeight()/2);
+            flagLayout.draw(canvas);
+            canvas.restore();
             return;
         }
 
-        if (isSelected) {
-            canvas.drawRect(0, 0, getMeasuredWidth(), getMeasuredHeight(), backPaint);
+
+        if (currentChatId == 0) {
+            return;
         }
 
-        /*
-        if (drawNameLock) {
-            setDrawableBounds(lockDrawable, nameLockLeft, nameLockTop);
-            lockDrawable.draw(canvas);
-        } else
-        */
-        if (drawNameGroup) {
+        if (drawGroupIcon) {
             setDrawableBounds(groupDrawable, nameLockLeft, nameLockTop);
             groupDrawable.draw(canvas);
         }
@@ -651,28 +614,43 @@ public class DialogCell extends BaseCell {
             }
         }
 
-        if (dialogMuted) {
-            setDrawableBounds(muteDrawable, nameMuteLeft, AndroidUtilities.dp(16.5f));
+        if (chatVerified) {
+            setDrawableBounds(verifiedDrawable, nameVerifiedLeft, AndroidUtilities.dp(16.5f));
+            verifiedDrawable.draw(canvas);
+        }
+
+        if (chatMuted) {
+            setDrawableBounds(muteDrawable, muteLeft, AndroidUtilities.dp(44));
             muteDrawable.draw(canvas);
         }
 
         if (drawError) {
             setDrawableBounds(errorDrawable, errorLeft, errorTop);
             errorDrawable.draw(canvas);
+        } else if(drawFlag) {
+            canvas.save();
+            canvas.translate(flagLeft, countTop + AndroidUtilities.dp(4));
+            flagLayout.draw(canvas);
+            canvas.restore();
         } else if (drawCount) {
-            if (dialogMuted) {
-                setDrawableBounds(countDrawableGrey, countLeft - AndroidUtilities.dp(5.5f), countTop, countWidth + AndroidUtilities.dp(11), countDrawable.getIntrinsicHeight());
-                countDrawableGrey.draw(canvas);
-            } else {
-                setDrawableBounds(countDrawable, countLeft - AndroidUtilities.dp(5.5f), countTop, countWidth + AndroidUtilities.dp(11), countDrawable.getIntrinsicHeight());
-                countDrawable.draw(canvas);
-            }
+            setDrawableBounds(countDrawable, countLeft - AndroidUtilities.dp(5.5f), countTop, countWidth + AndroidUtilities.dp(11), countDrawable.getIntrinsicHeight());
+            countDrawable.draw(canvas);
+
             canvas.save();
             canvas.translate(countLeft, countTop + AndroidUtilities.dp(4));
             countLayout.draw(canvas);
             canvas.restore();
         }
 
+        if( currentChatId==MrChat.MR_CHAT_ID_DEADDROP ) {
+            int shrink = AndroidUtilities.dp(12);
+            setDrawableBounds(closeDrawable, avatarLeft+shrink, avatarTop+shrink, avatarWH-shrink*2, avatarWH-shrink*2);
+            closeDrawable.draw(canvas);
+        }
+        else {
+            avatarImage.draw(canvas);
+        }
+
         if (useSeparator) {
             if (LocaleController.isRTL) {
                 canvas.drawLine(0, getMeasuredHeight() - 1, getMeasuredWidth() - AndroidUtilities.dp(AndroidUtilities.leftBaseline), getMeasuredHeight() - 1, linePaint);
@@ -680,8 +658,6 @@ public class DialogCell extends BaseCell {
                 canvas.drawLine(AndroidUtilities.dp(AndroidUtilities.leftBaseline), getMeasuredHeight() - 1, getMeasuredWidth(), getMeasuredHeight() - 1, linePaint);
             }
         }
-
-        avatarImage.draw(canvas);
     }
 
     @Override

MessengerProj/src/main/java/com/b44t/messenger/Cells/EditTextCell.java

@@ -25,7 +25,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -39,8 +39,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class EditTextCell extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/GreySectionCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.Typeface;
@@ -31,7 +31,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class GreySectionCell extends FrameLayout {
     private TextView textView;

MessengerProj/src/main/java/com/b44t/messenger/Cells/HeaderCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.Typeface;
@@ -31,7 +31,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class HeaderCell extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/PhotoAttachPhotoCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -34,10 +34,10 @@ import android.widget.FrameLayout;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.MediaController;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.BackupImageView;
-import com.b44t.ui.Components.CheckBoxView;
-import com.b44t.ui.Components.LayoutHelper;
-import com.b44t.ui.PhotoViewer;
+import com.b44t.messenger.Components.BackupImageView;
+import com.b44t.messenger.Components.CheckBoxView;
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.PhotoViewer;
 
 public class PhotoAttachPhotoCell extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/PhotoEditToolCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -32,7 +32,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class PhotoEditToolCell extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/PhotoPickerAlbumsCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.os.Build;
@@ -37,8 +37,8 @@ import android.widget.TextView;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.MediaController;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.BackupImageView;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.BackupImageView;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class PhotoPickerAlbumsCell extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/PhotoPickerPhotoCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -33,9 +33,9 @@ import android.widget.FrameLayout;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.BackupImageView;
-import com.b44t.ui.Components.CheckBoxView;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.BackupImageView;
+import com.b44t.messenger.Components.CheckBoxView;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class PhotoPickerPhotoCell extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/SettingsProfileCell.java

@@ -20,7 +20,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -42,8 +42,8 @@ import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.MrMailbox;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.LayoutHelper;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.ActionBar.Theme;
 
 public class SettingsProfileCell extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/ShadowSectionCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.view.View;

MessengerProj/src/main/java/com/b44t/messenger/Cells/SharedDocumentCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.Paint;
@@ -36,9 +36,9 @@ import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ImageReceiver;
 import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.BackupImageView;
-import com.b44t.ui.Components.CheckBoxView;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.BackupImageView;
+import com.b44t.messenger.Components.CheckBoxView;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class SharedDocumentCell extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/TextCheckCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -35,7 +35,7 @@ import android.widget.CheckBox;
 
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.LocaleController;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class TextCheckCell extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/TextDetailSettingsCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -32,8 +32,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class TextDetailSettingsCell extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/TextInfoCell.java

@@ -20,7 +20,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.util.TypedValue;
@@ -29,8 +29,7 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;
 
 
 public class TextInfoCell extends FrameLayout {
@@ -40,13 +39,18 @@ public class TextInfoCell extends FrameLayout {
 
     private final int iconDp = 34;
 
+    static public TextView createTextView(Context context) {
+        TextView ret = new TextView(context);
+        ret.setTextColor(0xff808080);
+        ret.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+        ret.setGravity(Gravity.START);
+        return ret;
+    }
+
     public TextInfoCell(Context context) {
         super(context);
 
-        textView = new TextView(context);
-        textView.setTextColor(0xff808080);
-        textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
-        textView.setGravity(Gravity.START);
+        textView = createTextView(context);
         addView(textView);
 
         iconView = new TextView(context);

MessengerProj/src/main/java/com/b44t/messenger/Cells/TextSettingsCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -30,12 +30,10 @@ import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.LayoutHelper;
 
 import static com.b44t.messenger.AndroidUtilities.dp;
 

MessengerProj/src/main/java/com/b44t/messenger/Cells/UserCell.java

@@ -21,9 +21,10 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.view.Gravity;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -32,33 +33,29 @@ import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ContactsController;
 import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.MrContact;
+import com.b44t.messenger.MrMailbox;
 import com.b44t.messenger.R;
-import com.b44t.ui.Components.AvatarDrawable;
-import com.b44t.ui.Components.BackupImageView;
-import com.b44t.ui.Components.CheckBoxView;
-import com.b44t.ui.Components.LayoutHelper;
-import com.b44t.ui.ActionBar.SimpleTextView;
+import com.b44t.messenger.Components.AvatarDrawable;
+import com.b44t.messenger.Components.BackupImageView;
+import com.b44t.messenger.Components.CheckBoxView;
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.ActionBar.SimpleTextView;
 
 public class UserCell extends FrameLayout {
 
     private BackupImageView avatarImageView;
     private SimpleTextView nameTextView;
     private SimpleTextView statusTextView;
-    private ImageView imageView;
     private CheckBoxView checkBox;
 
     private AvatarDrawable avatarDrawable;
     private MrContact m_mrContact;
 
-    private CharSequence currentName;
-    private CharSequence currentStatus;
-    private int          currentResId;
-
-    private int statusColor = 0xffa8a8a8;
-
-    public UserCell(Context context, int padding, int useCheckboxes) {
+    public UserCell(Context context, int useCheckboxes) {
         super(context);
 
+        int padding = 1;
+
         avatarDrawable = new AvatarDrawable();
 
         avatarImageView = new BackupImageView(context);
@@ -67,20 +64,16 @@ public class UserCell extends FrameLayout {
 
         nameTextView = new SimpleTextView(context);
         nameTextView.setTextColor(0xff212121);
-        nameTextView.setTextSize(16); /*same size as in TextCell */
+        nameTextView.setTextSize(16);
         nameTextView.setGravity(Gravity.START | Gravity.TOP);
         addView(nameTextView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 20, Gravity.START | Gravity.TOP, LocaleController.isRTL ? 28 + (useCheckboxes == 2 ? 18 : 0) : (68 + padding), 11.5f, LocaleController.isRTL ? (68 + padding) : 28 + (useCheckboxes == 2 ? 18 : 0), 0));
 
         statusTextView = new SimpleTextView(context);
         statusTextView.setTextSize(14);
+        statusTextView.setTextColor(0xffa8a8a8);
         statusTextView.setGravity(Gravity.START | Gravity.TOP);
         addView(statusTextView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 20, Gravity.START | Gravity.TOP, LocaleController.isRTL ? 28 : (68 + padding), 34.5f, LocaleController.isRTL ? (68 + padding) : 28, 0));
 
-        imageView = new ImageView(context);
-        imageView.setScaleType(ImageView.ScaleType.CENTER);
-        imageView.setVisibility(GONE);
-        addView(imageView, LayoutHelper.createFrame(LayoutParams.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.START | Gravity.CENTER_VERTICAL, LocaleController.isRTL ? 0 : 16, 0, LocaleController.isRTL ? 16 : 0, 0));
-
         if( useCheckboxes == 1 ) {
             checkBox = new CheckBoxView(context, R.drawable.round_check2);
             checkBox.setVisibility(INVISIBLE);
@@ -88,13 +81,8 @@ public class UserCell extends FrameLayout {
         }
     }
 
-    public void setData(MrContact mrContact, int resId) {
+    public void setData(MrContact mrContact) {
         m_mrContact = mrContact;
-        if( m_mrContact != null ) {
-            currentName = m_mrContact.getDisplayName();
-            currentStatus = m_mrContact.getAddr();
-        }
-        currentResId = resId;
         update();
     }
 
@@ -112,27 +100,22 @@ public class UserCell extends FrameLayout {
         super.onMeasure(MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(64), MeasureSpec.EXACTLY));
     }
 
-    public void setStatusColors(int color) {
-        statusColor = color;
-    }
-
     public void update() {
         if (m_mrContact==null) {
             return;
         }
 
-        if (currentName != null) {
-            nameTextView.setText(currentName);
-        }
+        nameTextView.setText(m_mrContact.getDisplayName());
 
-        if (currentStatus != null) {
-            statusTextView.setTextColor(statusColor);
-            statusTextView.setText(currentStatus);
-        }
+        statusTextView.setText(m_mrContact.getAddr());
 
-        if (imageView.getVisibility() == VISIBLE && currentResId == 0 || imageView.getVisibility() == GONE && currentResId != 0) {
-            imageView.setVisibility(currentResId == 0 ? GONE : VISIBLE);
-            imageView.setImageResource(currentResId);
+        if( m_mrContact.isVerified() ) {
+            if( MrMailbox.getConfigInt("qr_enabled", 0) != 0 ) {
+                nameTextView.setRightDrawable(R.drawable.verified);
+            }
+        }
+        else {
+            nameTextView.setRightDrawable(0);
         }
 
         ContactsController.setupAvatar(avatarImageView, avatarImageView.imageReceiver, avatarDrawable, m_mrContact, null);

MessengerProj/src/main/java/com/b44t/messenger/Cells/WallpaperCell.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Cells;
+package com.b44t.messenger.Cells;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -33,8 +33,8 @@ import android.widget.ImageView;
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.R;
 import com.b44t.messenger.TLRPC;
-import com.b44t.ui.Components.BackupImageView;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Components.BackupImageView;
+import com.b44t.messenger.Components.LayoutHelper;
 
 public class WallpaperCell extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/ChatActivity.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui;
+package com.b44t.messenger;
 
 import android.Manifest;
 import android.animation.Animator;
@@ -43,10 +43,11 @@ import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.support.v4.content.FileProvider;
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.text.style.ClickableSpan;
 import android.text.style.URLSpan;
-import android.util.Log;
 import android.util.SparseIntArray;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -60,45 +61,26 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.BuildConfig;
-import com.b44t.messenger.LocaleController;
-import com.b44t.messenger.MediaController;
-import com.b44t.messenger.MrChat;
-import com.b44t.messenger.MrContact;
-import com.b44t.messenger.MrMailbox;
-import com.b44t.messenger.MrMsg;
-import com.b44t.messenger.NotificationsController;
-import com.b44t.messenger.SendMessagesHelper;
-import com.b44t.messenger.Utilities;
-import com.b44t.messenger.VideoEditedInfo;
-import com.b44t.messenger.browser.Browser;
-import com.b44t.messenger.support.widget.LinearLayoutManager;
-import com.b44t.messenger.support.widget.RecyclerView;
-import com.b44t.messenger.ApplicationLoader;
-import com.b44t.messenger.TLRPC;
-import com.b44t.messenger.MessageObject;
-import com.b44t.messenger.NotificationCenter;
-import com.b44t.messenger.R;
-import com.b44t.ui.ActionBar.BackDrawable;
-import com.b44t.ui.ActionBar.SimpleTextView;
-import com.b44t.messenger.AnimatorListenerAdapterProxy;
-import com.b44t.ui.Cells.ChatActionCell;
-import com.b44t.ui.ActionBar.ActionBar;
-import com.b44t.ui.ActionBar.ActionBarMenu;
-import com.b44t.ui.ActionBar.ActionBarMenuItem;
-import com.b44t.ui.Cells.ChatMessageCell;
-import com.b44t.ui.Cells.ChatUnreadCell;
-import com.b44t.ui.ActionBar.BaseFragment;
-import com.b44t.ui.Components.ChatActivityEnterView;
-import com.b44t.messenger.ImageReceiver;
-import com.b44t.ui.Components.ChatAttachAlert;
-import com.b44t.ui.Components.ChatAvatarContainer;
-import com.b44t.ui.Components.LayoutHelper;
-import com.b44t.ui.Components.NumberTextView;
-import com.b44t.ui.Components.RecyclerListView;
-import com.b44t.ui.Components.SizeNotifierFrameLayout;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.Components.Browser;
+import com.b44t.messenger.aosp.LinearLayoutManager;
+import com.b44t.messenger.aosp.RecyclerView;
+import com.b44t.messenger.ActionBar.BackDrawable;
+import com.b44t.messenger.ActionBar.SimpleTextView;
+import com.b44t.messenger.Cells.ChatActionCell;
+import com.b44t.messenger.ActionBar.ActionBar;
+import com.b44t.messenger.ActionBar.ActionBarMenu;
+import com.b44t.messenger.ActionBar.ActionBarMenuItem;
+import com.b44t.messenger.Cells.ChatMessageCell;
+import com.b44t.messenger.Cells.ChatUnreadCell;
+import com.b44t.messenger.ActionBar.BaseFragment;
+import com.b44t.messenger.Components.ChatActivityEnterView;
+import com.b44t.messenger.Components.ChatAttachAlert;
+import com.b44t.messenger.Components.ChatAvatarContainer;
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.Components.NumberTextView;
+import com.b44t.messenger.Components.RecyclerListView;
+import com.b44t.messenger.Components.SizeNotifierFrameLayout;
+import com.b44t.messenger.ActionBar.Theme;
 
 import java.io.File;
 import java.net.URLDecoder;
@@ -107,13 +89,13 @@ import java.util.Collections;
 import java.util.HashMap;
 
 @SuppressWarnings("unchecked")
-public class ChatActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, DialogsActivity.DialogsActivityDelegate,
+public class ChatActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate, ChatlistActivity.ChatlistActivityDelegate,
         PhotoViewer.PhotoViewerProvider {
 
     // data
     private long  dialog_id;
     public MrChat m_mrChat = new MrChat(0);
-    private boolean m_isChatWithDeaddrop, m_isDeaddropInChatlist;
+    private boolean m_isChatWithDeaddrop /*, m_isDeaddropInChatlist*/;
     private int[] m_msglist = {};
 
     // the list view
@@ -180,9 +162,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
     private final static int ID_COPY = 10;
     private final static int ID_FORWARD = 11;
     private final static int ID_DELETE_MESSAGES = 12;
+    private final static int ID_LEAVE_GROUP = 13;
     private final static int ID_ATTACH = 14;
     private final static int ID_SHOW_PROFILE = 15;
     private final static int ID_DELETE_CHAT = 16;
+    private final static int ID_ARCHIVE_CHAT = 17;
     private final static int ID_MUTE = 18;
     private final static int ID_REPLY = 19;
     private final static int ID_INFO = 20;
@@ -190,6 +174,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
     private final static int ID_SHARE = 22;
     private final static int ID_OPEN = 23;
     private final static int ID_SEARCH = 40;
+    private final static int ID_SHOW_QR = 50;
     private final static int ID_CHAT_COMPOSE_PANEL = 1000;
     private TextView m_replyMenuItem, m_infoMenuItem, m_saveToXXMenuItem, m_openMenuItem, m_shareMenuItem;
 
@@ -207,15 +192,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
         m_mrChat = MrMailbox.getChat((int)dialog_id);
         m_isChatWithDeaddrop = m_mrChat.getId()==MrChat.MR_CHAT_ID_DEADDROP;
 
-        m_isDeaddropInChatlist = false;
+        /*m_isDeaddropInChatlist = false;
         if( m_isChatWithDeaddrop && MrMailbox.getConfigInt("show_deaddrop", 0)!=0 ) {
             m_isDeaddropInChatlist = true;
-        }
+        }*/
 
         startLoadFromMessageId = arguments.getInt("message_id", 0);
         scrollToTopOnResume = arguments.getBoolean("scrollToTopOnResume", false);
 
-        NotificationCenter.getInstance().addObserver(this, NotificationCenter.emojiDidLoaded);
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.dialogsNeedReload);
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.updateInterfaces);
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.didReceivedNewMessages);
@@ -341,7 +325,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
             chatActivityEnterView.onDestroy();
         }
 
-        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.emojiDidLoaded);
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.dialogsNeedReload);
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.updateInterfaces);
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.didReceivedNewMessages);
@@ -359,11 +342,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.notificationsSettingsUpdated);
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.audioPlayStateChanged);
 
-        /*
-        if (currentUser != null) {
-            MessagesController.getInstance().cancelLoadFullUser(currentUser.id);
-        }
-        */
         AndroidUtilities.removeAdjustResize(getParentActivity(), classGuid);
 
         if (chatAttachAlert != null) {
@@ -436,14 +414,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                     args.putBoolean("onlySelect", true);
                     args.putString("onlySelectTitle", context.getString(R.string.ForwardToTitle));
                     args.putString("selectAlertString", context.getString(R.string.ForwardMessagesTo));
-                    DialogsActivity fragment = new DialogsActivity(args);
+                    ChatlistActivity fragment = new ChatlistActivity(args);
                     fragment.setDelegate(ChatActivity.this);
-                    presentFragment(fragment); // this results in a call to didSelectDialog()
+                    presentFragment(fragment); // this results in a call to didSelectChat()
                 }
                 else if( id == ID_SHOW_PROFILE )
                 {
                     Bundle args = new Bundle();
-                    if( m_mrChat.getType()== MrChat.MR_CHAT_GROUP ) {
+                    if( m_mrChat.isGroup() ) {
                         args.putInt("chat_id",  m_mrChat.getId());
                     }
                     else {
@@ -456,6 +434,30 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                     ProfileActivity fragment = new ProfileActivity(args);
                     presentFragment(fragment);
                 }
+                else if( id == ID_LEAVE_GROUP )
+                {
+                    AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
+                    builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            MrMailbox.removeContactFromChat(m_mrChat.getId(), MrContact.MR_CONTACT_ID_SELF);
+                            NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, MrMailbox.UPDATE_MASK_CHAT_MEMBERS);
+                            AndroidUtilities.showDoneHint(context);
+                        }
+                    });
+                    builder.setNegativeButton(R.string.Cancel, null);
+                    builder.setMessage(AndroidUtilities.replaceTags(context.getString(R.string.AskLeaveGroup)));
+                    showDialog(builder.create());
+                }
+                else if ( id == ID_ARCHIVE_CHAT)
+                {
+                    int do_archive = m_mrChat.getArchived()==0? 1: 0;
+                    MrMailbox.archiveChat((int)dialog_id, do_archive);
+                    AndroidUtilities.showDoneHint(context);
+                    if( do_archive == 1 ) {
+                        finishFragment();
+                    }
+                }
                 else if ( id == ID_DELETE_CHAT)
                 {
                     // as the history may be a mix of messenger-messages and emails, it is not safe to delete it.
@@ -466,19 +468,15 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
 
                     AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
                     builder.setMessage(context.getString(R.string.AreYouSureDeleteThisChat));
-                    builder.setPositiveButton(context.getString(R.string.OK), new DialogInterface.OnClickListener() {
+                    builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialogInterface, int i) {
-                            if( MrMailbox.deleteChat((int)dialog_id)!=0 ) {
-                                AndroidUtilities.showDoneHint(getParentActivity());
-                                finishFragment();
-                            }
-                            else {
-                                AndroidUtilities.showErrorHint(getParentActivity()); // normally, there is no reason for deleteChat to fail() as everything is just local
-                            }
+                            MrMailbox.deleteChat((int)dialog_id);
+                            AndroidUtilities.showDoneHint(getParentActivity());
+                            finishFragment();
                         }
                     });
-                    builder.setNegativeButton(context.getString(R.string.Cancel), null);
+                    builder.setNegativeButton(R.string.Cancel, null);
                     showDialog(builder.create());
                 } else if (id == ID_MUTE) {
                     toggleMute();
@@ -496,13 +494,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 } else if (id == ID_INFO) {
                     String info_str = MrMailbox.getMsgInfo(getFirstSelectedId());
                     AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
-                    builder.setMessage(info_str);
-                    builder.setPositiveButton(context.getString(R.string.OK), new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialogInterface, int i) {
-                            ;
-                        }
-                    });
+                    builder.setMessage(AndroidUtilities.replaceTags(info_str));
+                    builder.setPositiveButton(R.string.OK, null);
                     showDialog(builder.create());
                     actionBar.hideActionMode();
                     updateVisibleRowsFast();
@@ -541,10 +534,17 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 } else if (id == ID_SEARCH) {
                     openSearchWithText("");
                 }
+                else if( id == ID_SHOW_QR ) {
+                    Intent intent2 = new Intent(getParentActivity(), QRshowActivity.class);
+                    Bundle b = new Bundle();
+                    b.putInt("chat_id", (int)dialog_id);
+                    intent2.putExtras(b);
+                    getParentActivity().startActivity(intent2);
+                }
             }
         });
 
-        if( m_isChatWithDeaddrop && !m_isDeaddropInChatlist ) {
+        if( m_isChatWithDeaddrop /*&& !m_isDeaddropInChatlist*/ ) {
             actionBar.setTitle(context.getString(R.string.Deaddrop));
         }
         else {
@@ -603,27 +603,31 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
 
 
         headerItem = menu.addItem(0, R.drawable.ic_ab_other);
-        headerItem.addSubItem(ID_SEARCH, context.getString(R.string.Search), 0);
+        headerItem.addSubItem(ID_SEARCH, context.getString(R.string.Search));
 
         m_canMute = true;
-        if( m_isChatWithDeaddrop && !m_isDeaddropInChatlist ) {
+        if( m_isChatWithDeaddrop /*&& !m_isDeaddropInChatlist*/ ) {
             m_canMute = false;
         }
 
         if( m_canMute ) {
-            muteMenuEntry = headerItem.addSubItem(ID_MUTE, null, 0);
+            muteMenuEntry = headerItem.addSubItem(ID_MUTE, null);
         }
 
+        //if( !m_isChatWithDeaddrop ) {
+            //headerItem.addSubItem(ID_ATTACH, context.getString(R.string.AttachFiles), 0); // "Attach" means "Attach to chat", not "Attach to message" (which is not possible)
+        //}
+
         if( !m_isChatWithDeaddrop ) {
-            headerItem.addSubItem(ID_ATTACH, context.getString(R.string.AttachFiles), 0); // "Attach" means "Attach to chat", not "Attach to message" (which is not possible)
-        }
-
-        if( !m_isChatWithDeaddrop || m_isDeaddropInChatlist ) {
-            headerItem.addSubItem(ID_SHOW_PROFILE, context.getString(R.string.ViewProfile), 0);
-        }
-
-        if( !m_isChatWithDeaddrop ) {
-            headerItem.addSubItem(ID_DELETE_CHAT, context.getString(R.string.DeleteChat), 0);
+            headerItem.addSubItem(ID_SHOW_PROFILE, context.getString(R.string.ViewProfile));
+            if( m_mrChat.isGroup() ) {
+                if ( m_mrChat.isVerified() ) {
+                    headerItem.addSubItem(ID_SHOW_QR, context.getString(R.string.QrShowInviteCode));
+                }
+                headerItem.addSubItem(ID_LEAVE_GROUP, context.getString(R.string.LeaveGroup));
+            }
+            headerItem.addSubItem(ID_ARCHIVE_CHAT, context.getString(m_mrChat.getArchived()==0? R.string.ArchiveChat : R.string.UnarchiveChat));
+            headerItem.addSubItem(ID_DELETE_CHAT, context.getString(R.string.DeleteChat));
         }
 
         updateTitle();
@@ -709,13 +713,13 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
         actionModeViews.add(actionMode.addItem(ID_FORWARD, R.drawable.ic_ab_fwd_forward, Theme.ACTION_BAR_MODE_SELECTOR_COLOR, null, AndroidUtilities.dp(54)));
         ActionBarMenuItem submenu = actionMode.addItem(0, R.drawable.ic_ab_other_grey);
             if( m_isChatWithDeaddrop ) {
-                m_replyMenuItem = submenu.addSubItem(ID_REPLY, context.getString(R.string.Reply), 0);
+                m_replyMenuItem = submenu.addSubItem(ID_REPLY, context.getString(R.string.Reply));
             }
-            submenu.addSubItem(ID_COPY, context.getString(R.string.CopyToClipboard), 0);
-            m_saveToXXMenuItem = submenu.addSubItem(ID_SAVE_TO_XX, "", 0);
-            m_openMenuItem = submenu.addSubItem(ID_OPEN, context.getString(R.string.Open), 0);
-            m_shareMenuItem = submenu.addSubItem(ID_SHARE, context.getString(R.string.Share), 0);
-            m_infoMenuItem = submenu.addSubItem(ID_INFO, context.getString(R.string.Info), 0);
+            submenu.addSubItem(ID_COPY, context.getString(R.string.CopyToClipboard));
+            m_saveToXXMenuItem = submenu.addSubItem(ID_SAVE_TO_XX, "");
+            m_openMenuItem = submenu.addSubItem(ID_OPEN, context.getString(R.string.Open));
+            m_shareMenuItem = submenu.addSubItem(ID_SHARE, context.getString(R.string.Share));
+            m_infoMenuItem = submenu.addSubItem(ID_INFO, context.getString(R.string.Info));
         actionModeViews.add(submenu);
         checkActionBarMenu();
 
@@ -852,11 +856,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
 
             TextView emptyView = new TextView(context);
 
-            if( m_mrChat.getParamInt(MrChat.MRP_UNPROMOTED, 0)==1 ) {
+            if( m_mrChat.isUnpromoted() ) {
                 emptyView.setText(context.getString(R.string.MsgNewGroupDraftHint));
                 emptyView.setGravity(Gravity.START);
             }
-            else if( m_mrChat.getType()==MrChat.MR_CHAT_NORMAL ){
+            else if( !m_mrChat.isGroup() && !m_mrChat.isSelfTalk() ){
                 String name = m_mrChat.getName();
                 emptyView.setText(AndroidUtilities.replaceTags(String.format(context.getString(R.string.NoMessagesHint), name, name)));
                 emptyView.setGravity(Gravity.START);
@@ -1069,8 +1073,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
         //noinspection ResourceType
         chatActivityEnterView.setId(ID_CHAT_COMPOSE_PANEL);
 
-        chatActivityEnterView.setAllowStickersAndGifs(false, false); // for the moment, we have no stickers
-
         contentView.addView(chatActivityEnterView, contentView.getChildCount() - 1, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.START | Gravity.BOTTOM));
         chatActivityEnterView.setDelegate(new ChatActivityEnterView.ChatActivityEnterViewDelegate() {
             @Override
@@ -1091,10 +1093,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
             @Override
             public void onWindowSizeChanged(int size) {
             }
-
-            @Override
-            public void onStickersTab(boolean opened) {
-            }
         });
 
         bottomOverlay = new FrameLayout(context);
@@ -1461,7 +1459,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
         }
     }
 
-    private void createChatByDeaddropMsgId(int messageId)
+    private void createChatByDeaddropMsgId(final int messageId)
     {
         final Context context = getParentActivity();
         if (context == null) {
@@ -1480,10 +1478,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
 
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
-        builder.setPositiveButton(context.getString(R.string.OK), new DialogInterface.OnClickListener() {
+        builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialogInterface, int i) {
-                int chatId = MrMailbox.createChatByContactId(fromId);
+                int chatId = MrMailbox.createChatByMsgId(messageId);
                 if( chatId != 0 ) {
                     Bundle args = new Bundle();
                     args.putInt("chat_id", chatId);
@@ -1494,7 +1492,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 }
             }
         });
-        builder.setNegativeButton(context.getString(R.string.Cancel), null);
+        builder.setNegativeButton(R.string.Cancel, null);
         builder.setMessage(AndroidUtilities.replaceTags(String.format(context.getString(R.string.AskStartChatWith), name)));
         showDialog(builder.create());
     }
@@ -1632,6 +1630,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
         if (view instanceof ChatMessageCell) {
             message = ((ChatMessageCell) view).getMessageObject();
         }
+        else if( view instanceof ChatActionCell) {
+            message = ((ChatActionCell) view).getMessageObject();
+        }
 
         if (message==null || !message.isSelectable()) {
             return;
@@ -1658,17 +1659,21 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
     }
 
     private void updateTitleIcons() {
-        int rightIcon = 0;
+        int leftIcon = 0, rightIcon = 0;
         if( m_canMute && MrMailbox.isDialogMuted(dialog_id) ) {
-            rightIcon = R.drawable.mute_fixed;
+            leftIcon = R.drawable.mute_blue;
+        }
+
+        if( m_mrChat!=null && m_mrChat.isVerified() ) {
+            rightIcon = R.drawable.verified;
         }
 
         if (avatarContainer != null)  {
-            avatarContainer.setTitleIcons(0, rightIcon);
+            avatarContainer.setTitleIcons(leftIcon, rightIcon);
         }
 
         if( muteMenuEntry != null ) {
-            if (rightIcon != 0) {
+            if (leftIcon != 0) {
                 muteMenuEntry.setText(ApplicationLoader.applicationContext.getString(R.string.UnmuteNotifications));
             } else {
                 muteMenuEntry.setText(ApplicationLoader.applicationContext.getString(R.string.MuteNotifications));
@@ -1914,12 +1919,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 }
             }
         }
-        else if (id == NotificationCenter.emojiDidLoaded)
-        {
-            if (chatListView != null) {
-                chatListView.invalidateViews();
-            }
-        }
         else if (id == NotificationCenter.updateInterfaces)
         {
             int updateMask = (Integer) args[0];
@@ -2355,7 +2354,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
     private void createDeleteMessagesAlert() {
         AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
         builder.setMessage(ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.AreYouSureDeleteMessages, selectedMessagesIds.size(), selectedMessagesIds.size()));
-        builder.setPositiveButton(ApplicationLoader.applicationContext.getString(R.string.OK), new DialogInterface.OnClickListener() {
+        builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialogInterface, int i) {
 
@@ -2372,11 +2371,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 actionBar.hideActionMode();
                 updateVisibleRows();
 
-                MrMailbox.reloadMainChatlist();
                 NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
             }
         });
-        builder.setNegativeButton(ApplicationLoader.applicationContext.getString(R.string.Cancel), null);
+        builder.setNegativeButton(R.string.Cancel, null);
         showDialog(builder.create());
     }
 
@@ -2438,7 +2436,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
     }
 
     @Override
-    public void didSelectDialog(DialogsActivity dialogsFragment, long fwd_chat_id, boolean param)
+    public void didSelectChat(ChatlistActivity dialogsFragment, long fwd_chat_id, boolean param)
     {
         if( selectedMessagesIds.size()>0) {
             int ids[] = new int[selectedMessagesIds.size()], i = 0;
@@ -2519,6 +2517,18 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                     messageCell.setHighlightedText(null);
                 }
             }
+            else if( view_ instanceof ChatActionCell ) {
+                ChatActionCell actionCell = (ChatActionCell)view_;
+                if (actionBar.isActionModeShowed()) {
+                    if ( selectedMessagesIds.containsKey(actionCell.getMessageObject().getId()) ) {
+                        actionCell.setBackgroundColor(Theme.MSG_SELECTED_BACKGROUND_COLOR);
+                    } else {
+                        actionCell.setBackgroundColor(0);
+                    }
+                } else {
+                    actionCell.setBackgroundColor(0);
+                }
+            }
         }
 
         chatListView.invalidate();
@@ -2684,6 +2694,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                         }
                     }
 
+                    @Override
+                    public void didPressedSetupMessage(ChatMessageCell cell) {
+                        querySetupCode(cell.getMessageObject().getId(), null);
+                    }
+
                     @Override
                     public boolean canPerformActions() {
                         return actionBar != null && !actionBar.isActionModeShowed();
@@ -2746,13 +2761,13 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                             if( isMailto )
                             {
                                 AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
-                                builder.setPositiveButton(mContext.getString(R.string.OK), new DialogInterface.OnClickListener() {
+                                builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
                                     @Override
                                     public void onClick(DialogInterface dialogInterface, int i) {
-                                    createChat(urlFinal);
+                                        createChat(urlFinal);
                                     }
                                 });
-                                builder.setNegativeButton(mContext.getString(R.string.Cancel), null);
+                                builder.setNegativeButton(R.string.Cancel, null);
                                 builder.setMessage(AndroidUtilities.replaceTags(String.format(mContext.getString(R.string.AskStartChatWith), urlTitle)));
                                 showDialog(builder.create());
                             }
@@ -2777,7 +2792,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                     public void didPressedImage(ChatMessageCell cell) {
                         MessageObject message = cell.getMessageObject();
 
-                        if( message.type == MessageObject.MO_TYPE3_VIDEO && MrMailbox.getMsg(message.getId()).isIncreation()!=0 ) {
+                        if( message.type == MessageObject.MO_TYPE3_VIDEO && MrMailbox.getMsg(message.getId()).isIncreation() ) {
                             return; // we're not ready (still compressing), a hint is already shown in the message itself
                         }
 
@@ -2832,8 +2847,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                     MessageObject msgDrawObj = new MessageObject(msg, true);
 
                     ChatMessageCell messageCell = (ChatMessageCell) view;
-                    messageCell.isGroupChat = m_mrChat.getType()==MrChat.MR_CHAT_GROUP;
-                    messageCell.setMessageObject(msgDrawObj);
+                    messageCell.isGroupChat = m_mrChat.isGroup();
+                    messageCell.setMessageObject(msgDrawObj, m_isChatWithDeaddrop);
                     messageCell.setCheckPressed(!disableSelection, disableSelection && selected);
                     messageCell.setHighlighted(highlightMessageId != 0 && msgDrawObj.getId() == highlightMessageId);
 
@@ -2858,8 +2873,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 }
                 else if( view instanceof ChatActionCell )
                 {
-                    // show a date headline (the date comes from the _next_ message)
                     if( msg_id == MrMsg.MR_MSG_ID_DAYMARKER && i+1 < m_msglist.length ) {
+                        // show a date headline (the date comes from the _next_ message)
                         MrMsg mrMsg = MrMailbox.getMsg(m_msglist[i+1]);
 
                         TLRPC.Message dateMsg = new TLRPC.Message();
@@ -2870,6 +2885,28 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                         msgDrawObj.type = MessageObject.MO_TYPE10_DATE_HEADLINE;
                         msgDrawObj.contentType = ROWTYPE_DATE_HEADLINE;
 
+                        ChatActionCell actionCell = (ChatActionCell) view;
+                        actionCell.setMessageObject(msgDrawObj);
+                    }
+                    else {
+                        MrMsg mrMsg = MrMailbox.getMsg(msg_id);
+
+                        MessageObject msgDrawObj = new MessageObject(mrMsg.get_TLRPC_Message(), false);
+
+                        // Add the suffix " (by ...)" to the action, see strings.xml for details.
+                        int fromId = mrMsg.getFromId();
+                        if( fromId != MrContact.MR_CONTACT_ID_DEVICE ) {
+                            String actionStr = msgDrawObj.messageText.toString();
+                            if(actionStr.endsWith(".")) { actionStr = actionStr.substring(0, actionStr.length() - 1); }
+                            if( fromId == MrContact.MR_CONTACT_ID_SELF ) {
+                                msgDrawObj.messageText = String.format(ApplicationLoader.applicationContext.getString(R.string.ActionBySelf), actionStr);
+                            }
+                            else {
+                                String fromStr = MrMailbox.getContact(mrMsg.getFromId()).getFirstName();
+                                msgDrawObj.messageText = String.format(ApplicationLoader.applicationContext.getString(R.string.ActionByUser), actionStr, fromStr);
+                            }
+                        }
+
                         ChatActionCell actionCell = (ChatActionCell) view;
                         actionCell.setMessageObject(msgDrawObj);
                     }
@@ -2891,6 +2928,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 else if( m_msglist[i]==MrMsg.MR_MSG_ID_MARKER1 ) {
                     return ROWTYPE_UNREAD_HEADLINE;
                 }
+
+                if( MrMailbox.getMsg(m_msglist[i]).isInfo() ) {
+                    return ROWTYPE_DATE_HEADLINE;
+                }
+
             }
             return ROWTYPE_MESSAGE_CELL;
         }
@@ -2922,4 +2964,85 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
             }
         }
     }
+
+    void querySetupCode(final int msg_id, String[] preload)
+    {
+        if( !MrMailbox.getMsg(msg_id).isSetupMessage()) {
+            return;
+        }
+
+        View gl = View.inflate(getParentActivity(), R.layout.setup_code_grid, null);
+        final EditText[] editTexts = {
+                (EditText) gl.findViewById(R.id.setupCode0), (EditText) gl.findViewById(R.id.setupCode1), (EditText) gl.findViewById(R.id.setupCode2),
+                (EditText) gl.findViewById(R.id.setupCode3), (EditText) gl.findViewById(R.id.setupCode4), (EditText) gl.findViewById(R.id.setupCode5),
+                (EditText) gl.findViewById(R.id.setupCode6), (EditText) gl.findViewById(R.id.setupCode7), (EditText) gl.findViewById(R.id.setupCode8)
+        };
+        AlertDialog.Builder builder1 = new AlertDialog.Builder(getParentActivity());
+        builder1.setView(gl);
+        editTexts[0].setText(MrMailbox.getMsg(msg_id).getSetupCodeBegin());
+        editTexts[0].setSelection(editTexts[0].getText().length());
+
+        for( int i = 0; i < 9; i++ ) {
+            if( preload != null && i < preload.length ) {
+                editTexts[i].setText(preload[i]);
+                editTexts[i].setSelection(editTexts[i].getText().length());
+            }
+            editTexts[i].addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    if( s.length()==4 ) {
+                        for ( int i = 0; i < 8; i++ ) {
+                            if( editTexts[i].hasFocus() && editTexts[i+1].getText().length()<4 ) {
+                                editTexts[i+1].requestFocus();
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                @Override
+                public void afterTextChanged(Editable s) {
+                }
+            });
+        }
+
+        builder1.setTitle(ApplicationLoader.applicationContext.getString(R.string.AutocryptKeyTransfer));
+        builder1.setMessage(AndroidUtilities.replaceTags(ApplicationLoader.applicationContext.getString(R.string.AutocryptKeyTransferPleaseEnterCode)));
+        builder1.setNegativeButton(R.string.Cancel, null);
+        builder1.setCancelable(false); // prevent the dialog from being dismissed accidentally (when the dialog is closed, the setup code is gone forever and the user has to create a new setup message)
+        builder1.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                String setup_code = "";
+                final String[] preload = new String[9];
+                for ( int i = 0; i < 9; i++ ) {
+                    preload[i] = editTexts[i].getText().toString();
+                    setup_code += preload[i];
+                }
+                boolean success = MrMailbox.continueKeyTransfer(msg_id, setup_code);
+
+                AlertDialog.Builder builder2 = new AlertDialog.Builder(getParentActivity());
+                builder2.setTitle(ApplicationLoader.applicationContext.getString(R.string.AutocryptKeyTransfer));
+                builder2.setMessage(AndroidUtilities.replaceTags(ApplicationLoader.applicationContext.getString(success? R.string.AutocryptKeyTransferSucceeded : R.string.AutocryptKeyTransferBadCode)));
+                if( success ) {
+                    builder2.setPositiveButton(R.string.OK, null);
+                }
+                else {
+                    builder2.setNegativeButton(R.string.Cancel, null);
+                    builder2.setPositiveButton(R.string.Retry, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            querySetupCode(msg_id, preload);
+                        }
+                    });
+                }
+                showDialog(builder2.create());
+            }
+        });
+        showDialog(builder1.create());
+    }
 }

MessengerProj/src/main/java/com/b44t/messenger/Components/AnimatedFileDrawable.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;

MessengerProj/src/main/java/com/b44t/messenger/Components/AvatarDrawable.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;

MessengerProj/src/main/java/com/b44t/messenger/Components/AvatarUpdater.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.Manifest;
 import android.app.Activity;
@@ -40,11 +40,11 @@ import com.b44t.messenger.MediaController;
 import com.b44t.messenger.TLRPC;
 import com.b44t.messenger.FileLoader;
 import com.b44t.messenger.UserConfig;
-import com.b44t.ui.LaunchActivity;
-import com.b44t.ui.PhotoAlbumPickerActivity;
-import com.b44t.ui.PhotoCropActivity;
-import com.b44t.ui.ActionBar.BaseFragment;
-import com.b44t.ui.PhotoViewer;
+import com.b44t.messenger.LaunchActivity;
+import com.b44t.messenger.PhotoAlbumPickerActivity;
+import com.b44t.messenger.PhotoCropActivity;
+import com.b44t.messenger.ActionBar.BaseFragment;
+import com.b44t.messenger.PhotoViewer;
 
 import java.io.File;
 import java.util.ArrayList;

MessengerProj/src/main/java/com/b44t/messenger/Components/BackupImageView.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -32,6 +32,8 @@ import android.util.AttributeSet;
 import android.view.View;
 
 import com.b44t.messenger.ImageReceiver;
+import com.b44t.messenger.MrMailbox;
+import com.b44t.messenger.R;
 import com.b44t.messenger.TLObject;
 import com.b44t.messenger.TLRPC;
 
@@ -142,11 +144,19 @@ public class BackupImageView extends View {
 
     @Override
     protected void onDraw(Canvas canvas) {
+        int x, y, w, h;
         if (width != -1 && height != -1) {
-            imageReceiver.setImageCoords((getWidth() - width) / 2, (getHeight() - height) / 2, width, height);
+            x = (getWidth() - width) / 2;
+            y = (getHeight() - height) / 2;
+            w = width;
+            h = height;
         } else {
-            imageReceiver.setImageCoords(0, 0, getWidth(), getHeight());
+            x = 0;
+            y = 0;
+            w = getWidth();
+            h = getHeight();
         }
+        imageReceiver.setImageCoords(x, y, w, h);
         imageReceiver.draw(canvas);
     }
 }

MessengerProj/src/main/java/com/b44t/messenger/Components/BaseFragmentAdapter.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Adapters;
+package com.b44t.messenger.Components;
 
 import android.database.DataSetObserver;
 import android.view.View;

MessengerProj/src/main/java/com/b44t/messenger/Components/Browser.java

@@ -21,14 +21,14 @@
  ******************************************************************************/
 
 
-package com.b44t.messenger.browser;
+package com.b44t.messenger.Components;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
-import com.b44t.ui.LaunchActivity;
+import com.b44t.messenger.LaunchActivity;
 
 public class Browser {
 

MessengerProj/src/main/java/com/b44t/messenger/Components/ChatActivityEnterView.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.Manifest;
 import android.animation.Animator;
@@ -40,7 +40,6 @@ import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
 import android.os.Build;
 import android.os.PowerManager;
-import android.os.SystemClock;
 import android.text.Editable;
 import android.text.SpannableStringBuilder;
 import android.text.TextWatcher;
@@ -61,7 +60,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.Emoji;
+import com.b44t.messenger.EmojiInputView;
 import com.b44t.messenger.MediaController;
 import com.b44t.messenger.MessageObject;
 import com.b44t.messenger.MrContact;
@@ -72,11 +71,10 @@ import com.b44t.messenger.R;
 import com.b44t.messenger.TLRPC;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
 import com.b44t.messenger.ApplicationLoader;
-import com.b44t.ui.ActionBar.Theme;
-import com.b44t.ui.ChatActivity;
+import com.b44t.messenger.ActionBar.Theme;
+import com.b44t.messenger.ChatActivity;
 
 import java.io.File;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 
 public class ChatActivityEnterView extends FrameLayout implements NotificationCenter.NotificationCenterDelegate, SizeNotifierFrameLayout.SizeNotifierFrameLayoutDelegate /*, StickersAlert.StickersAlertDelegate*/ {
@@ -86,7 +84,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
         void needSendTyping();
         void onTextChanged(CharSequence text, boolean bigChange);
         void onWindowSizeChanged(int size);
-        void onStickersTab(boolean opened);
     }
 
     private class SeekBarWaveformView extends View {
@@ -225,7 +222,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
     private EditTextCaption messageEditText;
     private ImageView sendButton;
     private ImageView emojiButton;
-    private EmojiView emojiView;
+    private EmojiInputView emojiView;
     private TextView recordTimeText;
     private ImageView audioRecordButton;
     private FrameLayout recordPanel;
@@ -424,7 +421,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.recordProgressChanged);
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.closeChats);
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.audioDidSent);
-        NotificationCenter.getInstance().addObserver(this, NotificationCenter.emojiDidLoaded);
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.audioRouteChanged);
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.audioDidReset);
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.audioProgressDidChanged);
@@ -570,7 +566,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                     for (int i = 0; i < spans.length; i++) {
                         editable.removeSpan(spans[i]);
                     }
-                    Emoji.replaceEmoji(editable, messageEditText.getPaint().getFontMetricsInt(), AndroidUtilities.dp(20), false);
+                    EmojiInputView.replaceEmoji(editable, false);
                     processChange = false;
                 }
             }
@@ -594,7 +590,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
 
         ImageView imageView = new ImageView(context);
         imageView.setScaleType(ImageView.ScaleType.CENTER);
-        imageView.setImageResource(R.drawable.delete_reply);
+        imageView.setImageResource(R.drawable.dismiss_recording);
         recordedAudioPanel.addView(imageView, LayoutHelper.createFrame(48, 48));
         imageView.setOnClickListener(new OnClickListener() {
             @Override
@@ -799,24 +795,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
         return false;
     }
 
-    public void setAllowStickersAndGifs(boolean value, boolean value2) {
-        if ((allowStickers != value || allowGifs != value2) && emojiView != null) {
-            if (emojiView.getVisibility() == VISIBLE) {
-                hidePopup(false);
-            }
-            sizeNotifierLayout.removeView(emojiView);
-            emojiView = null;
-        }
-        allowStickers = value;
-        allowGifs = value2;
-    }
-
-    public void setOpenGifsTabFirst() {
-        createEmojiView();
-        emojiView.loadGifRecent();
-        emojiView.switchToGifRecent();
-    }
-
     public boolean isTopViewVisible() {
         return false;
     }
@@ -838,13 +816,9 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.recordProgressChanged);
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.closeChats);
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.audioDidSent);
-        NotificationCenter.getInstance().removeObserver(this, NotificationCenter.emojiDidLoaded);
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.audioRouteChanged);
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.audioDidReset);
         NotificationCenter.getInstance().removeObserver(this, NotificationCenter.audioProgressDidChanged);
-        if (emojiView != null) {
-            emojiView.onDestroy();
-        }
         if (mWakeLock != null) {
             try {
                 mWakeLock.release();
@@ -1331,9 +1305,9 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
         if (emojiView != null) {
             return;
         }
-        emojiView = new EmojiView(allowStickers, allowGifs, parentActivity);
+        emojiView = new EmojiInputView(parentActivity);
         emojiView.setVisibility(GONE);
-        emojiView.setListener(new EmojiView.Listener() {
+        emojiView.setListener(new EmojiInputView.Listener() {
             public boolean onBackspace() {
                 if (messageEditText.length() == 0) {
                     return false;
@@ -1349,7 +1323,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                 }
                 try {
                     innerTextChange = 2;
-                    CharSequence localCharSequence = Emoji.replaceEmoji(symbol, messageEditText.getPaint().getFontMetricsInt(), AndroidUtilities.dp(20), false);
+                    CharSequence localCharSequence = EmojiInputView.replaceEmoji(symbol, false);
                     messageEditText.setText(messageEditText.getText().insert(i, localCharSequence));
                     int j = i + localCharSequence.length();
                     messageEditText.setSelection(j, j);
@@ -1360,47 +1334,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                 }
             }
 
-            /*public void onStickerSelected(TLRPC.Document sticker) {
-                ChatActivityEnterView.this.onStickerSelected(sticker);
-            }*/
-
-            @Override
-            public void onStickersSettingsClick() {
-                if (parentFragment != null) {
-                    //parentFragment.presentFragment(new StickersActivity()); -- EDIT BY MR
-                }
-            }
-
-            @Override
-            public void onGifSelected(TLRPC.Document gif) {
-                SendMessagesHelper.getInstance().sendSticker(gif, dialog_id);
-                if ((int) dialog_id == 0) {
-                    //MessagesController.getInstance().saveGif(gif);
-                }
-                if (delegate != null) {
-                    delegate.onMessageSend(null);
-                }
-            }
-
-            @Override
-            public void onGifTab(boolean opened) {
-                if (!AndroidUtilities.usingHardwareInput) {
-                    if (opened) {
-                        if (messageEditText.length() == 0) {
-                            messageEditText.setText("@gif ");
-                            messageEditText.setSelection(messageEditText.length());
-                        }
-                    } else if (messageEditText.getText().toString().equals("@gif ")) {
-                        messageEditText.setText("");
-                    }
-                }
-            }
-
-            @Override
-            public void onStickersTab(boolean opened) {
-                delegate.onStickersTab(opened);
-            }
-
             @Override
             public void onClearEmojiRecent() {
                 if (parentFragment == null || parentActivity == null) {
@@ -1408,13 +1341,13 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                 }
                 AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
                 builder.setMessage(ApplicationLoader.applicationContext.getString(R.string.ClearRecentEmoji));
-                builder.setPositiveButton(ApplicationLoader.applicationContext.getString(R.string.ClearButton).toUpperCase(), new DialogInterface.OnClickListener() {
+                builder.setPositiveButton(R.string.ClearButton, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        emojiView.clearRecentEmoji();
+                        emojiView.clearRecent();
                     }
                 });
-                builder.setNegativeButton(ApplicationLoader.applicationContext.getString(R.string.Cancel), null);
+                builder.setNegativeButton(R.string.Cancel, null);
                 parentFragment.showDialog(builder.create());
             }
         });
@@ -1422,14 +1355,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
         sizeNotifierLayout.addView(emojiView);
     }
 
-    /*@Override
-    public void onStickerSelected(TLRPC.Document sticker) {
-        SendMessagesHelper.getInstance().sendSticker(sticker, dialog_id);
-        if (delegate != null) {
-            delegate.onMessageSend(null);
-        }
-    }*/
-
     private void showPopup(int show, int contentType /*0=emojiView, 1=botKeyboardView*/ ) {
         if (show == 1) {
             if (contentType == 0 && emojiView == null) {
@@ -1531,17 +1456,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
         return emojiView != null && emojiView.getVisibility() == VISIBLE;
     }
 
-    public boolean isKeyboardVisible() {
-        return keyboardVisible;
-    }
-
-    public void addRecentGif(MediaController.SearchImage searchImage) {
-        if (emojiView == null) {
-            return;
-        }
-        emojiView.addRecentGif(searchImage);
-    }
-
     @Override
     public void onSizeChanged(int height, boolean isWidthGreater) {
         if (height > AndroidUtilities.dp(50) && keyboardVisible) {
@@ -1612,11 +1526,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
 
     @Override
     public void didReceivedNotification(int id, Object... args) {
-        if (id == NotificationCenter.emojiDidLoaded) {
-            if (emojiView != null) {
-                emojiView.invalidateViews();
-            }
-        } else if (id == NotificationCenter.recordProgressChanged) {
+        if (id == NotificationCenter.recordProgressChanged) {
             long t = (Long) args[0];
             Long time = t / 1000;
             int ms = (int) (t % 1000L) / 10;
@@ -1658,8 +1568,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                 TLRPC.TL_message message = new TLRPC.TL_message();
                 message.out = true;
                 message.id = 0;
-                message.to_id = new TLRPC.TL_peerUser();
-                message.to_id.user_id = message.from_id = MrContact.MR_CONTACT_ID_SELF;
+                message.from_id = MrContact.MR_CONTACT_ID_SELF;
                 message.date = (int) (System.currentTimeMillis() / 1000);
                 message.message = "-1";
                 message.attachPath = audioToSendPath;

MessengerProj/src/main/java/com/b44t/messenger/Components/ChatAttachAlert.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.Manifest;
 import android.animation.Animator;
@@ -49,19 +49,18 @@ import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ApplicationLoader;
-import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.MediaController;
 import com.b44t.messenger.MessageObject;
 import com.b44t.messenger.NotificationCenter;
-import com.b44t.messenger.support.widget.LinearLayoutManager;
+import com.b44t.messenger.aosp.LinearLayoutManager;
 import com.b44t.messenger.R;
-import com.b44t.messenger.support.widget.RecyclerView;
+import com.b44t.messenger.aosp.RecyclerView;
 import com.b44t.messenger.TLRPC;
-import com.b44t.ui.ActionBar.BottomSheet;
-import com.b44t.ui.ActionBar.Theme;
-import com.b44t.ui.Cells.PhotoAttachPhotoCell;
-import com.b44t.ui.ChatActivity;
-import com.b44t.ui.PhotoViewer;
+import com.b44t.messenger.ActionBar.BottomSheet;
+import com.b44t.messenger.ActionBar.Theme;
+import com.b44t.messenger.Cells.PhotoAttachPhotoCell;
+import com.b44t.messenger.ChatActivity;
+import com.b44t.messenger.PhotoViewer;
 
 import java.util.ArrayList;
 import java.util.HashMap;

MessengerProj/src/main/java/com/b44t/messenger/Components/ChatAvatarContainer.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.os.Build;
@@ -34,11 +34,11 @@ import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ContactsController;
 import com.b44t.messenger.MrChat;
 import com.b44t.messenger.MrMailbox;
-import com.b44t.ui.ActionBar.ActionBar;
-import com.b44t.ui.ActionBar.SimpleTextView;
-import com.b44t.ui.ActionBar.Theme;
-import com.b44t.ui.ChatActivity;
-import com.b44t.ui.ProfileActivity;
+import com.b44t.messenger.ActionBar.ActionBar;
+import com.b44t.messenger.ActionBar.SimpleTextView;
+import com.b44t.messenger.ActionBar.Theme;
+import com.b44t.messenger.ChatActivity;
+import com.b44t.messenger.ProfileActivity;
 
 public class ChatAvatarContainer extends FrameLayout {
 
@@ -60,7 +60,6 @@ public class ChatAvatarContainer extends FrameLayout {
         titleTextView.setTextColor(Theme.ACTION_BAR_TITLE_COLOR);
         titleTextView.setTextSize(18);
         titleTextView.setGravity(Gravity.START);
-        titleTextView.setLeftDrawableTopPadding(-AndroidUtilities.dp(1.3f));
         titleTextView.setRightDrawableTopPadding(-AndroidUtilities.dp(1.3f));
         addView(titleTextView);
 
@@ -74,7 +73,7 @@ public class ChatAvatarContainer extends FrameLayout {
             @Override
             public void onClick(View v) {
                 Bundle args = new Bundle();
-                if( parentFragment.m_mrChat.getType()== MrChat.MR_CHAT_GROUP ) {
+                if( parentFragment.m_mrChat.isGroup() ) {
                     args.putInt("chat_id",  parentFragment.m_mrChat.getId());
                 }
                 else {
@@ -111,7 +110,7 @@ public class ChatAvatarContainer extends FrameLayout {
     }
 
     public void setTitleIcons(int leftIcon, int rightIcon) {
-        titleTextView.setLeftDrawable(leftIcon);
+        subtitleTextView.setLeftDrawable(leftIcon);
         titleTextView.setRightDrawable(rightIcon);
     }
 

MessengerProj/src/main/java/com/b44t/messenger/Components/CheckBoxView.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.animation.ObjectAnimator;
 import android.content.Context;

MessengerProj/src/main/java/com/b44t/messenger/Components/ChipSpan.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;

MessengerProj/src/main/java/com/b44t/messenger/Components/ClippingImageView.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.graphics.Bitmap;

MessengerProj/src/main/java/com/b44t/messenger/Components/ColorPickerView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.graphics.Canvas;

MessengerProj/src/main/java/com/b44t/messenger/Components/EmptyTextProgressView.java

@@ -20,7 +20,7 @@
  *
  ******************************************************************************/
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.util.TypedValue;
@@ -32,7 +32,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.R;
 
 public class EmptyTextProgressView extends FrameLayout {

MessengerProj/src/main/java/com/b44t/messenger/Components/ForegroundDetector.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;

MessengerProj/src/main/java/com/b44t/messenger/Components/LayoutHelper.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;

MessengerProj/src/main/java/com/b44t/messenger/Components/LinkPath.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.graphics.Path;
 import android.text.StaticLayout;

MessengerProj/src/main/java/com/b44t/messenger/Components/NumberTextView.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;

MessengerProj/src/main/java/com/b44t/messenger/Components/PagerSlidingTabStrip.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.graphics.Canvas;

MessengerProj/src/main/java/com/b44t/messenger/Components/PasscodeView.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -61,13 +61,12 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.NotificationCenter;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.R;
 import com.b44t.messenger.UserConfig;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.ActionBar.Theme;
 
 import java.util.ArrayList;
 import java.util.Locale;

MessengerProj/src/main/java/com/b44t/messenger/Components/PhotoCropView.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.graphics.Bitmap;

MessengerProj/src/main/java/com/b44t/messenger/Components/PhotoEditorSeekBar.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.graphics.Canvas;

MessengerProj/src/main/java/com/b44t/messenger/Components/PhotoFilterBlurControl.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.graphics.Canvas;

MessengerProj/src/main/java/com/b44t/messenger/Components/PhotoFilterCurvesControl.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

MessengerProj/src/main/java/com/b44t/messenger/Components/PhotoFilterView.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -49,15 +49,14 @@ import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.ApplicationLoader;
-import com.b44t.messenger.LocaleController;
-import com.b44t.messenger.support.widget.LinearLayoutManager;
-import com.b44t.messenger.support.widget.RecyclerView;
+import com.b44t.messenger.aosp.LinearLayoutManager;
+import com.b44t.messenger.aosp.RecyclerView;
 import com.b44t.messenger.DispatchQueue;
 import com.b44t.messenger.R;
 import com.b44t.messenger.Utilities;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
-import com.b44t.ui.ActionBar.Theme;
-import com.b44t.ui.Cells.PhotoEditToolCell;
+import com.b44t.messenger.ActionBar.Theme;
+import com.b44t.messenger.Cells.PhotoEditToolCell;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

MessengerProj/src/main/java/com/b44t/messenger/Components/PickerBottomLayout.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.graphics.Typeface;
@@ -33,9 +33,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.R;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.ActionBar.Theme;
 
 public class PickerBottomLayout extends FrameLayout {
 

MessengerProj/src/main/java/com/b44t/messenger/Components/Point.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 public class Point {
     public float x;

MessengerProj/src/main/java/com/b44t/messenger/Components/RadioButton.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.animation.ObjectAnimator;
 import android.content.Context;
@@ -34,7 +34,7 @@ import android.graphics.PorterDuffXfermode;
 import android.view.View;
 
 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.ui.ActionBar.Theme;
+import com.b44t.messenger.ActionBar.Theme;
 
 public class RadioButton extends View {
 

MessengerProj/src/main/java/com/b44t/messenger/Components/Rect.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 public class Rect {
 

MessengerProj/src/main/java/com/b44t/messenger/Components/RecyclerListView.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -34,7 +34,7 @@ import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 
 import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.support.widget.RecyclerView;
+import com.b44t.messenger.aosp.RecyclerView;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

MessengerProj/src/main/java/com/b44t/messenger/Components/Scroller.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.hardware.SensorManager;

MessengerProj/src/main/java/com/b44t/messenger/Components/SeekBar.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.graphics.Canvas;

MessengerProj/src/main/java/com/b44t/messenger/Components/SeekBarWaveform.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.graphics.Canvas;

MessengerProj/src/main/java/com/b44t/messenger/Components/Size.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 public class Size {
     public float width;

MessengerProj/src/main/java/com/b44t/messenger/Components/SizeNotifierFrameLayout.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.graphics.Canvas;

MessengerProj/src/main/java/com/b44t/messenger/Components/SizeNotifierFrameLayoutPhoto.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.graphics.Rect;

MessengerProj/src/main/java/com/b44t/messenger/Components/StaticLayoutEx.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.os.Build;
 import android.text.Layout;

MessengerProj/src/main/java/com/b44t/messenger/Components/TypefaceSpan.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.graphics.Paint;
 import android.graphics.Typeface;

MessengerProj/src/main/java/com/b44t/messenger/Components/VideoSeekBarView.java

@@ -21,17 +21,15 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
 import android.content.Context;
 import android.graphics.Canvas;
-import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.b44t.messenger.AndroidUtilities;
 import com.b44t.messenger.R;
 
 public class VideoSeekBarView extends View {

MessengerProj/src/main/java/com/b44t/messenger/Components/VideoTimelineView.java

@@ -21,9 +21,8 @@
  ******************************************************************************/
 
 
-package com.b44t.ui.Components;
+package com.b44t.messenger.Components;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;

MessengerProj/src/main/java/com/b44t/messenger/ContactAddActivity.java

@@ -20,7 +20,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui;
+package com.b44t.messenger;
 
 import android.content.Context;
 import android.content.Intent;
@@ -36,16 +36,12 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.MrContact;
-import com.b44t.messenger.MrMailbox;
-import com.b44t.messenger.NotificationCenter;
-import com.b44t.messenger.R;
-import com.b44t.ui.ActionBar.ActionBar;
-import com.b44t.ui.ActionBar.ActionBarMenu;
-import com.b44t.ui.ActionBar.BaseFragment;
-import com.b44t.ui.Cells.HeaderCell;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.ActionBar.ActionBar;
+import com.b44t.messenger.ActionBar.ActionBarMenu;
+import com.b44t.messenger.ActionBar.BaseFragment;
+import com.b44t.messenger.Cells.HeaderCell;
+import com.b44t.messenger.Cells.TextInfoCell;
+import com.b44t.messenger.Components.LayoutHelper;
 
 
 public class ContactAddActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate {
@@ -56,7 +52,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
 
     private EditText nameTextView;
     private EditText emailTextView;
-    private String nameToSet = null;
+    private String prefill;
     private int chat_id; // only used for EDIT_NAME in chats
     private int user_id;
     private boolean create_chat_when_done;
@@ -75,6 +71,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
         user_id = getArguments().getInt("user_id", 0);
         chat_id = getArguments().getInt("chat_id", 0);
         create_chat_when_done = getArguments().getBoolean("create_chat_when_done", false);
+        prefill = getArguments().getString("prefill", "");
         return super.onFragmentCreate();
     }
 
@@ -92,10 +89,22 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
     @Override
     public View createView(final Context context) {
 
+        String nameToSet = null;
+        String emailToSet = null;
+
         actionBar.setBackButtonImage(R.drawable.ic_close_white);
-        actionBar.setAllowOverlayTitle(true);
         if (do_what==CREATE_CONTACT) {
             actionBar.setTitle(context.getString(R.string.NewContactTitle));
+
+            if( prefill!=null && !prefill.isEmpty()) {
+                if( prefill.contains("@") ) {
+                    emailToSet = prefill;
+                }
+                else {
+                    nameToSet = prefill;
+                }
+            }
+
         } else {
             actionBar.setTitle(context.getString(R.string.EditName));
             if( user_id!=0 ) {
@@ -168,9 +177,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
             TextView label = HeaderCell.createTextView(context, context.getString(R.string.Name));
             linearLayout.addView(label, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_VERTICAL, 18, 18, 18, 0));
         }
-        else {
-            nameTextView.setHint(context.getString(R.string.Name));
-        }
+        nameTextView.setHint(context.getString(R.string.Name));
 
         if (nameToSet != null) {
             nameTextView.setText(nameToSet);
@@ -178,7 +185,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
         nameTextView.setMaxLines(4);
         nameTextView.setGravity(Gravity.CENTER_VERTICAL | Gravity.START);
         nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 18);
-        nameTextView.setHintTextColor(0xff979797);
+        nameTextView.setHintTextColor(0xffBBBBBB);
         nameTextView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
         nameTextView.setInputType(InputType.TYPE_TEXT_FLAG_CAP_WORDS);
         nameTextView.setPadding(0, 0, 0, AndroidUtilities.dp(8));
@@ -193,8 +200,12 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
             linearLayout.addView(label, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_VERTICAL, 18, 18, 18, 0));
 
             emailTextView = new EditText(context);
+            if (emailToSet != null) {
+                emailTextView.setText(emailToSet);
+            }
             emailTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 18);
-            emailTextView.setHintTextColor(0xff979797);
+            emailTextView.setHint(R.string.ExampleEmailAddr);
+            emailTextView.setHintTextColor(0xffBBBBBB);
             emailTextView.setTextColor(0xff212121);
             emailTextView.setMaxLines(4);
             emailTextView.setGravity(Gravity.START);
@@ -204,7 +215,19 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
             linearLayout.addView(emailTextView, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_VERTICAL, 18, 1, 18, 0));
         }
 
-        nameToSet = null;
+        if( do_what == EDIT_NAME && chat_id != 0 ) {
+            TextView textView = TextInfoCell.createTextView(context);
+            textView.setText(R.string.EditedNameWillBeShared);
+            linearLayout.addView(textView, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_VERTICAL, 18, 18, 18, 0));
+        }
+
+        if( nameToSet != null ) {
+            nameTextView.setSelection(nameToSet.length());
+        }
+        if( emailToSet != null ) {
+            emailTextView.setSelection(emailToSet.length());
+        }
+
         return fragmentView;
     }
 
@@ -212,28 +235,6 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent
     public void onActivityResultFragment(int requestCode, int resultCode, Intent data) {
     }
 
-    @Override
-    public void saveSelfArgs(Bundle args) {
-        if (nameTextView != null) {
-            String text = nameTextView.getText().toString();
-            if (text != null && text.length() != 0) {
-                args.putString("nameTextView", text);
-            }
-        }
-    }
-
-    @Override
-    public void restoreSelfArgs(Bundle args) {
-        String text = args.getString("nameTextView");
-        if (text != null) {
-            if (nameTextView != null) {
-                nameTextView.setText(text);
-            } else {
-                nameToSet = text;
-            }
-        }
-    }
-
     @Override
     public void onTransitionAnimationEnd(boolean isOpen, boolean backward) {
         if (isOpen && nameTextView!=null) {

MessengerProj/src/main/java/com/b44t/messenger/ContactsActivity.java

@@ -23,12 +23,13 @@
 
 // this file also contains the GroupCreateActivity functionality
 
-package com.b44t.ui;
+package com.b44t.messenger;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
@@ -45,6 +46,7 @@ import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
@@ -54,24 +56,15 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.ApplicationLoader;
-import com.b44t.messenger.ContactsController;
-import com.b44t.messenger.LocaleController;
-import com.b44t.messenger.MrContact;
-import com.b44t.messenger.MrMailbox;
-import com.b44t.messenger.Utilities;
-import com.b44t.messenger.TLRPC;
-import com.b44t.messenger.NotificationCenter;
-import com.b44t.messenger.R;
-import com.b44t.ui.Adapters.ContactsAdapter;
-import com.b44t.ui.Cells.UserCell;
-import com.b44t.ui.ActionBar.ActionBar;
-import com.b44t.ui.ActionBar.ActionBarMenu;
-import com.b44t.ui.ActionBar.ActionBarMenuItem;
-import com.b44t.ui.ActionBar.BaseFragment;
-import com.b44t.ui.Components.ChipSpan;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Cells.TextSettingsCell;
+import com.b44t.messenger.Components.BaseFragmentAdapter;
+import com.b44t.messenger.Cells.UserCell;
+import com.b44t.messenger.ActionBar.ActionBar;
+import com.b44t.messenger.ActionBar.ActionBarMenu;
+import com.b44t.messenger.ActionBar.ActionBarMenuItem;
+import com.b44t.messenger.ActionBar.BaseFragment;
+import com.b44t.messenger.Components.ChipSpan;
+import com.b44t.messenger.Components.LayoutHelper;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -92,21 +85,30 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
     private HashMap<Integer, ChipSpan> selectedContacts = new HashMap<>();
     private ArrayList<ChipSpan> allSpans = new ArrayList<>();
 
-    private int             do_what = 0;
-    public final static int SELECT_CONTACT_FOR_NEW_CHAT   = 1;
-    public final static int SELECT_CONTACTS_FOR_NEW_GROUP = 2;
-    public final static int ADD_CONTACTS_TO_GROUP         = 3;
-    public final static int SELECT_CONTACT_TO_BLOCK       = 4;
-    public final static int SELECT_CONTACT_TO_ATTACH      = 5;
+    private int rowNewGroup = -1;
+    private int rowNewVerifiedGroup = -1;
+    private int rowAddContact = -1;
+    private int rowInviteViaQr = -1;
+    private int rowContactFirst = -1;
+    private int rowContactLast = -1;
+    private int rowCount = 0;
+
+    private int              do_what = 0;
+    public final static int  SELECT_CONTACT_FOR_NEW_CHAT   = 1;
+    public final static int  SELECT_CONTACTS_FOR_NEW_GROUP = 2;
+    public final static int  SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP = 3;
+    public final static int  ADD_CONTACTS_TO_GROUP         = 4;
+    public final static int  ADD_CONTACTS_TO_VERIFIED_GROUP = 5;
+    public final static int  SELECT_CONTACT_TO_BLOCK       = 6;
+    public final static int  SELECT_CONTACT_TO_ATTACH      = 7;
+    private final static int id_add_contact                = 20; // do_what is also used as internal IDs
+    private final static int id_done_button                = 30;
 
     private ContactsActivityDelegate delegate;
 
     private String title;
     private String subtitle;
 
-    private final static int id_add_contact = 2;
-    private final static int id_done_button = 3;
-    private final static int id_toggle      = 4;
 
     public interface ContactsActivityDelegate {
         void didSelectContact(int user_id);
@@ -137,7 +139,12 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
             title      = ApplicationLoader.applicationContext.getString(R.string.NewGroup);
             subtitle   = ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.MeAndMembers, 0, 0);
         }
-        else if( do_what == ADD_CONTACTS_TO_GROUP )
+        else if( do_what == SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP )
+        {
+            title      = ApplicationLoader.applicationContext.getString(R.string.NewVerifiedGroup);
+            subtitle   = ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.MeAndMembers, 0, 0);
+        }
+        else if( do_what == ADD_CONTACTS_TO_GROUP || do_what == ADD_CONTACTS_TO_VERIFIED_GROUP )
         {
             title = ApplicationLoader.applicationContext.getString(R.string.AddMember);
         }
@@ -178,8 +185,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
         }
 
         // initialize action
-        actionBar.setBackButtonImage(do_what == SELECT_CONTACTS_FOR_NEW_GROUP? R.drawable.ic_close_white : R.drawable.ic_ab_back);
-        actionBar.setAllowOverlayTitle(true);
+        actionBar.setBackButtonImage((do_what == SELECT_CONTACTS_FOR_NEW_GROUP||do_what == SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP)? R.drawable.ic_close_white : R.drawable.ic_ab_back);
         if( title != null ) {
             actionBar.setTitle(title);
             if( subtitle != null ) {
@@ -199,7 +205,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
                             AndroidUtilities.runOnUIThread(new Runnable() {
                                 @Override
                                 public void run() {
-                                    NotificationCenter.getInstance().postNotificationName(NotificationCenter.contactsDidLoaded);
+                                    NotificationCenter.getInstance().postNotificationName(NotificationCenter.contactsDidLoaded, 0);
                                 }
                             });
                         }
@@ -226,11 +232,11 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
                 {
                     finishFragment();
                 }
-                else if( id == id_toggle )
+                else if( id == SELECT_CONTACT_FOR_NEW_CHAT || id == SELECT_CONTACTS_FOR_NEW_GROUP || id == SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP )
                 {
                     Bundle args = new Bundle();
-                    args.putInt("do_what", do_what==SELECT_CONTACTS_FOR_NEW_GROUP? SELECT_CONTACT_FOR_NEW_CHAT : SELECT_CONTACTS_FOR_NEW_GROUP);
-                    presentFragment(new ContactsActivity(args), true /*removeLast*/, true /*forceWithoutAnimation*/);
+                    args.putInt("do_what", id);
+                    presentFragment(new ContactsActivity(args), true , true );
                 }
                 else if( id == id_add_contact )
                 {
@@ -246,6 +252,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
                     result.addAll(selectedContacts.keySet());
                     Bundle args = new Bundle();
                     args.putIntegerArrayList("result", result);
+                    args.putInt("do_what", do_what);
                     presentFragment(new GroupCreateFinalActivity(args));
                 }
             }
@@ -253,20 +260,40 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
 
         ActionBarMenu menu = actionBar.createMenu();
 
-        if( do_what == SELECT_CONTACTS_FOR_NEW_GROUP ) {
+        if( do_what == SELECT_CONTACTS_FOR_NEW_GROUP || do_what == SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP ) {
             menu.addItem(id_done_button, R.drawable.ic_done); // should the "done" button be right or left of other buttons?  Esp. for the "more" button, it looks better if it is right left of it - beside the title describing the action and nearer to "cancel"; the other buttons has not so much to do with the group but switches to other types.  In other situations, the icon-oder-decision may be different.
         }
 
+        /* -- instead of a menu we're testing buttons in the list
+
         ActionBarMenuItem item = menu.addItem(10, R.drawable.ic_ab_other);
-        if (do_what == SELECT_CONTACT_FOR_NEW_CHAT || do_what == SELECT_CONTACTS_FOR_NEW_GROUP) {
-            item.addSubItem(id_toggle, do_what == SELECT_CONTACT_FOR_NEW_CHAT ? context.getString(R.string.NewGroup) : context.getString(R.string.NewChat), 0);
+        if (do_what == SELECT_CONTACT_FOR_NEW_CHAT || do_what == SELECT_CONTACTS_FOR_NEW_GROUP || do_what == SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP) {
+            if( do_what!=SELECT_CONTACT_FOR_NEW_CHAT ) { item.addSubItem(SELECT_CONTACT_FOR_NEW_CHAT, context.getString(R.string.NewChat)); }
+            if( do_what!=SELECT_CONTACTS_FOR_NEW_GROUP ) { item.addSubItem(SELECT_CONTACTS_FOR_NEW_GROUP, context.getString(R.string.NewGroup)); }
+
+            if( MrMailbox.getConfigInt("qr_enabled", 0) != 0 ) {
+                if (do_what != SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP) {
+                    item.addSubItem(SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP, context.getString(R.string.NewVerifiedGroup));
+                }
+            }
         }
-        item.addSubItem(id_add_contact, context.getString(R.string.NewContactTitle), 0);
+        item.addSubItem(id_add_contact, context.getString(R.string.NewContactTitle));
+        */
 
+        int listflags = 0;
+        if( do_what==SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP||do_what==ADD_CONTACTS_TO_VERIFIED_GROUP) {
+            listflags |= MrMailbox.MR_GCL_VERIFIED_ONLY;
+        }
 
-        listViewAdapter = new ContactsAdapter(context);
-        listViewAdapter.setCheckedMap(selectedContacts);
+        if( do_what==SELECT_CONTACT_FOR_NEW_CHAT || do_what==SELECT_CONTACT_TO_ATTACH ) {
+            listflags |= MrMailbox.MR_GCL_ADD_SELF;
+        }
 
+        listViewAdapter = new ContactsAdapter(context, listflags, do_what==SELECT_CONTACT_FOR_NEW_CHAT);
+
+        if( do_what == SELECT_CONTACTS_FOR_NEW_GROUP || do_what == SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP ) {
+            listViewAdapter.setCheckedMap(selectedContacts);
+        }
 
         fragmentView = new LinearLayout(context);
 
@@ -279,7 +306,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
         // START SEARCH FIELD
         userSelectEditText = new EditText(context);
         userSelectEditText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
-        userSelectEditText.setHintTextColor(0xff979797);
+        userSelectEditText.setHintTextColor(0xffBBBBBB);
         userSelectEditText.setTextColor(0xff212121);
         userSelectEditText.setInputType(InputType.TYPE_TEXT_VARIATION_FILTER | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
         userSelectEditText.setMinimumHeight(AndroidUtilities.dp(54));
@@ -291,7 +318,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
         userSelectEditText.setPadding(0, 0, 0, 0);
         userSelectEditText.setImeOptions(EditorInfo.IME_ACTION_DONE | EditorInfo.IME_FLAG_NO_EXTRACT_UI);
         userSelectEditText.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
-        frameLayout.addView(userSelectEditText, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.TOP | Gravity.START, 10, 0, 10, 0));
+        frameLayout.addView(userSelectEditText, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.TOP | Gravity.START, 18, 0, 18, 0));
 
         userSelectEditText.setHint(ApplicationLoader.applicationContext.getString(R.string.Search));
         userSelectEditText.setTextIsSelectable(false);
@@ -345,11 +372,6 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
                         if (text.length() != 0) {
                             searching = true;
                             searchWas = true;
-                            if (listView != null) {
-                                listView.setFastScrollAlwaysVisible(false);
-                                listView.setFastScrollEnabled(false);
-                                listView.setVerticalScrollBarEnabled(true);
-                            }
                             if (emptyTextView != null) {
                                 emptyTextView.setText(context.getString(R.string.NoResult));
                             }
@@ -360,9 +382,6 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
                             searching = false;
                             searchWas = false;
                             listViewAdapter.notifyDataSetChanged();
-                            listView.setFastScrollAlwaysVisible(true);
-                            listView.setFastScrollEnabled(true);
-                            listView.setVerticalScrollBarEnabled(false);
                             emptyTextView.setText(context.getString(R.string.NoContacts));
                         }
                     }
@@ -402,100 +421,123 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
         listView.setFastScrollEnabled(true);
         listView.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_OVERLAY);
         listView.setAdapter(listViewAdapter);
-        listView.setFastScrollAlwaysVisible(true);
+        listView.setFastScrollAlwaysVisible(false);
         linearLayout.addView(listView);
 
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                 // a single click on an contact item
-                Object item = listViewAdapter.getItem(i);
-                if (item instanceof TLRPC.User) {
-                    final TLRPC.User user = (TLRPC.User) item;
-                    if( do_what == SELECT_CONTACT_FOR_NEW_CHAT ) {
-                        int belonging_chat_id = MrMailbox.getChatIdByContactId(user.id);
-                        if( belonging_chat_id!=0 ) {
-                            Bundle args = new Bundle();
-                            args.putInt("chat_id", belonging_chat_id);
-                            presentFragment(new ChatActivity(args), true);
-                            return;
-                        }
+                if( i == rowNewGroup || i == rowNewVerifiedGroup ) {
+                    Bundle args = new Bundle();
+                    args.putInt("do_what", i==rowNewGroup? SELECT_CONTACTS_FOR_NEW_GROUP : SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP);
+                    presentFragment(new ContactsActivity(args), false /*removeLast*/, false /*forceWithoutAnimation*/);
+                }
+                else if( i == rowAddContact) {
+                    Bundle args = new Bundle();
+                    args.putInt("do_what", ContactAddActivity.CREATE_CONTACT);
+                    args.putBoolean("create_chat_when_done", do_what==SELECT_CONTACT_FOR_NEW_CHAT);
 
-                        String name = "";
-                        {
-                            MrContact mrContact = MrMailbox.getContact(user.id);
-                            name = mrContact.getNameNAddr();
-                        }
+                    String lastSearch = listViewAdapter.getSearch();
+                    if( lastSearch != null ) {
+                        args.putString("prefill", lastSearch);
+                    }
 
-                        AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
-                        builder.setPositiveButton(context.getString(R.string.OK), new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialogInterface, int i) {
-                                int belonging_chat_id = MrMailbox.createChatByContactId(user.id);
-                                if( belonging_chat_id != 0 ) {
-                                    Bundle args = new Bundle();
-                                    args.putInt("chat_id", belonging_chat_id);
-                                    presentFragment(new ChatActivity(args), true);
+                    presentFragment(new ContactAddActivity(args));
+                }
+                else if( i == rowInviteViaQr ) {
+                    Intent intent2 = new Intent(getParentActivity(), QRshowActivity.class);
+                    Bundle b = new Bundle();
+                    b.putInt("chat_id", 0);
+                    intent2.putExtras(b);
+                    getParentActivity().startActivity(intent2);
+                }
+                else {
+                    Object item = listViewAdapter.getItem(i);
+                    if (item instanceof TLRPC.User) {
+                        final TLRPC.User user = (TLRPC.User) item;
+                        if (do_what == SELECT_CONTACT_FOR_NEW_CHAT) {
+                            int belonging_chat_id = MrMailbox.getChatIdByContactId(user.id);
+                            if (belonging_chat_id != 0) {
+                                Bundle args = new Bundle();
+                                args.putInt("chat_id", belonging_chat_id);
+                                presentFragment(new ChatActivity(args), true);
+                                return;
+                            }
+
+                            String name = "";
+                            {
+                                MrContact mrContact = MrMailbox.getContact(user.id);
+                                name = mrContact.getNameNAddr();
+                            }
+
+                            AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
+                            builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialogInterface, int i) {
+                                    int belonging_chat_id = MrMailbox.createChatByContactId(user.id);
+                                    if (belonging_chat_id != 0) {
+                                        Bundle args = new Bundle();
+                                        args.putInt("chat_id", belonging_chat_id);
+                                        presentFragment(new ChatActivity(args), true);
+                                    }
+                                }
+                            });
+                            builder.setNegativeButton(R.string.Cancel, null);
+                            builder.setMessage(AndroidUtilities.replaceTags(String.format(context.getString(R.string.AskStartChatWith), name)));
+                            showDialog(builder.create());
+                        } else if (do_what == SELECT_CONTACTS_FOR_NEW_GROUP || do_what == SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP) {
+                            boolean check = true;
+                            if (selectedContacts.containsKey(user.id)) {
+                                check = false;
+                                try {
+                                    ChipSpan span = selectedContacts.get(user.id);
+                                    selectedContacts.remove(user.id);
+                                    SpannableStringBuilder text = new SpannableStringBuilder(userSelectEditText.getText());
+                                    text.delete(text.getSpanStart(span), text.getSpanEnd(span));
+                                    allSpans.remove(span);
+                                    ignoreChange = true;
+                                    userSelectEditText.setText(text);
+                                    userSelectEditText.setSelection(text.length());
+                                    ignoreChange = false;
+                                } catch (Exception e) {
+
+                                }
+                            } else {
+                                ignoreChange = true;
+                                ChipSpan span = createAndPutChipForUser(user.id);
+                                span.uid = user.id;
+                                ignoreChange = false;
+                            }
+
+                            updateSubtitle();
+
+                            if (searching || searchWas) {
+                                ignoreChange = true;
+                                SpannableStringBuilder ssb = new SpannableStringBuilder("");
+                                for (ImageSpan sp : allSpans) {
+                                    ssb.append("<<");
+                                    ssb.setSpan(sp, ssb.length() - 2, ssb.length(), SpannableStringBuilder.SPAN_EXCLUSIVE_EXCLUSIVE);
+                                }
+                                userSelectEditText.setText(ssb);
+                                userSelectEditText.setSelection(ssb.length());
+                                ignoreChange = false;
+
+                                listViewAdapter.search(null);
+                                searching = false;
+                                searchWas = false;
+                                listViewAdapter.notifyDataSetChanged();
+                                emptyTextView.setText(context.getString(R.string.NoContacts));
+                            } else {
+                                if (view instanceof UserCell) {
+                                    ((UserCell) view).setChecked(check, true);
                                 }
                             }
-                        });
-                        builder.setNegativeButton(context.getString(R.string.Cancel), null);
-                        builder.setMessage(AndroidUtilities.replaceTags(String.format(context.getString(R.string.AskStartChatWith), name)));
-                        showDialog(builder.create());
-                    }
-                    else if( do_what == SELECT_CONTACTS_FOR_NEW_GROUP ) {
-                        boolean check = true;
-                        if (selectedContacts.containsKey(user.id)) {
-                            check = false;
-                            try {
-                                ChipSpan span = selectedContacts.get(user.id);
-                                selectedContacts.remove(user.id);
-                                SpannableStringBuilder text = new SpannableStringBuilder(userSelectEditText.getText());
-                                text.delete(text.getSpanStart(span), text.getSpanEnd(span));
-                                allSpans.remove(span);
-                                ignoreChange = true;
-                                userSelectEditText.setText(text);
-                                userSelectEditText.setSelection(text.length());
-                                ignoreChange = false;
-                            } catch (Exception e) {
-
-                            }
-                        } else {
-                            ignoreChange = true;
-                            ChipSpan span = createAndPutChipForUser(user);
-                            span.uid = user.id;
-                            ignoreChange = false;
+                        } else if (delegate != null) {
+                            delegate.didSelectContact(user.id);
+                            delegate = null;
+                            finishFragment();
                         }
-                        actionBar.setSubtitle(context.getResources().getQuantityString(R.plurals.MeAndMembers, selectedContacts.size(), selectedContacts.size()));
-                        if (searching || searchWas) {
-                            ignoreChange = true;
-                            SpannableStringBuilder ssb = new SpannableStringBuilder("");
-                            for (ImageSpan sp : allSpans) {
-                                ssb.append("<<");
-                                ssb.setSpan(sp, ssb.length() - 2, ssb.length(), SpannableStringBuilder.SPAN_EXCLUSIVE_EXCLUSIVE);
-                            }
-                            userSelectEditText.setText(ssb);
-                            userSelectEditText.setSelection(ssb.length());
-                            ignoreChange = false;
-
-                            listViewAdapter.search(null);
-                            searching = false;
-                            searchWas = false;
-                            listViewAdapter.notifyDataSetChanged();
-                            listView.setFastScrollAlwaysVisible(true);
-                            listView.setFastScrollEnabled(true);
-                            listView.setVerticalScrollBarEnabled(false);
-                            emptyTextView.setText(context.getString(R.string.NoContacts));
-                        } else {
-                            if (view instanceof UserCell) {
-                                ((UserCell) view).setChecked(check, true);
-                            }
-                        }
-                    }
-                    else if (delegate != null) {
-                        delegate.didSelectContact(user.id);
-                        delegate = null;
-                        finishFragment();
                     }
                 }
             }
@@ -508,14 +550,34 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
                 if (item instanceof TLRPC.User) {
                     final TLRPC.User user = (TLRPC.User) item;
                     AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
-                    CharSequence[] items = new CharSequence[]{context.getString(R.string.ViewProfile)};
+                    CharSequence[] items = new CharSequence[]{context.getString(R.string.ViewProfile),context.getString(R.string.DeleteContact)};
                     builder.setItems(items, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialogInterface, int i) {
-                            Bundle args = new Bundle();
-                            args.putInt("user_id", user.id);
-                            ProfileActivity fragment = new ProfileActivity(args);
-                            presentFragment(fragment);
+                            if( i == 0 ) {
+                                Bundle args = new Bundle();
+                                args.putInt("user_id", user.id);
+                                ProfileActivity fragment = new ProfileActivity(args);
+                                presentFragment(fragment);
+                            }
+                            else if( i == 1 ) {
+                                AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
+                                builder.setMessage(context.getString(R.string.AreYouSureDeleteContact));
+                                builder.setPositiveButton(R.string.OK, new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                        if( MrMailbox.deleteContact(user.id)==0 ) {
+                                            AndroidUtilities.showHint(getParentActivity(), context.getString(R.string.CannotDeleteContact));
+                                        }
+                                        else {
+                                            AndroidUtilities.showDoneHint(getParentActivity());
+                                            listViewAdapter.searchAgain();
+                                            listViewAdapter.notifyDataSetChanged();                                        }
+                                    }
+                                });
+                                builder.setNegativeButton(R.string.Cancel, null);
+                                showDialog(builder.create());
+                            }
                         }
                     });
                     showDialog(builder.create());
@@ -546,6 +608,16 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
         return fragmentView;
     }
 
+    public void updateSubtitle()
+    {
+        int selectedContactsButMe = selectedContacts.size();
+        if (selectedContacts.containsKey(MrContact.MR_CONTACT_ID_SELF)) {
+            selectedContactsButMe--;
+        }
+        actionBar.setSubtitle(ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.MeAndMembers, selectedContactsButMe, selectedContactsButMe));
+
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -569,6 +641,11 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
             if (listViewAdapter != null) {
                 listViewAdapter.searchAgain();
                 listViewAdapter.notifyDataSetChanged();
+                int sel_contact_id = (int) args[0];
+                if( sel_contact_id != 0 )  {
+                    createAndPutChipForUser(sel_contact_id);
+                    updateSubtitle();
+                }
             }
         } else if (id == NotificationCenter.updateInterfaces) {
             int mask = (Integer)args[0];
@@ -598,14 +675,14 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
         this.delegate = delegate;
     }
 
-    private ChipSpan createAndPutChipForUser(TLRPC.User user) {
+    private ChipSpan createAndPutChipForUser(int contact_id) {
         LayoutInflater lf = (LayoutInflater) ApplicationLoader.applicationContext.getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
         View textView = lf.inflate(R.layout.group_create_bubble, null);
         TextView text = (TextView)textView.findViewById(R.id.bubble_text_view);
 
         String name ="";
         {
-            MrContact mrContact = MrMailbox.getContact(user.id);
+            MrContact mrContact = MrMailbox.getContact(contact_id);
             name = mrContact.getDisplayName();
         }
 
@@ -630,7 +707,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
         SpannableStringBuilder ssb = new SpannableStringBuilder("");
         ChipSpan span = new ChipSpan(bmpDrawable, ImageSpan.ALIGN_BASELINE);
         allSpans.add(span);
-        selectedContacts.put(user.id, span);
+        selectedContacts.put(contact_id, span);
         for (ImageSpan sp : allSpans) {
             ssb.append("<<");
             ssb.setSpan(sp, ssb.length() - 2, ssb.length(), SpannableStringBuilder.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -639,4 +716,162 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
         userSelectEditText.setSelection(ssb.length());
         return span;
     }
+
+    private class ContactsAdapter extends BaseFragmentAdapter {
+
+        private Context mContext;
+        private HashMap<Integer, ?> checkedMap;
+        private boolean scrolling;
+        private String lastQuery;
+
+        private int[] contactIds;
+
+        private int mListflags = 0;
+        private boolean mAddNewGroupRows;
+
+        private final int ROWTYPE_TEXT_SETTINGS = 0;
+        private final int ROWTYPE_CONTACT = 1;
+        private final int ROWTYPE_COUNT = 2;
+
+        public ContactsAdapter(Context context, int listflags, boolean addNewGroupRows) {
+            mContext = context;
+            mListflags = listflags;
+            mAddNewGroupRows = addNewGroupRows;
+            contactIds = MrMailbox.getContacts(mListflags, null);
+            updateRowIds();
+        }
+
+        public void updateRowIds()
+        {
+            rowCount = 0;
+            rowNewGroup = -1;
+            rowNewVerifiedGroup = -1;
+            rowAddContact = -1;
+            rowInviteViaQr = -1;
+            rowContactFirst = -1;
+            rowContactLast = -1;
+
+            if( lastQuery == null || lastQuery.isEmpty() ) {
+                if (mAddNewGroupRows) {
+                    rowNewGroup = rowCount++;
+                    if( MrMailbox.getConfigInt("qr_enabled", 0) != 0 ) {
+                        rowNewVerifiedGroup = rowCount++;
+                    }
+                }
+            }
+
+            if( (mListflags & MrMailbox.MR_GCL_VERIFIED_ONLY)!=0 ) {
+                rowInviteViaQr = rowCount++;
+            }
+            else {
+                rowAddContact = rowCount++;
+            }
+
+            if( contactIds.length > 0 ) {
+                rowContactFirst = rowCount;
+                rowCount += contactIds.length;
+                rowContactLast = rowCount - 1;
+            }
+        }
+
+        public void setCheckedMap(HashMap<Integer, ?> map) {
+            checkedMap = map;
+        }
+
+        public void setIsScrolling(boolean value) {
+            scrolling = value;
+        }
+
+        public void search(String query) {
+            contactIds = MrMailbox.getContacts(mListflags, query);
+            lastQuery = query;
+            updateRowIds();
+        }
+
+        public void searchAgain() {
+            contactIds = MrMailbox.getContacts(mListflags, lastQuery);
+            updateRowIds();
+        }
+
+        public String getSearch(){
+            return lastQuery;
+        }
+
+        @Override
+        public Object getItem(int i) {
+            int curr_user_index = i - rowContactFirst;
+            if(curr_user_index>=0 && curr_user_index<contactIds.length) {
+                TLRPC.User u = new TLRPC.User();
+                u.id = contactIds[curr_user_index];
+                return u;
+            }
+            return null;
+        }
+
+        @Override
+        public boolean isEnabled(int i) {
+            int type = getItemViewType(i);
+            return (type == ROWTYPE_CONTACT || type == ROWTYPE_TEXT_SETTINGS);
+        }
+
+        @Override
+        public int getCount() {
+            return rowCount;
+        }
+
+        @Override
+        public View getView(int i, View view, ViewGroup parent) {
+            int type = getItemViewType(i);
+            if( type == ROWTYPE_TEXT_SETTINGS ) {
+                if (view == null) {
+                    view = new TextSettingsCell(mContext);
+                    view.setBackgroundColor(0xffffffff);
+                }
+                TextSettingsCell textCell = (TextSettingsCell) view;
+                if( i == rowNewGroup ) {
+                    textCell.setText(mContext.getString(R.string.NewGroup), true);
+                }
+                else if( i == rowNewVerifiedGroup ) {
+                    textCell.setText(mContext.getString(R.string.NewVerifiedGroup), true);
+                }
+                else if( i == rowAddContact) {
+                    textCell.setText(mContext.getString(R.string.NewContactTitle), false);
+                }
+                else if( i == rowInviteViaQr) {
+                    textCell.setText(mContext.getString(R.string.QrShowVerifyCode), false);
+                }
+            }
+            else if( type == ROWTYPE_CONTACT ) {
+                if (view == null) {
+                    view = new UserCell(mContext, 1);
+                }
+
+                int curr_user_index = i - rowContactFirst;
+                if (curr_user_index >= 0 && curr_user_index < contactIds.length) {
+                    int curr_user_id = contactIds[curr_user_index];
+                    MrContact mrContact = MrMailbox.getContact(curr_user_id);
+                    ((UserCell) view).setData(mrContact);
+                    if (checkedMap != null) {
+                        boolean checked = curr_user_id == MrContact.MR_CONTACT_ID_SELF || checkedMap.containsKey(curr_user_id);
+                        ((UserCell) view).setChecked(checked, !scrolling);
+                    }
+                }
+            }
+
+            return view;
+        }
+
+        @Override
+        public int getItemViewType(int i) {
+            if(i>=rowContactFirst && i<=rowContactLast ) {
+                return ROWTYPE_CONTACT;
+            }
+            return ROWTYPE_TEXT_SETTINGS;
+        }
+
+        @Override
+        public int getViewTypeCount() {
+            return ROWTYPE_COUNT;
+        }
+    }
 }

MessengerProj/src/main/java/com/b44t/messenger/ContactsController.java

@@ -42,10 +42,9 @@ import android.graphics.Shader;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.ContactsContract;
-import android.util.Log;
 import android.view.View;
 
-import com.b44t.ui.Components.AvatarDrawable;
+import com.b44t.messenger.Components.AvatarDrawable;
 
 import java.io.InputStream;
 import java.util.HashMap;
@@ -173,8 +172,7 @@ public class ContactsController {
             tempName = mrContact.getDisplayName();
         } else if (mrChat != null) {
             tempName = mrChat.getName();
-            int chatType = mrChat.getType();
-            if (chatType == MrChat.MR_CHAT_NORMAL) {
+            if (!mrChat.isGroup()) {
                 int[] contact_ids = MrMailbox.getChatContacts(mrChat.getId());
                 if (contact_ids.length == 1) {
                     MrContact mrc = MrMailbox.getContact(contact_ids[0]);
@@ -182,8 +180,8 @@ public class ContactsController {
                     tempName = mrc.getDisplayName();
                 }
             }
-            else if( chatType == MrChat.MR_CHAT_GROUP ) {
-                tempPath = mrChat.getParam(MrChat.MRP_PROFILE_IMAGE, "");
+            else {
+                tempPath = mrChat.getProfileImage();
             }
         }
 

MessengerProj/src/main/java/com/b44t/messenger/DocumentSelectActivity.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui;
+package com.b44t.messenger;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -43,19 +43,15 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.ApplicationLoader;
-import com.b44t.messenger.LocaleController;
-import com.b44t.messenger.R;
-import com.b44t.ui.ActionBar.BackDrawable;
-import com.b44t.ui.ActionBar.Theme;
-import com.b44t.ui.Adapters.BaseFragmentAdapter;
-import com.b44t.ui.ActionBar.ActionBar;
-import com.b44t.ui.ActionBar.ActionBarMenu;
-import com.b44t.ui.ActionBar.BaseFragment;
-import com.b44t.ui.Cells.SharedDocumentCell;
-import com.b44t.ui.Components.LayoutHelper;
-import com.b44t.ui.Components.NumberTextView;
+import com.b44t.messenger.ActionBar.BackDrawable;
+import com.b44t.messenger.ActionBar.Theme;
+import com.b44t.messenger.Components.BaseFragmentAdapter;
+import com.b44t.messenger.ActionBar.ActionBar;
+import com.b44t.messenger.ActionBar.ActionBarMenu;
+import com.b44t.messenger.ActionBar.BaseFragment;
+import com.b44t.messenger.Cells.SharedDocumentCell;
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.Components.NumberTextView;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -160,7 +156,6 @@ public class DocumentSelectActivity extends BaseFragment {
         }
 
         actionBar.setBackButtonDrawable(new BackDrawable(false));
-        actionBar.setAllowOverlayTitle(true);
         actionBar.setTitle(context.getString(R.string.SelectFile));
         actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
             @Override
@@ -303,7 +298,7 @@ public class DocumentSelectActivity extends BaseFragment {
                 } else {
                     if (!file.canRead()) {
                         showErrorBox(ApplicationLoader.applicationContext.getString(R.string.AccessError));
-                        file = new File("/mnt/sdcard");
+                        return;
                     }
                     if (file.length() == 0) {
                         return;

MessengerProj/src/main/java/com/b44t/messenger/Emoji.java

@@ -1,491 +0,0 @@
-/*******************************************************************************
- *
- *                              Delta Chat Android
- *                        (C) 2013-2016 Nikolai Kudashov
- *                           (C) 2017 Björn Petersen
- *                    Contact: r10s@b44t.com, http://b44t.com
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see http://www.gnu.org/licenses/ .
- *
- ******************************************************************************/
-
-
-package com.b44t.messenger;
-
-import java.io.File;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Locale;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.text.Spannable;
-
-public class Emoji {
-    private static HashMap<CharSequence, DrawableInfo> rects = new HashMap<>();
-    private static int drawImgSize;
-    private static int bigImgSize;
-    private static boolean inited = false;
-    private static Paint placeholderPaint;
-    private static final int splitCount = 4;
-    private static Bitmap emojiBmp[][] = new Bitmap[5][splitCount];
-    private static boolean loadingEmoji[][] = new boolean[5][splitCount];
-
-    private static final int[][] cols = {
-            {11, 11, 11, 11},
-            {6, 6, 6, 6},
-            {9, 9, 9, 9},
-            {9, 9, 9, 9},
-            {8, 8, 8, 7}
-    };
-
-    static {
-        int emojiFullSize;
-        if (AndroidUtilities.density <= 1.0f) {
-            emojiFullSize = 32;
-        } else if (AndroidUtilities.density <= 1.5f) {
-            emojiFullSize = 48;
-        } else if (AndroidUtilities.density <= 2.0f) {
-            emojiFullSize = 64;
-        } else {
-            emojiFullSize = 64;
-        }
-        drawImgSize = AndroidUtilities.dp(20);
-        bigImgSize = AndroidUtilities.dp(32);
-
-        for (int j = 0; j < EmojiData.data.length; j++) {
-            int count2 = (int) Math.ceil(EmojiData.data[j].length / (float) splitCount);
-            int position;
-            for (int i = 0; i < EmojiData.data[j].length; i++) {
-                int page = i / count2;
-                position = i - page * count2;
-                Rect rect = new Rect((position % cols[j][page]) * emojiFullSize, (position / cols[j][page]) * emojiFullSize, (position % cols[j][page] + 1) * emojiFullSize, (position / cols[j][page] + 1) * emojiFullSize);
-                rects.put(EmojiData.data[j][i], new DrawableInfo(rect, (byte) j, (byte) page));
-            }
-        }
-        placeholderPaint = new Paint();
-        placeholderPaint.setColor(0x00000000);
-    }
-
-    /*private static void loadEmoji(final int page, final int page2) {
-        try {
-            float scale;
-            int imageResize = 1;
-            if (AndroidUtilities.density <= 1.0f) {
-                scale = 2.0f;
-                imageResize = 2;
-            } else if (AndroidUtilities.density <= 1.5f) {
-                scale = 3.0f;
-                imageResize = 2;
-            } else if (AndroidUtilities.density <= 2.0f) {
-                scale = 2.0f;
-            } else {
-                scale = 2.0f;
-            }
-
-            String imageName;
-            File imageFile;
-
-            try {
-                for (int a = 4; a < 6; a++) {
-                    imageName = String.format(Locale.US, "v%d_emoji%.01fx_%d.jpg", a, scale, page);
-                    imageFile = ApplicationLoader.applicationContext.getFileStreamPath(imageName);
-                    if (imageFile.exists()) {
-                        imageFile.delete();
-                    }
-                    imageName = String.format(Locale.US, "v%d_emoji%.01fx_a_%d.jpg", a, scale, page);
-                    imageFile = ApplicationLoader.applicationContext.getFileStreamPath(imageName);
-                    if (imageFile.exists()) {
-                        imageFile.delete();
-                    }
-                }
-            } catch (Exception e) {
-
-            }
-
-
-            imageName = String.format(Locale.US, "v7_emoji%.01fx_%d_%d.jpg", scale, page, page2);
-            imageFile = ApplicationLoader.applicationContext.getFileStreamPath(imageName);
-            if (!imageFile.exists()) {
-                InputStream is = ApplicationLoader.applicationContext.getAssets().open("emoji/" + imageName);
-                AndroidUtilities.copyFile(is, imageFile);
-                is.close();
-            }
-
-            BitmapFactory.Options opts = new BitmapFactory.Options();
-            opts.inJustDecodeBounds = true;
-            BitmapFactory.decodeFile(imageFile.getAbsolutePath(), opts);
-
-            int width = opts.outWidth / imageResize;
-            int height = opts.outHeight / imageResize;
-            int stride = width * 4;
-
-            final Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-            Utilities.loadBitmap(imageFile.getAbsolutePath(), bitmap, imageResize, width, height, stride);
-
-            imageName = String.format(Locale.US, "v7_emoji%.01fx_a_%d_%d.jpg", scale, page, page2);
-            imageFile = ApplicationLoader.applicationContext.getFileStreamPath(imageName);
-            if (!imageFile.exists()) {
-                InputStream is = ApplicationLoader.applicationContext.getAssets().open("emoji/" + imageName);
-                AndroidUtilities.copyFile(is, imageFile);
-                is.close();
-            }
-
-            Utilities.loadBitmap(imageFile.getAbsolutePath(), bitmap, imageResize, width, height, stride);
-
-            AndroidUtilities.runOnUIThread(new Runnable() {
-                @Override
-                public void run() {
-                    emojiBmp[page][page2] = bitmap;
-                    NotificationCenter.getInstance().postNotificationName(NotificationCenter.emojiDidLoaded);
-                }
-            });
-        } catch (Throwable x) {
-            //Log.i("DeltaChat", "Error loading emoji", x);
-        }
-    }*/
-
-    /*
-    public static void invalidateAll(View view) {
-        if (view instanceof ViewGroup) {
-            ViewGroup g = (ViewGroup) view;
-            for (int i = 0; i < g.getChildCount(); i++) {
-                invalidateAll(g.getChildAt(i));
-            }
-        } else if (view instanceof TextView) {
-            view.invalidate();
-        }
-    }
-    */
-
-    public static String fixEmoji(String emoji) {
-        char ch;
-        int lenght = emoji.length();
-        for (int a = 0; a < lenght; a++) {
-            ch = emoji.charAt(a);
-            if (ch >= 0xD83C && ch <= 0xD83E) {
-                if (ch == 0xD83C && a < lenght - 1) {
-                    ch = emoji.charAt(a + 1);
-                    if (ch == 0xDE2F || ch == 0xDC04 || ch == 0xDE1A || ch == 0xDD7F) {
-                        emoji = emoji.substring(0, a + 2) + "\uFE0F" + emoji.substring(a + 2);
-                        lenght++;
-                        a += 2;
-                    } else {
-                        a++;
-                    }
-                } else {
-                    a++;
-                }
-            } else if (ch == 0x20E3) {
-                return emoji;
-            } else if (ch >= 0x203C && ch <= 0x3299) {
-                if (EmojiData.emojiToFE0FMap.containsKey(ch)) {
-                    emoji = emoji.substring(0, a + 1) + "\uFE0F" + emoji.substring(a + 1);
-                    lenght++;
-                    a++;
-                }
-            }
-        }
-        return emoji;
-    }
-
-    /*public static EmojiDrawable getEmojiDrawable(CharSequence code) {
-        DrawableInfo info = rects.get(code);
-        if (info == null) {
-            //Log.i("DeltaChat", "No drawable for emoji " + code);
-            return null;
-        }
-        EmojiDrawable ed = new EmojiDrawable(info);
-        ed.setBounds(0, 0, drawImgSize, drawImgSize);
-        return ed;
-    }*/
-
-    /*
-    public static Drawable getEmojiBigDrawable(String code) {
-        EmojiDrawable ed = getEmojiDrawable(code);
-        if (ed == null) {
-            return null;
-        }
-        ed.setBounds(0, 0, bigImgSize, bigImgSize);
-        ed.fullSize = true;
-        return ed;
-    }
-    */
-
-    /*public static class EmojiDrawable extends Drawable {
-        private DrawableInfo info;
-        private boolean fullSize = false;
-        private static Paint paint = new Paint(Paint.FILTER_BITMAP_FLAG);
-        private static Rect rect = new Rect();
-
-        public EmojiDrawable(DrawableInfo i) {
-            info = i;
-        }
-
-        public DrawableInfo getDrawableInfo() {
-            return info;
-        }
-
-        public Rect getDrawRect() {
-            Rect original = getBounds();
-            int cX = original.centerX(), cY = original.centerY();
-            rect.left = cX - (fullSize ? bigImgSize : drawImgSize) / 2;
-            rect.right = cX + (fullSize ? bigImgSize : drawImgSize) / 2;
-            rect.top = cY - (fullSize ? bigImgSize : drawImgSize) / 2;
-            rect.bottom = cY + (fullSize ? bigImgSize : drawImgSize) / 2;
-            return rect;
-        }
-
-        @Override
-        public void draw(Canvas canvas) {
-            if (emojiBmp[info.page][info.page2] == null) {
-                if (loadingEmoji[info.page][info.page2]) {
-                    return;
-                }
-                loadingEmoji[info.page][info.page2] = true;
-                Utilities.globalQueue.postRunnable(new Runnable() {
-                    @Override
-                    public void run() {
-                        loadEmoji(info.page, info.page2);
-                        loadingEmoji[info.page][info.page2] = false;
-                    }
-                });
-                canvas.drawRect(getBounds(), placeholderPaint);
-                return;
-            }
-
-            Rect b;
-            if (fullSize) {
-                b = getDrawRect();
-            } else {
-                b = getBounds();
-            }
-
-            //if (!canvas.quickReject(b.left, b.top, b.right, b.bottom, Canvas.EdgeType.AA)) {
-                canvas.drawBitmap(emojiBmp[info.page][info.page2], info.rect, b, paint);
-            //}
-        }
-
-        @Override
-        public int getOpacity() {
-            return PixelFormat.TRANSPARENT;
-        }
-
-        @Override
-        public void setAlpha(int alpha) {
-
-        }
-
-        @Override
-        public void setColorFilter(ColorFilter cf) {
-
-        }
-    }*/
-
-    private static class DrawableInfo {
-        public Rect rect;
-        public byte page;
-        public byte page2;
-
-        public DrawableInfo(Rect r, byte p, byte p2) {
-            rect = r;
-            page = p;
-            page2 = p2;
-        }
-    }
-
-    /*
-    private static boolean inArray(char c, char[] a) {
-        for (char cc : a) {
-            if (cc == c) {
-                return true;
-            }
-        }
-        return false;
-    }
-    */
-
-    public static CharSequence replaceEmoji(CharSequence cs, Paint.FontMetricsInt fontMetrics, int size, boolean createNew) {
-        if (cs == null || cs.length() == 0) {
-            return cs;
-        }
-        //SpannableStringLight.isFieldsAvailable();
-        //SpannableStringLight s = new SpannableStringLight(cs.toString());
-        Spannable s;
-        if (!createNew && cs instanceof Spannable) {
-            s = (Spannable) cs;
-        } else {
-            s = Spannable.Factory.getInstance().newSpannable(cs.toString());
-        }
-        /* Telegram-FOSS - Disable emoji replacement, falling back to native emojis. */
-//        long buf = 0;
-//        int emojiCount = 0;
-//        char c;
-//        int startIndex = -1;
-//        int startLength = 0;
-//        int previousGoodIndex = 0;
-//        StringBuilder emojiCode = new StringBuilder(16);
-//        boolean nextIsSkinTone;
-//        EmojiDrawable drawable;
-//        EmojiSpan span;
-//        int length = cs.length();
-//        boolean doneEmoji = false;
-//        //s.setSpansCount(emojiCount);
-//
-//        try {
-//            for (int i = 0; i < length; i++) {
-//                c = cs.charAt(i);
-//                if (c >= 0xD83C && c <= 0xD83E || (buf != 0 && (buf & 0xFFFFFFFF00000000L) == 0 && (buf & 0xFFFF) == 0xD83C && (c >= 0xDDE6 && c <= 0xDDFF))) {
-//                    if (startIndex == -1) {
-//                        startIndex = i;
-//                    }
-//                    emojiCode.append(c);
-//                    startLength++;
-//                    buf <<= 16;
-//                    buf |= c;
-//                } else if (buf > 0 && (c & 0xF000) == 0xD000) {
-//                    emojiCode.append(c);
-//                    startLength++;
-//                    buf = 0;
-//                    doneEmoji = true;
-//                } else if (c == 0x20E3) {
-//                    if (i > 0) {
-//                        char c2 = cs.charAt(previousGoodIndex);
-//                        if ((c2 >= '0' && c2 <= '9') || c2 == '#' || c2 == '*') {
-//                            startIndex = previousGoodIndex;
-//                            startLength = i - previousGoodIndex + 1;
-//                            emojiCode.append(c2);
-//                            emojiCode.append(c);
-//                            doneEmoji = true;
-//                        }
-//                    }
-//                } else if ((c == 0x00A9 || c == 0x00AE || c >= 0x203C && c <= 0x3299) && EmojiData.dataCharsMap.containsKey(c)) {
-//                    if (startIndex == -1) {
-//                        startIndex = i;
-//                    }
-//                    startLength++;
-//                    emojiCode.append(c);
-//                    doneEmoji = true;
-//                } else if (startIndex != -1) {
-//                    emojiCode.setLength(0);
-//                    startIndex = -1;
-//                    startLength = 0;
-//                    doneEmoji = false;
-//                }
-//                previousGoodIndex = i;
-//                for (int a = 0; a < 3; a++) {
-//                    if (i + 1 < length) {
-//                        c = cs.charAt(i + 1);
-//                        if (a == 1) {
-//                            if (c == 0x200D) {
-//                                emojiCode.append(c);
-//                                i++;
-//                                startLength++;
-//                                doneEmoji = false;
-//                            }
-//                        } else {
-//                            if (c >= 0xFE00 && c <= 0xFE0F) {
-//                                i++;
-//                                startLength++;
-//                            }
-//                        }
-//                    }
-//                }
-//                if (doneEmoji) {
-//                    if (i + 2 < length) {
-//                        if (cs.charAt(i + 1) == 0xD83C && cs.charAt(i + 2) >= 0xDFFB && cs.charAt(i + 2) <= 0xDFFF) {
-//                            emojiCode.append(cs.subSequence(i + 1, i + 3));
-//                            startLength += 2;
-//                            i += 2;
-//                        }
-//                    }
-//                    drawable = Emoji.getEmojiDrawable(emojiCode.subSequence(0, emojiCode.length()));
-//                    if (drawable != null) {
-//                        span = new EmojiSpan(drawable, DynamicDrawableSpan.ALIGN_BOTTOM, size, fontMetrics);
-//                        s.setSpan(span, startIndex, startIndex + startLength, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-//                        emojiCount++;
-//                    }
-//                    startLength = 0;
-//                    startIndex = -1;
-//                    emojiCode.setLength(0);
-//                    doneEmoji = false;
-//                }
-//                if (emojiCount >= 50) { //654 new
-//                    break;
-//                }
-//            }
-//        } catch (Exception e) {
-//
-//            return cs;
-//        }
-        return s;
-    }
-
-    /*
-    public static class EmojiSpan extends ImageSpan {
-        private Paint.FontMetricsInt fontMetrics = null;
-        private int size = AndroidUtilities.dp(20);
-
-        public EmojiSpan(EmojiDrawable d, int verticalAlignment, int s, Paint.FontMetricsInt original) {
-            super(d, verticalAlignment);
-            fontMetrics = original;
-            if (original != null) {
-                size = Math.abs(fontMetrics.descent) + Math.abs(fontMetrics.ascent);
-                if (size == 0) {
-                    size = AndroidUtilities.dp(20);
-                }
-            }
-        }
-
-        @Override
-        public int getSize(Paint paint, CharSequence text, int start, int end, Paint.FontMetricsInt fm) {
-            if (fm == null) {
-                fm = new Paint.FontMetricsInt();
-            }
-
-            if (fontMetrics == null) {
-                int sz = super.getSize(paint, text, start, end, fm);
-
-                int offset = AndroidUtilities.dp(8);
-                int w = AndroidUtilities.dp(10);
-                fm.top = -w - offset;
-                fm.bottom = w - offset;
-                fm.ascent = -w - offset;
-                fm.leading = 0;
-                fm.descent = w - offset;
-
-                return sz;
-            } else {
-                if (fm != null) {
-                    fm.ascent = fontMetrics.ascent;
-                    fm.descent = fontMetrics.descent;
-
-                    fm.top = fontMetrics.top;
-                    fm.bottom = fontMetrics.bottom;
-                }
-                if (getDrawable() != null) {
-                    getDrawable().setBounds(0, 0, size, size);
-                }
-                return size;
-            }
-        }
-    }
-    */
-}

MessengerProj/src/main/java/com/b44t/messenger/EmojiData.java

@@ -1,364 +0,0 @@
-/*******************************************************************************
- *
- *                              Delta Chat Android
- *                        (C) 2013-2016 Nikolai Kudashov
- *                           (C) 2017 Björn Petersen
- *                    Contact: r10s@b44t.com, http://b44t.com
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see http://www.gnu.org/licenses/ .
- *
- ******************************************************************************/
-
-
-package com.b44t.messenger;
-
-import java.util.HashMap;
-
-public class EmojiData {
-
-    public static final char[] emojiToFE0F = {
-            0x2B50, 0x2600, 0x26C5, 0x2601, 0x26A1, 0x2744, 0x26C4, 0x2614, 0x2708, 0x26F5,
-            0x2693, 0x26FD, 0x26F2, 0x26FA, 0x26EA, 0x2615, 0x26BD, 0x26BE, 0x26F3, 0x231A,
-            0x260E, 0x231B, 0x2709, 0x2702, 0x2712, 0x270F, 0x2648, 0x2649, 0x264A, 0x264B,
-            0x264C, 0x264D, 0x264E, 0x264F, 0x2650, 0x2651, 0x2652, 0x2653, 0x2734, 0x3299,
-            0x3297, 0x26D4, 0x2B55, 0x2668, 0x2757, 0x203C, 0x2049, 0x303D, 0x26A0, 0x267B,
-            0x2747, 0x2733, 0x24C2, 0x267F, 0x25B6, 0x25C0, 0x27A1, 0x2B05, 0x2B06, 0x2B07,
-            0x2197, 0x2198, 0x2199, 0x2196, 0x2195, 0x2194, 0x21AA, 0x21A9, 0x2934, 0x2935,
-            0x2139, 0x2714, 0x2716, 0x2611, 0x26AA, 0x26AB, 0x25AA, 0x25AB, 0x2B1B, 0x2B1C,
-            0x25FC, 0x25FB, 0x25FE, 0x25FD, 0x2660, 0x2663, 0x2665, 0x2666, 0x263A, 0x2639,
-            0x270C, 0x261D, 0x2764
-    };
-    //0xD83CDE2F, 0xD83CDC04, 0xD83CDE1A, 0xD83CDD7F
-
-    public static final char[] dataChars = {
-            0x262E, 0x271D, 0x262A, 0x2638, 0x2721, 0x262F, 0x2626, 0x26CE, 0x2648, 0x2649,
-            0x264A, 0x264B, 0x264C, 0x264D, 0x264E, 0x264F, 0x2650, 0x2651, 0x2652, 0x2653,
-            0x269B, 0x2622, 0x2623, 0x2734, 0x3299, 0x3297, 0x26D4, 0x274C, 0x2B55, 0x2668,
-            0x2757, 0x2755, 0x2753, 0x2754, 0x203C, 0x2049, 0x269C, 0x303D, 0x26A0, 0x267B,
-            0x2747, 0x2733, 0x274E, 0x2705, 0x27BF, 0x24C2, 0x267F, 0x25B6, 0x23F8, 0x23EF,
-            0x23F9, 0x23FA, 0x23ED, 0x23EE, 0x23E9, 0x23EA, 0x25C0, 0x23EB, 0x23EC, 0x27A1,
-            0x2B05, 0x2B06, 0x2B07, 0x2197, 0x2198, 0x2199, 0x2196, 0x2195, 0x2194, 0x21AA,
-            0x21A9, 0x2934, 0x2935, 0x2139, 0x3030, 0x27B0, 0x2714, 0x2795, 0x2796, 0x2797,
-            0x2716, 0x00A9, 0x00AE, 0x2122, 0x2611, 0x26AA, 0x26AB, 0x25AA, 0x25AB, 0x2B1B,
-            0x2B1C, 0x25FC, 0x25FB, 0x25FE, 0x25FD, 0x2660, 0x2663, 0x2665, 0x2666, 0x263A,
-            0x2639, 0x270A, 0x270C, 0x270B, 0x261D, 0x270D, 0x26D1, 0x2764, 0x2763, 0x2615,
-            0x26BD, 0x26BE, 0x26F3, 0x26F7, 0x26F8, 0x26F9, 0x231A, 0x2328, 0x260E, 0x23F1,
-            0x23F2, 0x23F0, 0x23F3, 0x231B, 0x2696, 0x2692, 0x26CF, 0x2699, 0x26D3, 0x2694,
-            0x2620, 0x26B0, 0x26B1, 0x2697, 0x26F1, 0x2709, 0x2702, 0x2712, 0x270F, 0x2708,
-            0x26F5, 0x26F4, 0x2693, 0x26FD, 0x26F2, 0x26F0, 0x26FA, 0x26EA, 0x26E9, 0x2618,
-            0x2B50, 0x2728, 0x2604, 0x2600, 0x26C5, 0x2601, 0x26C8, 0x26A1, 0x2744, 0x2603,
-            0x26C4, 0x2602, 0x2614
-    };
-
-    public static final String[] emojiColored = {
-            "🙌", "👏", "👋", "👍", "👎", "👊", "✊", "✌", "👌", "✋",
-            "👐", "💪", "🙏", "☝", "👆", "👇", "👈", "👉", "🖕", "🖐",
-            "🤘", "🖖", "✍", "💅", "👂", "👃", "👶", "👦", "👧", "👨",
-            "👩", "👱", "👴", "👵", "👲", "👳", "👮", "👷", "💂", "🎅",
-            "👼", "👸", "👰", "🚶", "🏃", "💃", "🙇", "💁", "🙅", "🙆",
-            "🙋", "🙎", "🙍", "💇", "💆", "🚣", "🏊", "🏄", "🛀", "⛹",
-            "🏋", "🚴", "🚵", "🏇",
-    };
-
-    public static final String[][] dataColored = {
-            new String[]{
-                    "😀", "😬", "😁", "😂", "😃", "😄", "😅", "😆", "😇", "😉", "😊",
-                    "🙂", "🙃", "☺", "😋", "😌", "😍", "😘", "😗", "😙", "😚",
-                    "😜", "😝", "😛", "🤑", "🤓", "😎", "🤗", "😏", "😶", "😐",
-                    "😑", "😒", "🙄", "🤔", "😳", "😞", "😟", "😠", "😡", "😔",
-                    "😕", "🙁", "☹", "😣", "😖", "😫", "😩", "😤", "😮", "😱",
-                    "😨", "😰", "😯", "😦", "😧", "😢", "😥", "😪", "😓", "😭",
-                    "😵", "😲", "🤐", "😷", "🤒", "🤕", "😴", "💤", "💩", "😈",
-                    "👿", "👹", "👺", "💀", "👻", "👽", "🤖", "😺", "😸", "😹",
-                    "😻", "😼", "😽", "🙀", "😿", "😾", "🙌",
-                    "👏", "👋",
-                    "👍",
-                    "👎", "👊",
-                    "✊", "✌",
-                    "👌",
-                    "✋", "👐",
-                    "💪", "🙏",
-                    "☝",
-                    "👆", "👇",
-                    "👈", "👉",
-                    "🖕",
-                    "🖐", "🤘",
-                    "🖖", "✍",
-                    "💅",
-                    "👄", "👅", "👂", "👃",
-                    "👁", "👀", "👤", "👥", "🗣", "👶",
-                    "👦",
-                    "👧", "👨",
-                    "👩", "👱",
-                    "👴",
-                    "👵", "👲",
-                    "👳", "👮",
-                    "👷",
-                    "💂", "🕵", "🎅",
-                    "👼",
-                    "👸", "👰",
-                    "🚶", "🏃",
-                    "💃",
-                    "👯", "👫", "👬", "👭", "🙇",
-                    "💁", "🙅",
-                    "🙆", "🙋",
-                    "🙎",
-                    "🙍", "💇",
-                    "💆", "💑", "👩‍❤‍👩",
-                    "👨‍❤‍👨", "💏", "👩‍❤‍💋‍👩", "👨‍❤‍💋‍👨", "👪", "👨‍👩‍👧", "👨‍👩‍👧‍👦", "👨‍👩‍👦‍👦", "👨‍👩‍👧‍👧", "👩‍👩‍👦",
-                    "👩‍👩‍👧", "👩‍👩‍👧‍👦", "👩‍👩‍👦‍👦", "👩‍👩‍👧‍👧", "👨‍👨‍👦", "👨‍👨‍👧", "👨‍👨‍👧‍👦", "👨‍👨‍👦‍👦", "👨‍👨‍👧‍👧", "👚",
-                    "👕", "👖", "👔", "👗", "👙", "👘", "💄", "💋", "👣", "👠",
-                    "👡", "👢", "👞", "👟", "👒", "🎩", "🎓", "👑", "⛑", "🎒",
-                    "👝", "👛", "👜", "💼", "👓", "🕶", "💍", "🌂", "❤", "💛",
-                    "💚", "💙", "💜", "💔", "❣", "💕", "💞", "💓", "💗", "💖",
-                    "💘", "💝",
-            },
-            null,
-            new String[]{
-                    "🍏", "🍎", "🍐", "🍊", "🍋", "🍌", "🍉", "🍇", "🍓", "🍈", "🍒",
-                    "🍑", "🍍", "🍅", "🍆", "🌶", "🌽", "🍠", "🍯", "🍞", "🧀",
-                    "🍗", "🍖", "🍤", "🍳", "🍔", "🍟", "🌭", "🍕", "🍝", "🌮",
-                    "🌯", "🍜", "🍲", "🍥", "🍣", "🍱", "🍛", "🍙", "🍚", "🍘",
-                    "🍢", "🍡", "🍧", "🍨", "🍦", "🍰", "🎂", "🍮", "🍬", "🍭",
-                    "🍫", "🍿", "🍩", "🍪", "🍺", "🍻", "🍷", "🍸", "🍹", "🍾",
-                    "🍶", "🍵", "☕", "🍼", "🍴", "🍽", "⚽", "🏀", "🏈", "⚾",
-                    "🎾", "🏐", "🏉", "🎱", "⛳", "🏌", "🏓", "🏸", "🏒", "🏑",
-                    "🏏", "🎿", "⛷", "🏂", "⛸", "🏹", "🎣", "🚣",
-                    "🏊", "🏄",
-                    "🛀",
-                    "⛹", "🏋",
-                    "🚴", "🚵",
-                    "🏇",
-                    "🕴", "🏆", "🎽", "🏅", "🎖", "🎗", "🏵", "🎫", "🎟",
-                    "🎭", "🎨", "🎪", "🎤", "🎧", "🎼", "🎹", "🎷", "🎺", "🎸",
-                    "🎻", "🎬", "🎮", "👾", "🎯", "🎲", "🎰", "🎳", "⌚", "📱",
-                    "📲", "💻", "⌨", "🖥", "🖨", "🖱", "🖲", "🕹", "🗜", "💽",
-                    "💾", "💿", "📀", "📼", "📷", "📸", "📹", "🎥", "📽", "🎞",
-                    "📞", "☎", "📟", "🎛", "⏱", "⏲", "⏰", "🕰", "⏳", "⌛",
-                    "📡", "🔋", "🔌", "💡", "🔦", "🕯", "🗑", "🛢", "💸", "💵",
-                    "💴", "💶", "💷", "💰", "💳", "💎", "⚖", "🔧", "🔨", "⚒",
-                    "🛠", "⛏", "🔩", "⚙", "⛓", "🔫", "💣", "🔪", "🗡", "⚔",
-                    "🛡", "🚬", "☠", "⚰", "⚱", "🏺", "🔮", "📿", "💈", "⚗",
-                    "🔭", "🔬", "🕳", "💊", "💉", "🌡", "🏷", "🔖", "🚽", "🚿",
-                    "🛁", "🔑", "🗝", "🛋", "🛌", "🛏", "🚪", "🛎", "🖼", "🗺",
-                    "⛱", "🗿", "🛍", "🎈", "🎏", "🎀", "🎁", "🎊", "🎉", "🎎",
-                    "🎐", "🎌", "🏮", "✉", "📩", "📨", "📧", "💌", "📮", "📪",
-                    "📫", "📬", "📭", "📦", "📯", "📥", "📤", "📜", "📃", "📑",
-                    "📊", "📈", "📉", "📄", "📅", "📆", "🗓", "📇", "🗃", "🗳",
-                    "🗄", "📋", "🗒", "📁", "📂", "🗂", "🗞", "📰", "📓", "📕",
-                    "📗", "📘", "📙", "📔", "📒", "📚", "📖", "🔗", "📎", "🖇",
-                    "✂", "📐", "📏", "📌", "📍", "🚩", "🏳", "🏴", "🔐", "🔒",
-                    "🔓", "🔏", "🖊", "🖋", "✒", "📝", "✏", "🖍", "🖌", "🔍",
-                    "🔎",
-            },
-            null,
-            null
-    };
-
-    public static final String[][] data = {
-            new String[]{
-                    "😀", "😬", "😁", "😂", "😃", "😄", "😅", "😆", "😇", "😉", "😊",
-                    "🙂", "🙃", "☺", "😋", "😌", "😍", "😘", "😗", "😙", "😚",
-                    "😜", "😝", "😛", "🤑", "🤓", "😎", "🤗", "😏", "😶", "😐",
-                    "😑", "😒", "🙄", "🤔", "😳", "😞", "😟", "😠", "😡", "😔",
-                    "😕", "🙁", "☹", "😣", "😖", "😫", "😩", "😤", "😮", "😱",
-                    "😨", "😰", "😯", "😦", "😧", "😢", "😥", "😪", "😓", "😭",
-                    "😵", "😲", "🤐", "😷", "🤒", "🤕", "😴", "💤", "💩", "😈",
-                    "👿", "👹", "👺", "💀", "👻", "👽", "🤖", "😺", "😸", "😹",
-                    "😻", "😼", "😽", "🙀", "😿", "😾", "🙌", "🙌🏻", "🙌🏼", "🙌🏽",
-                    "🙌🏾", "🙌🏿", "👏", "👏🏻", "👏🏼", "👏🏽", "👏🏾", "👏🏿", "👋", "👋🏻",
-                    "👋🏼", "👋🏽", "👋🏾", "👋🏿", "👍", "👍🏻", "👍🏼", "👍🏽", "👍🏾", "👍🏿",
-                    "👎", "👎🏻", "👎🏼", "👎🏽", "👎🏾", "👎🏿", "👊", "👊🏻", "👊🏼", "👊🏽",
-                    "👊🏾", "👊🏿", "✊", "✊🏻", "✊🏼", "✊🏽", "✊🏾", "✊🏿", "✌", "✌🏻",
-                    "✌🏼", "✌🏽", "✌🏾", "✌🏿", "👌", "👌🏻", "👌🏼", "👌🏽", "👌🏾", "👌🏿",
-                    "✋", "✋🏻", "✋🏼", "✋🏽", "✋🏾", "✋🏿", "👐", "👐🏻", "👐🏼", "👐🏽",
-                    "👐🏾", "👐🏿", "💪", "💪🏻", "💪🏼", "💪🏽", "💪🏾", "💪🏿", "🙏", "🙏🏻",
-                    "🙏🏼", "🙏🏽", "🙏🏾", "🙏🏿", "☝", "☝🏻", "☝🏼", "☝🏽", "☝🏾", "☝🏿",
-                    "👆", "👆🏻", "👆🏼", "👆🏽", "👆🏾", "👆🏿", "👇", "👇🏻", "👇🏼", "👇🏽",
-                    "👇🏾", "👇🏿", "👈", "👈🏻", "👈🏼", "👈🏽", "👈🏾", "👈🏿", "👉", "👉🏻",
-                    "👉🏼", "👉🏽", "👉🏾", "👉🏿", "🖕", "🖕🏻", "🖕🏼", "🖕🏽", "🖕🏾", "🖕🏿",
-                    "🖐", "🖐🏻", "🖐🏼", "🖐🏽", "🖐🏾", "🖐🏿", "🤘", "🤘🏻", "🤘🏼", "🤘🏽",
-                    "🤘🏾", "🤘🏿", "🖖", "🖖🏻", "🖖🏼", "🖖🏽", "🖖🏾", "🖖🏿", "✍", "✍🏻",
-                    "✍🏼", "✍🏽", "✍🏾", "✍🏿", "💅", "💅🏻", "💅🏼", "💅🏽", "💅🏾", "💅🏿",
-                    "👄", "👅", "👂", "👂🏻", "👂🏼", "👂🏽", "👂🏾", "👂🏿", "👃", "👃🏻",
-                    "👃🏼", "👃🏽", "👃🏾", "👃🏿", "👁", "👀", "👤", "👥", "🗣", "👶",
-                    "👶🏻", "👶🏼", "👶🏽", "👶🏾", "👶🏿", "👦", "👦🏻", "👦🏼", "👦🏽", "👦🏾",
-                    "👦🏿", "👧", "👧🏻", "👧🏼", "👧🏽", "👧🏾", "👧🏿", "👨", "👨🏻", "👨🏼",
-                    "👨🏽", "👨🏾", "👨🏿", "👩", "👩🏻", "👩🏼", "👩🏽", "👩🏾", "👩🏿", "👱",
-                    "👱🏻", "👱🏼", "👱🏽", "👱🏾", "👱🏿", "👴", "👴🏻", "👴🏼", "👴🏽", "👴🏾",
-                    "👴🏿", "👵", "👵🏻", "👵🏼", "👵🏽", "👵🏾", "👵🏿", "👲", "👲🏻", "👲🏼",
-                    "👲🏽", "👲🏾", "👲🏿", "👳", "👳🏻", "👳🏼", "👳🏽", "👳🏾", "👳🏿", "👮",
-                    "👮🏻", "👮🏼", "👮🏽", "👮🏾", "👮🏿", "👷", "👷🏻", "👷🏼", "👷🏽", "👷🏾",
-                    "👷🏿", "💂", "💂🏻", "💂🏼", "💂🏽", "💂🏾", "💂🏿", "🕵", "🎅", "🎅🏻",
-                    "🎅🏼", "🎅🏽", "🎅🏾", "🎅🏿", "👼", "👼🏻", "👼🏼", "👼🏽", "👼🏾", "👼🏿",
-                    "👸", "👸🏻", "👸🏼", "👸🏽", "👸🏾", "👸🏿", "👰", "👰🏻", "👰🏼", "👰🏽",
-                    "👰🏾", "👰🏿", "🚶", "🚶🏻", "🚶🏼", "🚶🏽", "🚶🏾", "🚶🏿", "🏃", "🏃🏻",
-                    "🏃🏼", "🏃🏽", "🏃🏾", "🏃🏿", "💃", "💃🏻", "💃🏼", "💃🏽", "💃🏾", "💃🏿",
-                    "👯", "👫", "👬", "👭", "🙇", "🙇🏻", "🙇🏼", "🙇🏽", "🙇🏾", "🙇🏿",
-                    "💁", "💁🏻", "💁🏼", "💁🏽", "💁🏾", "💁🏿", "🙅", "🙅🏻", "🙅🏼", "🙅🏽",
-                    "🙅🏾", "🙅🏿", "🙆", "🙆🏻", "🙆🏼", "🙆🏽", "🙆🏾", "🙆🏿", "🙋", "🙋🏻",
-                    "🙋🏼", "🙋🏽", "🙋🏾", "🙋🏿", "🙎", "🙎🏻", "🙎🏼", "🙎🏽", "🙎🏾", "🙎🏿",
-                    "🙍", "🙍🏻", "🙍🏼", "🙍🏽", "🙍🏾", "🙍🏿", "💇", "💇🏻", "💇🏼", "💇🏽",
-                    "💇🏾", "💇🏿", "💆", "💆🏻", "💆🏼", "💆🏽", "💆🏾", "💆🏿", "💑", "👩‍❤‍👩",
-                    "👨‍❤‍👨", "💏", "👩‍❤‍💋‍👩", "👨‍❤‍💋‍👨", "👪", "👨‍👩‍👧", "👨‍👩‍👧‍👦", "👨‍👩‍👦‍👦", "👨‍👩‍👧‍👧", "👩‍👩‍👦",
-                    "👩‍👩‍👧", "👩‍👩‍👧‍👦", "👩‍👩‍👦‍👦", "👩‍👩‍👧‍👧", "👨‍👨‍👦", "👨‍👨‍👧", "👨‍👨‍👧‍👦", "👨‍👨‍👦‍👦", "👨‍👨‍👧‍👧", "👚",
-                    "👕", "👖", "👔", "👗", "👙", "👘", "💄", "💋", "👣", "👠",
-                    "👡", "👢", "👞", "👟", "👒", "🎩", "🎓", "👑", "⛑", "🎒",
-                    "👝", "👛", "👜", "💼", "👓", "🕶", "💍", "🌂", "❤", "💛",
-                    "💚", "💙", "💜", "💔", "❣", "💕", "💞", "💓", "💗", "💖",
-                    "💘", "💝"
-            },
-            new String[]{
-                    "🐶", "🐱", "🐭", "🐹", "🐰", "🐻", "🐼", "🐨", "🐯", "🦁", "🐮",
-                    "🐷", "🐽", "🐸", "🐙", "🐵", "🙈", "🙉", "🙊", "🐒", "🐔",
-                    "🐧", "🐦", "🐤", "🐣", "🐥", "🐺", "🐗", "🐴", "🦄", "🐝",
-                    "🐛", "🐌", "🐞", "🐜", "🕷", "🦂", "🦀", "🐍", "🐢", "🐠",
-                    "🐟", "🐡", "🐬", "🐳", "🐋", "🐊", "🐆", "🐅", "🐃", "🐂",
-                    "🐄", "🐪", "🐫", "🐘", "🐐", "🐏", "🐑", "🐎", "🐖", "🐀",
-                    "🐁", "🐓", "🦃", "🕊", "🐕", "🐩", "🐈", "🐇", "🐿", "🐾",
-                    "🐉", "🐲", "🌵", "🎄", "🌲", "🌳", "🌴", "🌱", "🌿", "☘",
-                    "🍀", "🎍", "🎋", "🍃", "🍂", "🍁", "🌾", "🌺", "🌻", "🌹",
-                    "🌷", "🌼", "🌸", "💐", "🍄", "🌰", "🎃", "🐚", "🕸", "🌎",
-                    "🌍", "🌏", "🌕", "🌖", "🌗", "🌘", "🌑", "🌒", "🌓", "🌔",
-                    "🌚", "🌝", "🌛", "🌜", "🌞", "🌙", "⭐", "🌟", "💫", "✨",
-                    "☄", "☀", "🌤", "⛅", "🌥", "🌦", "☁", "🌧", "⛈", "🌩",
-                    "⚡", "🔥", "💥", "❄", "🌨", "☃", "⛄", "🌬", "💨", "🌪",
-                    "🌫", "☂", "☔", "💧", "💦", "🌊"
-            },
-            new String[]{
-                    "🍏", "🍎", "🍐", "🍊", "🍋", "🍌", "🍉", "🍇", "🍓", "🍈", "🍒",
-                    "🍑", "🍍", "🍅", "🍆", "🌶", "🌽", "🍠", "🍯", "🍞", "🧀",
-                    "🍗", "🍖", "🍤", "🍳", "🍔", "🍟", "🌭", "🍕", "🍝", "🌮",
-                    "🌯", "🍜", "🍲", "🍥", "🍣", "🍱", "🍛", "🍙", "🍚", "🍘",
-                    "🍢", "🍡", "🍧", "🍨", "🍦", "🍰", "🎂", "🍮", "🍬", "🍭",
-                    "🍫", "🍿", "🍩", "🍪", "🍺", "🍻", "🍷", "🍸", "🍹", "🍾",
-                    "🍶", "🍵", "☕", "🍼", "🍴", "🍽", "⚽", "🏀", "🏈", "⚾",
-                    "🎾", "🏐", "🏉", "🎱", "⛳", "🏌", "🏓", "🏸", "🏒", "🏑",
-                    "🏏", "🎿", "⛷", "🏂", "⛸", "🏹", "🎣", "🚣", "🚣🏻", "🚣🏼",
-                    "🚣🏽", "🚣🏾", "🚣🏿", "🏊", "🏊🏻", "🏊🏼", "🏊🏽", "🏊🏾", "🏊🏿", "🏄",
-                    "🏄🏻", "🏄🏼", "🏄🏽", "🏄🏾", "🏄🏿", "🛀", "🛀🏻", "🛀🏼", "🛀🏽", "🛀🏾",
-                    "🛀🏿", "⛹", "⛹🏻", "⛹🏼", "⛹🏽", "⛹🏾", "⛹🏿", "🏋", "🏋🏻", "🏋🏼",
-                    "🏋🏽", "🏋🏾", "🏋🏿", "🚴", "🚴🏻", "🚴🏼", "🚴🏽", "🚴🏾", "🚴🏿", "🚵",
-                    "🚵🏻", "🚵🏼", "🚵🏽", "🚵🏾", "🚵🏿", "🏇", "🏇🏻", "🏇🏼", "🏇🏽", "🏇🏾",
-                    "🏇🏿", "🕴", "🏆", "🎽", "🏅", "🎖", "🎗", "🏵", "🎫", "🎟",
-                    "🎭", "🎨", "🎪", "🎤", "🎧", "🎼", "🎹", "🎷", "🎺", "🎸",
-                    "🎻", "🎬", "🎮", "👾", "🎯", "🎲", "🎰", "🎳", "⌚", "📱",
-                    "📲", "💻", "⌨", "🖥", "🖨", "🖱", "🖲", "🕹", "🗜", "💽",
-                    "💾", "💿", "📀", "📼", "📷", "📸", "📹", "🎥", "📽", "🎞",
-                    "📞", "☎", "📟", "🎛", "⏱", "⏲", "⏰", "🕰", "⏳", "⌛",
-                    "📡", "🔋", "🔌", "💡", "🔦", "🕯", "🗑", "🛢", "💸", "💵",
-                    "💴", "💶", "💷", "💰", "💳", "💎", "⚖", "🔧", "🔨", "⚒",
-                    "🛠", "⛏", "🔩", "⚙", "⛓", "🔫", "💣", "🔪", "🗡", "⚔",
-                    "🛡", "🚬", "☠", "⚰", "⚱", "🏺", "🔮", "📿", "💈", "⚗",
-                    "🔭", "🔬", "🕳", "💊", "💉", "🌡", "🏷", "🔖", "🚽", "🚿",
-                    "🛁", "🔑", "🗝", "🛋", "🛌", "🛏", "🚪", "🛎", "🖼", "🗺",
-                    "⛱", "🗿", "🛍", "🎈", "🎏", "🎀", "🎁", "🎊", "🎉", "🎎",
-                    "🎐", "🎌", "🏮", "✉", "📩", "📨", "📧", "💌", "📮", "📪",
-                    "📫", "📬", "📭", "📦", "📯", "📥", "📤", "📜", "📃", "📑",
-                    "📊", "📈", "📉", "📄", "📅", "📆", "🗓", "📇", "🗃", "🗳",
-                    "🗄", "📋", "🗒", "📁", "📂", "🗂", "🗞", "📰", "📓", "📕",
-                    "📗", "📘", "📙", "📔", "📒", "📚", "📖", "🔗", "📎", "🖇",
-                    "✂", "📐", "📏", "📌", "📍", "🚩", "🏳", "🏴", "🔐", "🔒",
-                    "🔓", "🔏", "🖊", "🖋", "✒", "📝", "✏", "🖍", "🖌", "🔍",
-                    "🔎"
-            },
-            new String[]{
-                    "🚗", "🚕", "🚙", "🚌", "🚎", "🏎", "🚓", "🚑", "🚒", "🚐", "🚚",
-                    "🚛", "🚜", "🏍", "🚲", "🚨", "🚔", "🚍", "🚘", "🚖", "🚡",
-                    "🚠", "🚟", "🚃", "🚋", "🚝", "🚄", "🚅", "🚈", "🚞", "🚂",
-                    "🚆", "🚇", "🚊", "🚉", "🚁", "🛩", "✈", "🛫", "🛬", "⛵",
-                    "🛥", "🚤", "⛴", "🛳", "🚀", "🛰", "💺", "⚓", "🚧", "⛽",
-                    "🚏", "🚦", "🚥", "🏁", "🚢", "🎡", "🎢", "🎠", "🏗", "🌁",
-                    "🗼", "🏭", "⛲", "🎑", "⛰", "🏔", "🗻", "🌋", "🗾", "🏕",
-                    "⛺", "🏞", "🛣", "🛤", "🌅", "🌄", "🏜", "🏖", "🏝", "🌇",
-                    "🌆", "🏙", "🌃", "🌉", "🌌", "🌠", "🎇", "🎆", "🌈", "🏘",
-                    "🏰", "🏯", "🏟", "🗽", "🏠", "🏡", "🏚", "🏢", "🏬", "🏣",
-                    "🏤", "🏥", "🏦", "🏨", "🏪", "🏫", "🏩", "💒", "🏛", "⛪",
-                    "🕌", "🕍", "🕋", "⛩", "🇦🇺", "🇦🇹", "🇦🇿", "🇦🇽", "🇦🇱", "🇩🇿",
-                    "🇦🇸", "🇦🇮", "🇦🇴", "🇦🇩", "🇦🇶", "🇦🇬", "🇦🇷", "🇦🇲", "🇦🇼", "🇦🇫",
-                    "🇧🇸", "🇧🇩", "🇧🇧", "🇧🇭", "🇧🇾", "🇧🇿", "🇧🇪", "🇧🇯", "🇧🇲", "🇧🇬",
-                    "🇧🇴", "🇧🇶", "🇧🇦", "🇧🇼", "🇧🇷", "🇮🇴", "🇧🇳", "🇧🇫", "🇧🇮", "🇧🇹",
-                    "🇻🇺", "🇻🇦", "🇬🇧", "🇭🇺", "🇻🇪", "🇻🇬", "🇻🇮", "🇹🇱", "🇻🇳", "🇬🇦",
-                    "🇭🇹", "🇬🇾", "🇬🇲", "🇬🇭", "🇬🇵", "🇬🇹", "🇬🇳", "🇬🇼", "🇩🇪", "🇬🇬",
-                    "🇬🇮", "🇭🇳", "🇭🇰", "🇬🇩", "🇬🇱", "🇬🇷", "🇬🇪", "🇬🇺", "🇩🇰", "🇯🇪",
-                    "🇩🇯", "🇩🇲", "🇩🇴", "🇪🇺", "🇪🇬", "🇿🇲", "🇪🇭", "🇿🇼", "🇮🇱", "🇮🇳",
-                    "🇮🇩", "🇯🇴", "🇮🇶", "🇮🇷", "🇮🇪", "🇮🇸", "🇪🇸", "🇮🇹", "🇾🇪", "🇨🇻",
-                    "🇰🇿", "🇰🇾", "🇰🇭", "🇨🇲", "🇨🇦", "🇮🇨", "🇶🇦", "🇰🇪", "🇨🇾", "🇰🇬",
-                    "🇰🇮", "🇨🇳", "🇰🇵", "🇨🇨", "🇨🇴", "🇰🇲", "🇨🇬", "🇨🇩", "🇽🇰", "🇨🇷",
-                    "🇨🇮", "🇨🇺", "🇰🇼", "🇨🇼", "🇱🇦", "🇱🇻", "🇱🇸", "🇱🇷", "🇱🇧", "🇱🇾",
-                    "🇱🇹", "🇱🇮", "🇱🇺", "🇲🇺", "🇲🇷", "🇲🇬", "🇾🇹", "🇲🇴", "🇲🇰", "🇲🇼",
-                    "🇲🇾", "🇲🇱", "🇲🇻", "🇲🇹", "🇲🇦", "🇲🇶", "🇲🇭", "🇲🇽", "🇫🇲", "🇲🇿",
-                    "🇲🇩", "🇲🇨", "🇲🇳", "🇲🇸", "🇲🇲", "🇳🇦", "🇳🇷", "🇳🇵", "🇳🇪", "🇳🇬",
-                    "🇳🇱", "🇳🇮", "🇳🇺", "🇳🇿", "🇳🇨", "🇳🇴", "🇮🇲", "🇳🇫", "🇨🇽", "🇸🇭",
-                    "🇨🇰", "🇹🇨", "🇦🇪", "🇴🇲", "🇵🇰", "🇵🇼", "🇵🇸", "🇵🇦", "🇵🇬", "🇵🇾",
-                    "🇵🇪", "🇵🇳", "🇵🇱", "🇵🇹", "🇵🇷", "🇰🇷", "🇷🇪", "🇷🇺", "🇷🇼", "🇷🇴",
-                    "🇸🇻", "🇼🇸", "🇸🇲", "🇸🇹", "🇸🇦", "🇸🇿", "🇲🇵", "🇸🇨", "🇧🇱", "🇵🇲",
-                    "🇸🇳", "🇻🇨", "🇰🇳", "🇱🇨", "🇷🇸", "🇸🇬", "🇸🇽", "🇸🇾", "🇸🇰", "🇸🇮",
-                    "🇺🇸", "🇸🇧", "🇸🇴", "🇸🇩", "🇸🇷", "🇸🇱", "🇹🇯", "🇹🇭", "🇹🇼", "🇹🇿",
-                    "🇹🇬", "🇹🇰", "🇹🇴", "🇹🇹", "🇹🇻", "🇹🇳", "🇹🇲", "🇹🇷", "🇺🇬", "🇺🇿",
-                    "🇺🇦", "🇼🇫", "🇺🇾", "🇫🇴", "🇫🇯", "🇵🇭", "🇫🇮", "🇫🇰", "🇫🇷", "🇬🇫",
-                    "🇵🇫", "🇹🇫", "🇭🇷", "🇨🇫", "🇹🇩", "🇲🇪", "🇨🇿", "🇨🇱", "🇨🇭", "🇸🇪",
-                    "🇱🇰", "🇪🇨", "🇬🇶", "🇪🇷", "🇪🇪", "🇪🇹", "🇿🇦", "🇬🇸", "🇸🇸", "🇯🇲",
-                    "🇯🇵"
-            },
-            new String[]{
-                    "💟", "☮", "✝", "☪", "🕉", "☸", "✡", "🔯", "🕎", "☯", "☦",
-                    "🛐", "⛎", "♈", "♉", "♊", "♋", "♌", "♍", "♎", "♏",
-                    "♐", "♑", "♒", "♓", "🆔", "⚛", "🈳", "🈹", "☢", "☣",
-                    "📴", "📳", "🈶", "🈚", "🈸", "🈺", "🈷", "✴", "🆚", "🉑",
-                    "💮", "🉐", "㊙", "㊗", "🈴", "🈵", "🈲", "🅰", "🅱", "🆎",
-                    "🆑", "🅾", "🆘", "⛔", "📛", "🚫", "❌", "⭕", "💢", "♨",
-                    "🚷", "🚯", "🚳", "🚱", "🔞", "📵", "❗", "❕", "❓", "❔",
-                    "‼", "⁉", "💯", "🔅", "🔆", "🔱", "⚜", "〽", "⚠", "🚸",
-                    "🔰", "♻", "🈯", "💹", "❇", "✳", "❎", "✅", "💠", "🌀",
-                    "➿", "🌐", "Ⓜ", "🏧", "🈂", "🛂", "🛃", "🛄", "🛅", "♿",
-                    "🚭", "🚾", "🅿", "🚰", "🚹", "🚺", "🚼", "🚻", "🚮", "🎦",
-                    "📶", "🈁", "🆖", "🆗", "🆙", "🆒", "🆕", "🆓", "0⃣", "1⃣",
-                    "2⃣", "3⃣", "4⃣", "5⃣", "6⃣", "7⃣", "8⃣", "9⃣", "🔟", "🔢",
-                    "▶", "⏸", "⏯", "⏹", "⏺", "⏭", "⏮", "⏩", "⏪", "🔀",
-                    "🔁", "🔂", "◀", "🔼", "🔽", "⏫", "⏬", "➡", "⬅", "⬆",
-                    "⬇", "↗", "↘", "↙", "↖", "↕", "↔", "🔄", "↪", "↩",
-                    "⤴", "⤵", "#⃣", "*⃣", "ℹ", "🔤", "🔡", "🔠", "🔣", "🎵",
-                    "🎶", "〰", "➰", "✔", "🔃", "➕", "➖", "➗", "✖", "💲",
-                    "💱", "©", "®", "™", "🔚", "🔙", "🔛", "🔝", "🔜", "☑",
-                    "🔘", "⚪", "⚫", "🔴", "🔵", "🔸", "🔹", "🔶", "🔷", "🔺",
-                    "▪", "▫", "⬛", "⬜", "🔻", "◼", "◻", "◾", "◽", "🔲",
-                    "🔳", "🔈", "🔉", "🔊", "🔇", "📣", "📢", "🔔", "🔕", "🃏",
-                    "🀄", "♠", "♣", "♥", "♦", "🎴", "👁‍🗨", "💭", "🗯", "💬",
-                    "🕐", "🕑", "🕒", "🕓", "🕔", "🕕", "🕖", "🕗", "🕘", "🕙",
-                    "🕚", "🕛", "🕜", "🕝", "🕞", "🕟", "🕠", "🕡", "🕢", "🕣",
-                    "🕤", "🕥", "🕦", "🕧"
-            }
-    };
-
-    public static final HashMap<Character, Boolean> emojiToFE0FMap = new HashMap<>(emojiToFE0F.length);
-    public static final HashMap<Character, Boolean> dataCharsMap = new HashMap<>(dataChars.length);
-    public static final HashMap<String, Boolean> emojiColoredMap = new HashMap<>(emojiColored.length);
-
-    static {
-        for (int a = 0; a < emojiToFE0F.length; a++) {
-            emojiToFE0FMap.put(emojiToFE0F[a], true);
-        }
-        for (int a = 0; a < dataChars.length; a++) {
-            dataCharsMap.put(dataChars[a], true);
-        }
-        for (int a = 0; a < emojiColored.length; a++) {
-            //Disable colored emoji.
-            //emojiColoredMap.put(emojiColored[a], true);
-        }
-        dataColored[1] = data[1];
-        dataColored[3] = data[3];
-        dataColored[4] = data[4];
-    }
-}

MessengerProj/src/main/java/com/b44t/messenger/EmojiInputView.java

@@ -0,0 +1,629 @@
+/*******************************************************************************
+ *
+ *                              Delta Chat Android
+ *                           (C) 2017 Björn Petersen
+ *                    Contact: r10s@b44t.com, http://b44t.com
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see http://www.gnu.org/licenses/ .
+ *
+ ******************************************************************************/
+
+
+package com.b44t.messenger;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.DataSetObserver;
+import android.graphics.Color;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.text.Spannable;
+import android.view.Gravity;
+import android.view.HapticFeedbackConstants;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.FrameLayout;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.b44t.messenger.Components.LayoutHelper;
+import com.b44t.messenger.Components.PagerSlidingTabStrip;
+
+import com.amulyakhare.textdrawable.TextDrawable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+
+public class EmojiInputView extends FrameLayout {
+
+    public interface Listener {
+        boolean onBackspace();
+        void onEmojiSelected(String emoji);
+        void onClearEmojiRecent();
+    }
+
+    private static final String[][] predefinedEmojis = {
+        new String[]{
+            "😀", "😬", "😁", "😂", "😃", "😄", "😅", "😆", "😇", "😉", "😊", "🙂", "🙃", "☺", "😋",
+            "😌", "😍", "😘", "😗", "😙", "😚", "😜", "😝", "😛", "🤑", "🤓", "😎", "🤗", "😏", "😶",
+            "😐", "😑", "😒", "🙄", "🤔", "😳", "😞", "😟", "😠", "😡", "😔", "😕", "🙁", "☹", "😣",
+            "😖", "😫", "😩", "😤", "😮", "😱", "😨", "😰", "😯", "😦", "😧", "😢", "😥", "😪", "😓",
+            "😭", "😵", "😲", "🤐", "😷", "🤒", "🤕", "😴", "💤", "💩", "😈", "👿", "👹", "👺", "💀",
+            "👻", "👽", "🤖", "😺", "😸", "😹", "😻", "😼", "😽", "🙀", "😿", "😾", "🙌", "👏", "👋",
+            "👍", "👎", "👊", "✊", "✌", "👌", "✋", "👐", "💪", "🙏", "☝", "👆", "👇", "👈", "👉", "🖕", "🖐",
+            "🤘", "🖖", "✍", "💅", "👄", "👅", "👂", "👃", "👁", "👀", "👤", "👥", "🗣", "👶", "👦", "👧",
+            "👨", "👩", "👱", "👴", "👵", "👲", "👳", "👮", "👷", "💂", "🕵", "🎅", "👼", "👸", "👰", "🚶",
+            "🏃", "💃", "👯", "👫", "👬", "👭", "🙇", "💁", "🙅", "🙆", "🙋", "🙎", "🙍", "💇", "💆", "💑",
+            "👩‍❤‍👩", "👨‍❤‍👨", "💏", "👩‍❤‍💋‍👩", "👨‍❤‍💋‍👨", "👪", "👨‍👩‍👧", "👨‍👩‍👧‍👦", "👨‍👩‍👦‍👦", "👨‍👩‍👧‍👧",
+            "👩‍👩‍👦", "👩‍👩‍👧", "👩‍👩‍👧‍👦", "👩‍👩‍👦‍👦", "👩‍👩‍👧‍👧", "👨‍👨‍👦", "👨‍👨‍👧", "👨‍👨‍👧‍👦", "👨‍👨‍👦‍👦",
+            "👨‍👨‍👧‍👧", "👚", "👕", "👖", "👔", "👗", "👙", "👘", "💄", "💋", "👣", "👠", "👡", "👢", "👞",
+            "👟", "👒", "🎩", "🎓", "👑", "⛑", "🎒", "👝", "👛", "👜", "💼", "👓", "🕶", "💍", "🌂", "❤",
+            "💛", "💚", "💙", "💜", "💔", "❣", "💕", "💞", "💓", "💗", "💖", "💘", "💝",
+        },
+        new String[]{
+            "🐶", "🐱", "🐭", "🐹", "🐰", "🐻", "🐼", "🐨", "🐯", "🦁", "🐮", "🐷", "🐽", "🐸", "🐙",
+            "🐵", "🙈", "🙉", "🙊", "🐒", "🐔", "🐧", "🐦", "🐤", "🐣", "🐥", "🐺", "🐗", "🐴", "🦄", "🐝",
+            "🐛", "🐌", "🐞", "🐜", "🕷", "🦂", "🦀", "🐍", "🐢", "🐠", "🐟", "🐡", "🐬", "🐳", "🐋",
+            "🐊", "🐆", "🐅", "🐃", "🐂", "🐄", "🐪", "🐫", "🐘", "🐐", "🐏", "🐑", "🐎", "🐖", "🐀",
+            "🐁", "🐓", "🦃", "🕊", "🐕", "🐩", "🐈", "🐇", "🐿", "🐾", "🐉", "🐲", "🌵", "🎄", "🌲", "🌳",
+            "🌴", "🌱", "🌿", "☘", "🍀", "🎍", "🎋", "🍃", "🍂", "🍁", "🌾", "🌺", "🌻", "🌹", "🌷", "🌼",
+            "🌸", "💐", "🍄", "🌰", "🎃", "🐚", "🕸", "🌎", "🌍", "🌏", "🌕", "🌖", "🌗", "🌘", "🌑", "🌒",
+            "🌓", "🌔", "🌚", "🌝", "🌛", "🌜", "🌞", "🌙", "⭐", "🌟", "💫", "✨", "☄", "☀", "🌤", "⛅",
+            "🌥", "🌦", "☁", "🌧", "⛈", "🌩", "⚡", "🔥", "💥", "❄", "🌨", "☃", "⛄", "🌬", "💨", "🌪",
+            "🌫", "☂", "☔", "💧", "💦", "🌊"
+        },
+        new String[]{
+            "🍏", "🍎", "🍐", "🍊", "🍋", "🍌", "🍉", "🍇", "🍓", "🍈", "🍒", "🍑", "🍍", "🍅", "🍆", "🌶",
+            "🌽", "🍠", "🍯", "🍞", "🧀", "🍗", "🍖", "🍤", "🍳", "🍔", "🍟", "🌭", "🍕", "🍝", "🌮", "🌯",
+            "🍜", "🍲", "🍥", "🍣", "🍱", "🍛", "🍙", "🍚", "🍘", "🍢", "🍡", "🍧", "🍨", "🍦", "🍰", "🎂",
+            "🍮", "🍬", "🍭", "🍫", "🍿", "🍩", "🍪", "🍺", "🍻", "🍷", "🍸", "🍹", "🍾", "🍶", "🍵", "☕",
+            "🍼", "🍴", "🍽", "⚽", "🏀", "🏈", "⚾", "🎾", "🏐", "🏉", "🎱", "⛳", "🏌", "🏓", "🏸", "🏒",
+            "🏑", "🏏", "🎿", "⛷", "🏂", "⛸", "🏹", "🎣", "🚣", "🏊", "🏄", "🛀", "⛹", "🏋", "🚴", "🚵",
+            "🏇", "🕴", "🏆", "🎽", "🏅", "🎖", "🎗", "🏵", "🎫", "🎟", "🎭", "🎨", "🎪", "🎤", "🎧", "🎼",
+            "🎹", "🎷", "🎺", "🎸", "🎻", "🎬", "🎮", "👾", "🎯", "🎲", "🎰", "🎳", "⌚", "📱", "📲", "💻",
+            "⌨", "🖥", "🖨", "🖱", "🖲", "🕹", "🗜", "💽", "💾", "💿", "📀", "📼", "📷", "📸", "📹", "🎥",
+            "📽", "🎞", "📞", "☎", "📟", "🎛", "⏱", "⏲", "⏰", "🕰", "⏳", "⌛", "📡", "🔋", "🔌", "💡",
+            "🔦", "🕯", "🗑", "🛢", "💸", "💵", "💴", "💶", "💷", "💰", "💳", "💎", "⚖", "🔧", "🔨", "⚒",
+            "🛠", "⛏", "🔩", "⚙", "⛓", "🔫", "💣", "🔪", "🗡", "⚔", "🛡", "🚬", "☠", "⚰", "⚱", "🏺",
+            "🔮", "📿", "💈", "⚗", "🔭", "🔬", "🕳", "💊", "💉", "🌡", "🏷", "🔖", "🚽", "🚿", "🛁", "🔑",
+            "🗝", "🛋", "🛌", "🛏", "🚪", "🛎", "🖼", "🗺", "⛱", "🗿", "🛍", "🎈", "🎏", "🎀", "🎁",
+            "🎊", "🎉", "🎎", "🎐", "🎌", "🏮", "✉", "📩", "📨", "📧", "💌", "📮", "📪", "📫", "📬", "📭",
+            "📦", "📯", "📥", "📤", "📜", "📃", "📑", "📊", "📈", "📉", "📄", "📅", "📆", "🗓", "📇", "🗃",
+            "🗳", "🗄", "📋", "🗒", "📁", "📂", "🗂", "🗞", "📰", "📓", "📕", "📗", "📘", "📙", "📔", "📒",
+            "📚", "📖", "🔗", "📎", "🖇", "✂", "📐", "📏", "📌", "📍", "🚩", "🏳", "🏴", "🔐", "🔒", "🔓",
+            "🔏", "🖊", "🖋", "✒", "📝", "✏", "🖍", "🖌", "🔍", "🔎",
+        },
+        new String[]{
+            "🚗", "🚕", "🚙", "🚌", "🚎", "🏎", "🚓", "🚑", "🚒", "🚐", "🚚", "🚛", "🚜", "🏍", "🚲",
+            "🚨", "🚔", "🚍", "🚘", "🚖", "🚡", "🚠", "🚟", "🚃", "🚋", "🚝", "🚄", "🚅", "🚈", "🚞", "🚂",
+            "🚆", "🚇", "🚊", "🚉", "🚁", "🛩", "✈", "🛫", "🛬", "⛵", "🛥", "🚤", "⛴", "🛳", "🚀", "🛰",
+            "💺", "⚓", "🚧", "⛽", "🚏", "🚦", "🚥", "🏁", "🚢", "🎡", "🎢", "🎠", "🏗", "🌁", "🗼", "🏭",
+            "⛲", "🎑", "⛰", "🏔", "🗻", "🌋", "🗾", "🏕", "⛺", "🏞", "🛣", "🛤", "🌅", "🌄", "🏜",
+            "🏖", "🏝", "🌇", "🌆", "🏙", "🌃", "🌉", "🌌", "🌠", "🎇", "🎆", "🌈", "🏘", "🏰", "🏯", "🏟",
+            "🗽", "🏠", "🏡", "🏚", "🏢", "🏬", "🏣", "🏤", "🏥", "🏦", "🏨", "🏪", "🏫", "🏩", "💒", "🏛",
+            "⛪", "🕌", "🕍", "🕋", "⛩", "🇦🇺", "🇦🇹", "🇦🇿", "🇦🇽", "🇦🇱", "🇩🇿", "🇦🇸", "🇦🇮",
+            "🇦🇴", "🇦🇩", "🇦🇶", "🇦🇬", "🇦🇷", "🇦🇲", "🇦🇼", "🇦🇫", "🇧🇸", "🇧🇩", "🇧🇧", "🇧🇭",
+            "🇧🇾", "🇧🇿", "🇧🇪", "🇧🇯", "🇧🇲", "🇧🇬", "🇧🇴", "🇧🇶", "🇧🇦", "🇧🇼", "🇧🇷", "🇮🇴",
+            "🇧🇳", "🇧🇫", "🇧🇮", "🇧🇹", "🇻🇺", "🇻🇦", "🇬🇧", "🇭🇺", "🇻🇪", "🇻🇬", "🇻🇮", "🇹🇱",
+            "🇻🇳", "🇬🇦", "🇭🇹", "🇬🇾", "🇬🇲", "🇬🇭", "🇬🇵", "🇬🇹", "🇬🇳", "🇬🇼", "🇩🇪", "🇬🇬",
+            "🇬🇮", "🇭🇳", "🇭🇰", "🇬🇩", "🇬🇱", "🇬🇷", "🇬🇪", "🇬🇺", "🇩🇰", "🇯🇪", "🇩🇯", "🇩🇲",
+            "🇩🇴", "🇪🇺", "🇪🇬", "🇿🇲", "🇪🇭", "🇿🇼", "🇮🇱", "🇮🇳", "🇮🇩", "🇯🇴", "🇮🇶", "🇮🇷",
+            "🇮🇪", "🇮🇸", "🇪🇸", "🇮🇹", "🇾🇪", "🇨🇻", "🇰🇿", "🇰🇾", "🇰🇭", "🇨🇲", "🇨🇦", "🇮🇨",
+            "🇶🇦", "🇰🇪", "🇨🇾", "🇰🇬", "🇰🇮", "🇨🇳", "🇰🇵", "🇨🇨", "🇨🇴", "🇰🇲", "🇨🇬", "🇨🇩",
+            "🇽🇰", "🇨🇷", "🇨🇮", "🇨🇺", "🇰🇼", "🇨🇼", "🇱🇦", "🇱🇻", "🇱🇸", "🇱🇷", "🇱🇧", "🇱🇾",
+            "🇱🇹", "🇱🇮", "🇱🇺", "🇲🇺", "🇲🇷", "🇲🇬", "🇾🇹", "🇲🇴", "🇲🇰", "🇲🇼", "🇲🇾", "🇲🇱",
+            "🇲🇻", "🇲🇹", "🇲🇦", "🇲🇶", "🇲🇭", "🇲🇽", "🇫🇲", "🇲🇿", "🇲🇩", "🇲🇨", "🇲🇳", "🇲🇸",
+            "🇲🇲", "🇳🇦", "🇳🇷", "🇳🇵", "🇳🇪", "🇳🇬", "🇳🇱", "🇳🇮", "🇳🇺", "🇳🇿", "🇳🇨", "🇳🇴",
+            "🇮🇲", "🇳🇫", "🇨🇽", "🇸🇭", "🇨🇰", "🇹🇨", "🇦🇪", "🇴🇲", "🇵🇰", "🇵🇼", "🇵🇸", "🇵🇦",
+            "🇵🇬", "🇵🇾", "🇵🇪", "🇵🇳", "🇵🇱", "🇵🇹", "🇵🇷", "🇰🇷", "🇷🇪", "🇷🇺", "🇷🇼", "🇷🇴",
+            "🇸🇻", "🇼🇸", "🇸🇲", "🇸🇹", "🇸🇦", "🇸🇿", "🇲🇵", "🇸🇨", "🇧🇱", "🇵🇲", "🇸🇳", "🇻🇨",
+            "🇰🇳", "🇱🇨", "🇷🇸", "🇸🇬", "🇸🇽", "🇸🇾", "🇸🇰", "🇸🇮", "🇺🇸", "🇸🇧", "🇸🇴", "🇸🇩",
+            "🇸🇷", "🇸🇱", "🇹🇯", "🇹🇭", "🇹🇼", "🇹🇿", "🇹🇬", "🇹🇰", "🇹🇴", "🇹🇹", "🇹🇻", "🇹🇳",
+            "🇹🇲", "🇹🇷", "🇺🇬", "🇺🇿", "🇺🇦", "🇼🇫", "🇺🇾", "🇫🇴", "🇫🇯", "🇵🇭", "🇫🇮", "🇫🇰",
+            "🇫🇷", "🇬🇫", "🇵🇫", "🇹🇫", "🇭🇷", "🇨🇫", "🇹🇩", "🇲🇪", "🇨🇿", "🇨🇱", "🇨🇭", "🇸🇪",
+            "🇱🇰", "🇪🇨", "🇬🇶", "🇪🇷", "🇪🇪", "🇪🇹", "🇿🇦", "🇬🇸", "🇸🇸", "🇯🇲", "🇯🇵"
+        },
+        new String[]{
+            "💟", "☮", "✝", "☪", "🕉", "☸", "✡", "🔯", "🕎", "☯", "☦", "🛐", "⛎", "♈", "♉", "♊", "♋",
+            "♌", "♍", "♎", "♏", "♐", "♑", "♒", "♓", "🆔", "⚛", "🈳", "🈹", "☢", "☣", "📴", "📳", "🈶",
+            "🈚", "🈸", "🈺", "🈷", "✴", "🆚", "🉑", "💮", "🉐", "㊙", "㊗", "🈴", "🈵", "🈲", "🅰", "🅱",
+            "🆎", "🆑", "🅾", "🆘", "⛔", "📛", "🚫", "❌", "⭕", "💢", "♨", "🚷", "🚯", "🚳", "🚱", "🔞",
+            "📵", "❗", "❕", "❓", "❔", "‼", "⁉", "💯", "🔅", "🔆", "🔱", "⚜", "〽", "⚠", "🚸", "🔰", "♻",
+            "🈯", "💹", "❇", "✳", "❎", "✅", "💠", "🌀", "➿", "🌐", "Ⓜ", "🏧", "🈂", "🛂", "🛃", "🛄",
+            "🛅", "♿", "🚭", "🚾", "🅿", "🚰", "🚹", "🚺", "🚼", "🚻", "🚮", "🎦", "📶", "🈁", "🆖", "🆗",
+            "🆙", "🆒", "🆕", "🆓", "0⃣", "1⃣", "2⃣", "3⃣", "4⃣", "5⃣", "6⃣", "7⃣", "8⃣", "9⃣", "🔟", "🔢", "▶",
+            "⏸", "⏯", "⏹", "⏺", "⏭", "⏮", "⏩", "⏪", "🔀", "🔁", "🔂", "◀", "🔼", "🔽", "⏫", "⏬", "➡",
+            "⬅", "⬆", "⬇", "↗", "↘", "↙", "↖", "↕", "↔", "🔄", "↪", "↩", "⤴", "⤵", "#⃣", "*⃣", "ℹ",
+            "🔤", "🔡", "🔠", "🔣", "🎵", "🎶", "〰", "➰", "✔", "🔃", "➕", "➖", "➗", "✖", "💲", "💱",
+            "©", "®", "™", "🔚", "🔙", "🔛", "🔝", "🔜", "☑", "🔘", "⚪", "⚫", "🔴", "🔵", "🔸", "🔹",
+            "🔶", "🔷", "🔺", "▪", "▫", "⬛", "⬜", "🔻", "◼", "◻", "◾", "◽", "🔲", "🔳", "🔈", "🔉", "🔊",
+            "🔇", "📣", "📢", "🔔", "🔕", "🃏", "🀄", "♠", "♣", "♥", "♦", "🎴", "👁‍🗨", "💭", "🗯", "💬",
+            "🕐", "🕑", "🕒", "🕓", "🕔", "🕕", "🕖", "🕗", "🕘", "🕙", "🕚", "🕛", "🕜", "🕝", "🕞", "🕟",
+            "🕠", "🕡", "🕢", "🕣", "🕤", "🕥", "🕦", "🕧"
+        }
+    };
+
+    private ArrayList<EmojiGridAdapter>    adapters = new ArrayList<>();
+    private HashMap<String, Integer>       recentUsageCounts = new HashMap<>();
+    private ArrayList<String>              recentChars = new ArrayList<>();
+
+    private Listener            listener;
+    private ViewPager           pager;
+    private FrameLayout         recentsWrap;
+    private ArrayList<GridView> views = new ArrayList<>();
+    private ImageView           backspaceButton;
+    private LinearLayout        pagerSlidingTabStripContainer;
+
+    private int                 oldWidth;
+    private int                 lastNotifyWidth;
+
+    private boolean             backspacePressed;
+    private boolean             backspaceOnce;
+
+    public EmojiInputView(final Context context) {
+        super(context);
+
+        for (int i = 0; i < predefinedEmojis.length + 1/*add one for the recent page*/; i++) {
+            GridView gridView = new GridView(context);
+            gridView.setColumnWidth(AndroidUtilities.dp(45));
+            gridView.setNumColumns(-1);
+            views.add(gridView);
+
+            EmojiGridAdapter emojiGridAdapter = new EmojiGridAdapter(i - 1); // -1: recent, >=0: predefined
+            gridView.setAdapter(emojiGridAdapter);
+            adapters.add(emojiGridAdapter);
+        }
+
+        setBackgroundColor(0xfff5f6f7);
+
+        pager = new ViewPager(context) {
+            @Override
+            public boolean onInterceptTouchEvent(MotionEvent ev) {
+                if (getParent() != null) {
+                    getParent().requestDisallowInterceptTouchEvent(true);
+                }
+                return super.onInterceptTouchEvent(ev);
+            }
+        };
+        pager.setAdapter(new EmojiPagerAdapter());
+
+        pagerSlidingTabStripContainer = new LinearLayout(context) {
+            @Override
+            public boolean onInterceptTouchEvent(MotionEvent ev) {
+                if (getParent() != null) {
+                    getParent().requestDisallowInterceptTouchEvent(true);
+                }
+                return super.onInterceptTouchEvent(ev);
+            }
+        };
+        pagerSlidingTabStripContainer.setOrientation(LinearLayout.HORIZONTAL);
+        pagerSlidingTabStripContainer.setBackgroundColor(0xfff5f6f7);
+        addView(pagerSlidingTabStripContainer, LayoutHelper.createFrame(LayoutParams.MATCH_PARENT, 48));
+
+        PagerSlidingTabStrip pagerSlidingTabStrip = new PagerSlidingTabStrip(context);
+        pagerSlidingTabStrip.setViewPager(pager);
+        pagerSlidingTabStrip.setShouldExpand(true);
+        pagerSlidingTabStrip.setIndicatorHeight(AndroidUtilities.dp(2));
+        pagerSlidingTabStrip.setUnderlineHeight(AndroidUtilities.dp(1));
+        pagerSlidingTabStrip.setIndicatorColor(0xff2b96e2);
+        pagerSlidingTabStrip.setUnderlineColor(0xffe2e5e7);
+        pagerSlidingTabStripContainer.addView(pagerSlidingTabStrip, LayoutHelper.createLinear(0, 48, 1.0f));
+
+        FrameLayout frameLayout = new FrameLayout(context);
+        pagerSlidingTabStripContainer.addView(frameLayout, LayoutHelper.createLinear(52, 48));
+
+        backspaceButton = new ImageView(context) {
+            @Override
+            public boolean onTouchEvent(MotionEvent event) {
+                if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                    backspacePressed = true;
+                    backspaceOnce = false;
+                    postBackspaceRunnable(350);
+                } else if (event.getAction() == MotionEvent.ACTION_CANCEL || event.getAction() == MotionEvent.ACTION_UP) {
+                    backspacePressed = false;
+                    if (!backspaceOnce) {
+                        if (listener != null && listener.onBackspace()) {
+                            backspaceButton.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
+                        }
+                    }
+                }
+                super.onTouchEvent(event);
+                return true;
+            }
+        };
+        backspaceButton.setImageResource(R.drawable.ic_smiles_backspace);
+        backspaceButton.setBackgroundResource(R.drawable.ic_emoji_backspace);
+        backspaceButton.setScaleType(ImageView.ScaleType.CENTER);
+        frameLayout.addView(backspaceButton, LayoutHelper.createFrame(52, 48));
+
+        View view = new View(context);
+        view.setBackgroundColor(0xffe2e5e7);
+        frameLayout.addView(view, LayoutHelper.createFrame(52, 1, Gravity.START | Gravity.BOTTOM));
+
+        recentsWrap = new FrameLayout(context);
+        recentsWrap.addView(views.get(0));
+
+        TextView textView = new TextView(context);
+        textView.setText(context.getString(R.string.NoRecentEmoji));
+        textView.setTextSize(18);
+        textView.setTextColor(0xff888888);
+        textView.setGravity(Gravity.CENTER);
+        recentsWrap.addView(textView);
+        views.get(0).setEmptyView(textView);
+
+        addView(pager, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, Gravity.START | Gravity.TOP, 0, 48, 0, 0));
+
+        loadRecentUsageCounts();
+        sortRecentEmoji();
+        adapters.get(0).notifyDataSetChanged();
+
+        // normally, we open the emoji-input-keyboard with the most recent page (index 0)
+        // if there are no most recent emojis, open the first page (index 1) which contains smilies then
+        if( recentChars.size() == 0 ) {
+            pager.setCurrentItem(1);
+        }
+    }
+
+    private void postBackspaceRunnable(final int time) {
+        AndroidUtilities.runOnUIThread(new Runnable() {
+            @Override
+            public void run() {
+                if (!backspacePressed) {
+                    return;
+                }
+                if (listener != null && listener.onBackspace()) {
+                    backspaceButton.performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
+                }
+                backspaceOnce = true;
+                postBackspaceRunnable(Math.max(50, time - 100));
+            }
+        }, time);
+    }
+
+    public void clearRecent() {
+        recentUsageCounts.clear();
+        recentChars.clear();
+        saveRecentUsageCounts();
+        adapters.get(0).notifyDataSetChanged();
+    }
+
+    private void saveRecentUsageCounts() {
+        SharedPreferences preferences = getContext().getSharedPreferences("emoji", Activity.MODE_PRIVATE);
+        StringBuilder stringBuilder = new StringBuilder();
+        for (HashMap.Entry<String, Integer> entry : recentUsageCounts.entrySet()) {
+            if (stringBuilder.length() != 0) {
+                stringBuilder.append(",");
+            }
+            stringBuilder.append(entry.getKey());
+            stringBuilder.append("=");
+            stringBuilder.append(entry.getValue());
+        }
+        preferences.edit().putString("emojis", stringBuilder.toString()).apply();
+    }
+
+    public void loadRecentUsageCounts() {
+        SharedPreferences preferences = getContext().getSharedPreferences("emoji", Activity.MODE_PRIVATE);
+        String str;
+        try {
+            recentUsageCounts.clear();
+            str = preferences.getString("emojis", "");
+            if (str.length() > 0) {
+                String[] args = str.split(",");
+                for (String arg : args) {
+                    String[] args2 = arg.split("=");
+                    recentUsageCounts.put(args2[0], Utilities.parseInt(args2[1]));
+                }
+            }
+        } catch (Exception e) {
+
+        }
+    }
+
+    private void sortRecentEmoji() {
+        recentChars.clear();
+        for (HashMap.Entry<String, Integer> entry : recentUsageCounts.entrySet()) {
+            recentChars.add(entry.getKey());
+        }
+        Collections.sort(recentChars, new Comparator<String>() {
+            @Override
+            public int compare(String lhs, String rhs) {
+                Integer count1 = recentUsageCounts.get(lhs);
+                Integer count2 = recentUsageCounts.get(rhs);
+                if (count1 == null) {
+                    count1 = 0;
+                }
+                if (count2 == null) {
+                    count2 = 0;
+                }
+                if (count1 > count2) {
+                    return -1;
+                } else if (count1 < count2) {
+                    return 1;
+                }
+                return 0;
+            }
+        });
+        while (recentChars.size() > 50) {
+            recentChars.remove(recentChars.size() - 1);
+        }
+    }
+
+    @Override
+    public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) pagerSlidingTabStripContainer.getLayoutParams();
+        layoutParams.width = View.MeasureSpec.getSize(widthMeasureSpec);
+        if (layoutParams.width != oldWidth) {
+            pagerSlidingTabStripContainer.setLayoutParams(layoutParams);
+            oldWidth = layoutParams.width;
+        }
+        super.onMeasure(View.MeasureSpec.makeMeasureSpec(layoutParams.width, MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(View.MeasureSpec.getSize(heightMeasureSpec), MeasureSpec.EXACTLY));
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        if (lastNotifyWidth != right - left) {
+            lastNotifyWidth = right - left;
+        }
+        super.onLayout(changed, left, top, right, bottom);
+    }
+
+    public void setListener(Listener value) {
+        listener = value;
+    }
+
+    public void invalidateViews() {
+        for (GridView gridView : views) {
+            if (gridView != null) {
+                gridView.invalidateViews();
+            }
+        }
+    }
+
+    @Override
+    public void setVisibility(int visibility) {
+        super.setVisibility(visibility);
+        if (visibility != GONE) {
+            sortRecentEmoji();
+            adapters.get(0).notifyDataSetChanged();
+        }
+    }
+
+    private class SingleEmojiView extends ImageView {
+
+        public SingleEmojiView(Context context) {
+            super(context);
+
+            setOnClickListener(new View.OnClickListener() {
+                public void onClick(View view) {
+                    sendEmoji();
+                }
+            });
+            setOnLongClickListener(new OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View view) {
+                    if (pager.getCurrentItem() == 0) {
+                        listener.onClearEmojiRecent();
+                    }
+                    return false;
+                }
+            });
+            setBackgroundResource(R.drawable.list_selector);
+            setScaleType(ImageView.ScaleType.CENTER);
+        }
+
+        private void sendEmoji() {
+            String code = (String) getTag();
+
+            Integer count = recentUsageCounts.get(code);
+            if (count == null) {
+                count = 0;
+            }
+            if (count == 0 && recentUsageCounts.size() > 50) {
+                for (int a = recentChars.size() - 1; a >= 0; a--) {
+                    String emoji = recentChars.get(a);
+                    recentUsageCounts.remove(emoji);
+                    recentChars.remove(a);
+                    if (recentUsageCounts.size() <= 50) {
+                        break;
+                    }
+                }
+            }
+            recentUsageCounts.put(code, ++count);
+            if (pager.getCurrentItem() != 0) {
+                sortRecentEmoji();
+                adapters.get(0).notifyDataSetChanged();
+                views.get(0).invalidateViews();
+            }
+            saveRecentUsageCounts();
+            if (listener != null) {
+                listener.onEmojiSelected(fixEmoji(code));
+            }
+        }
+
+        @Override
+        public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            setMeasuredDimension(View.MeasureSpec.getSize(widthMeasureSpec), View.MeasureSpec.getSize(widthMeasureSpec));
+        }
+    }
+
+    private class EmojiGridAdapter extends BaseAdapter {
+
+        private int emojiPage; // -1: recent, >= 0: predefined from predefinedEmojis
+
+        public EmojiGridAdapter(int page) {
+            emojiPage = page;
+        }
+
+        public int getCount() {
+            int ret = emojiPage == -1? recentChars.size() :  predefinedEmojis[emojiPage].length;
+            return ret;
+        }
+
+        public Object getItem(int i) {
+            return null;
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        public View getView(int i, View view, ViewGroup paramViewGroup) {
+            SingleEmojiView imageView = (SingleEmojiView) view;
+            if (imageView == null) {
+                imageView = new SingleEmojiView(getContext());
+            }
+            String code;
+            String coloredCode;
+            if (emojiPage == -1) {
+                coloredCode = code = recentChars.get(i);
+            } else {
+                coloredCode = code = predefinedEmojis[emojiPage][i];
+            }
+
+            // Draw native Emojis using TextDrawable, not imageView.setImageDrawable(Emoji.getEmojiBigDrawable(code)). See:
+            // https://github.com/Jamesits/Moegram/commit/8e52c6222cf00bc9a86d52fed4c06558f48c345c
+            // and https://github.com/amulyakhare/TextDrawable
+            imageView.setTag(code);
+            int bigImgSize;
+            bigImgSize = AndroidUtilities.dp(32);
+            imageView.setImageDrawable(TextDrawable.builder().beginConfig().textColor(Color.BLACK).fontSize(bigImgSize).endConfig().buildRect(coloredCode, Color.TRANSPARENT));
+            return imageView;
+        }
+
+        @Override
+        public void unregisterDataSetObserver(DataSetObserver observer) {
+            if (observer != null) {
+                super.unregisterDataSetObserver(observer);
+            }
+        }
+    }
+
+    private class EmojiPagerAdapter extends PagerAdapter implements PagerSlidingTabStrip.IconTabProvider {
+
+        public void destroyItem(ViewGroup viewGroup, int position, Object object) {
+            View view;
+            if (position == 0) {
+                view = recentsWrap;
+            } else {
+                view = views.get(position);
+            }
+            viewGroup.removeView(view);
+        }
+
+        public int getCount() {
+            return views.size();
+        }
+
+        public int getPageIconResId(int position) {
+            int[] icons = {
+                    R.drawable.ic_emoji_recent,
+                    R.drawable.ic_emoji_smile,
+                    R.drawable.ic_emoji_flower,
+                    R.drawable.ic_emoji_bell,
+                    R.drawable.ic_emoji_car,
+                    R.drawable.ic_emoji_symbol};
+            return icons[position>=0 && position<icons.length? position : 0];
+        }
+
+        public Object instantiateItem(ViewGroup viewGroup, int position) {
+            View view;
+            if (position == 0) {
+                view = recentsWrap;
+            } else {
+                view = views.get(position);
+            }
+            viewGroup.addView(view);
+            return view;
+        }
+
+        public boolean isViewFromObject(View view, Object object) {
+            return view == object;
+        }
+
+        @Override
+        public void unregisterDataSetObserver(DataSetObserver observer) {
+            if (observer != null) {
+                super.unregisterDataSetObserver(observer);
+            }
+        }
+    }
+
+    private static final char[] insertVariationSelector = {
+        0x2B50, 0x2600, 0x26C5, 0x2601, 0x26A1, 0x2744, 0x26C4, 0x2614, 0x2708, 0x26F5, 0x2693,
+        0x26FD, 0x26F2, 0x26FA, 0x26EA, 0x2615, 0x26BD, 0x26BE, 0x26F3, 0x231A, 0x260E, 0x231B,
+        0x2709, 0x2702, 0x2712, 0x270F, 0x2648, 0x2649, 0x264A, 0x264B, 0x264C, 0x264D, 0x264E,
+        0x264F, 0x2650, 0x2651, 0x2652, 0x2653, 0x2734, 0x3299, 0x3297, 0x26D4, 0x2B55, 0x2668,
+        0x2757, 0x203C, 0x2049, 0x303D, 0x26A0, 0x267B, 0x2747, 0x2733, 0x24C2, 0x267F, 0x25B6,
+        0x25C0, 0x27A1, 0x2B05, 0x2B06, 0x2B07, 0x2197, 0x2198, 0x2199, 0x2196, 0x2195, 0x2194,
+        0x21AA, 0x21A9, 0x2934, 0x2935, 0x2139, 0x2714, 0x2716, 0x2611, 0x26AA, 0x26AB, 0x25AA,
+        0x25AB, 0x2B1B, 0x2B1C, 0x25FC, 0x25FB, 0x25FE, 0x25FD, 0x2660, 0x2663, 0x2665, 0x2666,
+        0x263A, 0x2639, 0x270C, 0x261D, 0x2764
+    };
+    private static final HashMap<Character, Boolean> insertVariationSelectorMap = new HashMap<>(insertVariationSelector.length);
+    static {
+        for (int a = 0; a < insertVariationSelector.length; a++) {
+            insertVariationSelectorMap.put(insertVariationSelector[a], true);
+        }
+    }
+    private static String fixEmoji(String emoji) {
+        char ch;
+        int lenght = emoji.length();
+        for (int a = 0; a < lenght; a++) {
+            ch = emoji.charAt(a);
+            if (ch >= 0xD83C && ch <= 0xD83E) {
+                if (ch == 0xD83C && a < lenght - 1) {
+                    ch = emoji.charAt(a + 1);
+                    if (ch == 0xDE2F || ch == 0xDC04 || ch == 0xDE1A || ch == 0xDD7F) {
+                        emoji = emoji.substring(0, a + 2) + "\uFE0F"/*VARIATION SELECTOR-16*/ + emoji.substring(a + 2);
+                        lenght++;
+                        a += 2;
+                    } else {
+                        a++;
+                    }
+                } else {
+                    a++;
+                }
+            } else if (ch == 0x20E3 /*COMBINING ENCLOSING KEYCAP*/) {
+                return emoji;
+            } if (insertVariationSelectorMap.containsKey(ch)) {
+                emoji = emoji.substring(0, a + 1) + "\uFE0F"/*VARIATION SELECTOR-16*/ + emoji.substring(a + 1);
+                lenght++;
+                a++;
+            }
+        }
+        return emoji;
+    }
+
+    public static CharSequence replaceEmoji(CharSequence cs, boolean createNew) {
+        if (cs == null || cs.length() == 0) {
+            return cs;
+        }
+        Spannable s;
+        if (!createNew && cs instanceof Spannable) {
+            s = (Spannable) cs;
+        } else {
+            s = Spannable.Factory.getInstance().newSpannable(cs.toString());
+        }
+
+        return s;
+    }
+}

MessengerProj/src/main/java/com/b44t/messenger/FileLog.java

@@ -1,106 +0,0 @@
-/*******************************************************************************
- *
- *                              Delta Chat Android
- *                        (C) 2013-2016 Nikolai Kudashov
- *                           (C) 2017 Björn Petersen
- *                    Contact: r10s@b44t.com, http://b44t.com
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see http://www.gnu.org/licenses/ .
- *
- ******************************************************************************/
-
-
-package com.b44t.messenger;
-
-import com.b44t.messenger.time.FastDateFormat;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.util.Locale;
-
-public class FileLog {
-    private OutputStreamWriter streamWriter = null;
-    private FastDateFormat dateFormat = null;
-    private DispatchQueue logQueue = null;
-    private File currentFile = null;
-
-    private static volatile FileLog Instance = null;
-    public static FileLog getInstance() {
-        FileLog localInstance = Instance;
-        if (localInstance == null) {
-            synchronized (FileLog.class) {
-                localInstance = Instance;
-                if (localInstance == null) {
-                    Instance = localInstance = new FileLog();
-                }
-            }
-        }
-        return localInstance;
-    }
-
-    public FileLog() {
-        dateFormat = FastDateFormat.getInstance("yyyyMMdd_HHmmss", Locale.US);
-        try {
-            File sdCard = ApplicationLoader.applicationContext.getExternalFilesDir(null);
-            if (sdCard == null) {
-                return;
-            }
-            File dir = new File(sdCard.getAbsolutePath() + "/logs");
-            dir.mkdirs();
-            currentFile = new File(dir, dateFormat.format(System.currentTimeMillis()) + ".txt");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        try {
-            logQueue = new DispatchQueue("logQueue");
-            currentFile.createNewFile();
-            FileOutputStream stream = new FileOutputStream(currentFile);
-            streamWriter = new OutputStreamWriter(stream);
-            streamWriter.write("-----start log " + dateFormat.format(System.currentTimeMillis()) + "-----\n");
-            streamWriter.flush();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private static void log(final String what, final String tag, final String message)
-    {
-        if (getInstance().streamWriter != null) {
-            getInstance().logQueue.postRunnable(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        getInstance().streamWriter.write(getInstance().dateFormat.format(System.currentTimeMillis()) + " " + what + "/" + tag + ": " + message + "\n");
-                        getInstance().streamWriter.flush();
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            });
-        }
-    }
-
-    public static void e(final String tag, final String message) {
-        log("E", tag, message);
-    }
-
-    public static void w(final String tag, final String message) {
-        log("W", tag, message);
-    }
-
-    public static void i(final String tag, final String message) {
-        log("I", tag, message);
-    }
-}

MessengerProj/src/main/java/com/b44t/messenger/GroupCreateFinalActivity.java

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 
-package com.b44t.ui;
+package com.b44t.messenger;
 
 import android.content.Context;
 import android.content.Intent;
@@ -37,20 +37,17 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.TextView;
 import android.widget.Toast;
 
-import com.b44t.messenger.AndroidUtilities;
-import com.b44t.messenger.MrContact;
-import com.b44t.messenger.MrMailbox;
-import com.b44t.messenger.NotificationCenter;
-import com.b44t.messenger.R;
-import com.b44t.ui.Adapters.BaseFragmentAdapter;
-import com.b44t.ui.Cells.GreySectionCell;
-import com.b44t.ui.Cells.UserCell;
-import com.b44t.ui.ActionBar.ActionBar;
-import com.b44t.ui.ActionBar.ActionBarMenu;
-import com.b44t.ui.ActionBar.BaseFragment;
-import com.b44t.ui.Components.LayoutHelper;
+import com.b44t.messenger.Cells.HeaderCell;
+import com.b44t.messenger.Components.BaseFragmentAdapter;
+import com.b44t.messenger.Cells.GreySectionCell;
+import com.b44t.messenger.Cells.UserCell;
+import com.b44t.messenger.ActionBar.ActionBar;
+import com.b44t.messenger.ActionBar.ActionBarMenu;
+import com.b44t.messenger.ActionBar.BaseFragment;
+import com.b44t.messenger.Components.LayoutHelper;
 
 import java.util.ArrayList;
 
@@ -64,17 +61,26 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
 
     private final static int done_button = 1;
 
+    int do_what; // values from ContactsActivity
+
     public GroupCreateFinalActivity(Bundle args) {
+
         super(args);
+        if( args != null ) {
+            do_what = args.getInt("do_what", 0);
+            selectedContacts = args.getIntegerArrayList("result"); /* may be empty - in this case a group only with SELF is created */
+        }
+        if( selectedContacts == null ) { selectedContacts = new ArrayList<>(); }
+        if( !selectedContacts.contains(MrContact.MR_CONTACT_ID_SELF) ) {
+            selectedContacts.add(MrContact.MR_CONTACT_ID_SELF);
+        }
     }
 
     @SuppressWarnings("unchecked")
     @Override
     public boolean onFragmentCreate() {
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.updateInterfaces);
-        selectedContacts = getArguments().getIntegerArrayList("result"); /* may be empty - in this case a group only with SELF is created */
-        if( selectedContacts == null ) { selectedContacts = new ArrayList<>(); }
-        selectedContacts.add(MrContact.MR_CONTACT_ID_SELF);
+
         return super.onFragmentCreate();
     }
 
@@ -95,8 +101,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
     @Override
     public View createView(final Context context) {
         actionBar.setBackButtonImage(R.drawable.ic_close_white);
-        actionBar.setAllowOverlayTitle(true);
-        actionBar.setTitle(context.getString(R.string.NewGroup));
+        actionBar.setTitle(do_what==ContactsActivity.SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP? context.getString(R.string.NewVerifiedGroup) : context.getString(R.string.NewGroup));
         actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
             @Override
             public void onItemClick(int id) {
@@ -108,7 +113,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
                         Toast.makeText(getParentActivity(), context.getString(R.string.ErrGroupNameEmpty), Toast.LENGTH_LONG).show();
                         return;
                     }
-                    int chat_id=MrMailbox.createGroupChat(groupName);
+                    int chat_id=MrMailbox.createGroupChat(do_what==ContactsActivity.SELECT_CONTACTS_FOR_NEW_VERIFIED_GROUP, groupName);
                     if( chat_id<=0 ) {
                         /* this should never happen, the group is created locally, there is no reason to fail here */
                         Toast.makeText(getParentActivity(), "ErrCreateGroup", Toast.LENGTH_LONG).show();
@@ -140,13 +145,8 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
         LinearLayout linearLayout = (LinearLayout) fragmentView;
         linearLayout.setOrientation(LinearLayout.VERTICAL);
 
-        FrameLayout frameLayout = new FrameLayout(context);
-        linearLayout.addView(frameLayout);
-        LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) frameLayout.getLayoutParams();
-        layoutParams.width = LayoutHelper.MATCH_PARENT;
-        layoutParams.height = LayoutHelper.WRAP_CONTENT;
-        layoutParams.gravity = Gravity.TOP | Gravity.START;
-        frameLayout.setLayoutParams(layoutParams);
+        TextView label = HeaderCell.createTextView(context, context.getString(R.string.Name));
+        linearLayout.addView(label, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_VERTICAL, 18, 18, 18, 0));
 
         nameTextView = new EditText(context);
         nameTextView.setHint(context.getString(R.string.EnterGroupNamePlaceholder));
@@ -157,7 +157,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
         nameTextView.setMaxLines(4);
         nameTextView.setGravity(Gravity.CENTER_VERTICAL | Gravity.START);
         nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 18);
-        nameTextView.setHintTextColor(0xff979797);
+        nameTextView.setHintTextColor(0xffBBBBBB);
         nameTextView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
         nameTextView.setInputType(InputType.TYPE_TEXT_FLAG_CAP_WORDS);
         nameTextView.setPadding(0, 0, 0, AndroidUtilities.dp(8));
@@ -165,27 +165,17 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
         inputFilters[0] = new InputFilter.LengthFilter(100);
         nameTextView.setFilters(inputFilters);
         nameTextView.setTextColor(0xff212121);
-        frameLayout.addView(nameTextView);
-        FrameLayout.LayoutParams layoutParams1 = (FrameLayout.LayoutParams) nameTextView.getLayoutParams();
-        layoutParams1.width = LayoutHelper.MATCH_PARENT;
-        layoutParams1.height = LayoutHelper.WRAP_CONTENT;
-        layoutParams1.topMargin = AndroidUtilities.dp(18);
-        layoutParams1.bottomMargin = AndroidUtilities.dp(18);
-        layoutParams1.leftMargin = AndroidUtilities.dp(18);
-        layoutParams1.rightMargin = AndroidUtilities.dp(18);
-        layoutParams1.gravity = Gravity.CENTER_VERTICAL;
-        nameTextView.setLayoutParams(layoutParams1);
+        linearLayout.addView(nameTextView, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_VERTICAL, 18, 1, 18, 18));
 
-        GreySectionCell sectionCell = new GreySectionCell(context);
-        sectionCell.setText(context.getResources().getQuantityString(R.plurals.Members, selectedContacts.size(), selectedContacts.size()));
-        linearLayout.addView(sectionCell);
+        label = HeaderCell.createTextView(context, context.getResources().getQuantityString(R.plurals.Members, selectedContacts.size(), selectedContacts.size()));
+        linearLayout.addView(label, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_VERTICAL, 18, 9, 18, 4));
 
         listView = new ListView(context);
         listView.setDivider(null);
         listView.setDividerHeight(0);
         listView.setAdapter(listAdapter = new ListAdapter(context));
         linearLayout.addView(listView);
-        layoutParams = (LinearLayout.LayoutParams) listView.getLayoutParams();
+        LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) listView.getLayoutParams();
         layoutParams.width = LayoutHelper.MATCH_PARENT;
         layoutParams.height = LayoutHelper.MATCH_PARENT;
         listView.setLayoutParams(layoutParams);
@@ -271,14 +261,14 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
         @Override
         public View getView(int i, View view, ViewGroup viewGroup) {
             if (view == null) {
-                view = new UserCell(mContext, 1, 0);
+                view = new UserCell(mContext,0);
             }
 
             int curr_user_id = selectedContacts.get(i);
 
             MrContact mrContact = MrMailbox.getContact(curr_user_id);
 
-            ((UserCell) view).setData(mrContact, 0);
+            ((UserCell) view).setData(mrContact);
 
             return view;
         }

MessengerProj/src/main/java/com/b44t/messenger/ImageLoader.java

@@ -38,7 +38,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
 
-import com.b44t.ui.Components.AnimatedFileDrawable;
+import com.b44t.messenger.Components.AnimatedFileDrawable;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -46,8 +46,6 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
 import java.util.ArrayList;
 import java.util.HashMap;
 

MessengerProj/src/main/java/com/b44t/messenger/ImageReceiver.java

@@ -29,7 +29,6 @@ import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.Matrix;
 import android.graphics.Paint;
-import android.graphics.Path;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
@@ -39,7 +38,7 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 
-import com.b44t.ui.Components.AnimatedFileDrawable;
+import com.b44t.messenger.Components.AnimatedFileDrawable;
 
 public class ImageReceiver implements NotificationCenter.NotificationCenterDelegate {
 

MessengerProj/src/main/java/com/b44t/messenger/KeepAliveService.java

@@ -24,6 +24,7 @@ package com.b44t.messenger;
 
 import android.app.Notification;
 import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
@@ -85,6 +86,8 @@ public class KeepAliveService extends Service {
     public static final int FG_NOTIFICATION_ID = 4142;
     private Notification createNotification()
     {
+        Intent intent = new Intent(this, LaunchActivity.class);
+        PendingIntent contentIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         // a notification _must_ contain a small icon, a title and a text, see https://developer.android.com/guide/topics/ui/notifiers/notifications.html#Required
         NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
 
@@ -101,6 +104,7 @@ public class KeepAliveService extends Service {
             builder.setPriority(NotificationCompat.PRIORITY_MIN);
         }
         builder.setWhen(0);
+        builder.setContentIntent(contentIntent);
         builder.setSmallIcon(R.drawable.notification_permanent);
         return builder.build();
     }