Update messenger-backend submodule.

French translation

CHANGELOG.md

@@ -1,5 +1,44 @@
 # Delta Chat Changelog
 
+## v0.9.3
+2017-07-13
+
+* Introduce "Read receipts" and avoid social pressure to leave it activated
+* Improve encryption dialog in profile
+* Fix marking messages as "seen" when opening the contact requests
+* Ignore signature.asc files of signed-only messages
+* Update Polish, Portuguese and Russian translations
+
+## v0.9.2
+2017-06-28
+
+* Encrypt group chats
+* Cryptographically sign messages
+* Validate signatures of incoming messages ("Info" shows the state)
+* Show a little lock beside end-to-end-encrypted messages with a validated signature
+* If end-to-end-encryption is available on sending time, guarantee the message not to be sent without end-to-end-encryption later
+* Show special characters in HTML-mails
+* Help MUAs on showing chat threads
+* Show attachments from multipart/alternative structures
+* Upgrade from Autocrypt Level 0 to Level 1; as the levels are not compatible, encryption on mixed setups does not happen
+* Update Polish, Portuguese, Spanish and French translations
+
+## v0.9.1
+2017-06-04
+
+* Profile: Improve encryption state dialog
+* Improved video quality of short clips
+* Make encryption-dialog localizable
+* Update Russian translation
+
+## v0.9.0
+2017-06-01
+
+* Add end-to-end-encrypting following the OpenPGP and Autocrypt standards
+* Add a function to compare keys
+* Profile: Add option to copy the email address to the clipboard
+* Pimp GUI
+
 ## v0.1.36
 2017-05-04
 

MessengerProj/build.gradle

@@ -76,7 +76,7 @@ android {
         }
     }
 
-    defaultConfig.versionCode = 36
+    defaultConfig.versionCode = 42
 
     sourceSets.main {
         jniLibs.srcDir 'libs'
@@ -118,6 +118,6 @@ android {
         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.1.36" // do NOT forget to increase defaultConfig.versionCode!
+        versionName "0.9.3"  // do NOT forget to increase defaultConfig.versionCode!
     }
 }

MessengerProj/jni/Android.mk

@@ -493,6 +493,19 @@ local_src_files := \
 	./openssl/crypto/buffer/buf_err.c \
 	./openssl/crypto/buffer/buf_str.c \
 	./openssl/crypto/buffer/buffer.c \
+	./openssl/crypto/camellia/camellia.c \
+	./openssl/crypto/camellia/cmll_cbc.c \
+	./openssl/crypto/camellia/cmll_cfb.c \
+	./openssl/crypto/camellia/cmll_ctr.c \
+	./openssl/crypto/camellia/cmll_ecb.c \
+	./openssl/crypto/camellia/cmll_misc.c \
+	./openssl/crypto/camellia/cmll_ofb.c \
+	./openssl/crypto/camellia/cmll_utl.c \
+	./openssl/crypto/cast/c_cfb64.c \
+	./openssl/crypto/cast/c_ecb.c \
+	./openssl/crypto/cast/c_enc.c \
+	./openssl/crypto/cast/c_ofb64.c \
+	./openssl/crypto/cast/c_skey.c \
 	./openssl/crypto/cmac/cm_ameth.c \
 	./openssl/crypto/cmac/cm_pmeth.c \
 	./openssl/crypto/cmac/cmac.c \
@@ -610,6 +623,8 @@ local_src_files := \
 	./openssl/crypto/evp/e_aes.c \
 	./openssl/crypto/evp/e_aes_cbc_hmac_sha1.c \
 	./openssl/crypto/evp/e_bf.c \
+	./openssl/crypto/evp/e_camellia.c \
+	./openssl/crypto/evp/e_cast.c \
 	./openssl/crypto/evp/e_des.c \
 	./openssl/crypto/evp/e_des3.c \
 	./openssl/crypto/evp/e_null.c \
@@ -1188,6 +1203,7 @@ LOCAL_SRC_FILES := \
 	./messenger-backend/libs/libetpan/src/low-level/smtp/mailsmtp_ssl.c \
 	./messenger-backend/libs/libetpan/src/main/libetpan_version.c \
 	./messenger-backend/libs/libetpan/src/driver/implementation/data-message/data_message_driver.c \
+	./messenger-backend/libs/libetpan/src/driver/implementation/mime-message/mime_message_driver.c \
 	./messenger-backend/libs/libetpan/src/driver/interface/maildriver.c \
 	./messenger-backend/libs/libetpan/src/driver/interface/maildriver_tools.c \
 	./messenger-backend/libs/libetpan/src/driver/interface/maildriver_types.c \
@@ -1197,7 +1213,9 @@ LOCAL_SRC_FILES := \
 	./messenger-backend/libs/libetpan/src/driver/interface/mailmessage_tools.c \
 	./messenger-backend/libs/libetpan/src/driver/interface/mailmessage_types.c \
 	./messenger-backend/libs/libetpan/src/driver/interface/mailstorage.c \
-	./messenger-backend/libs/libetpan/src/driver/interface/mailstorage_tools.c
+	./messenger-backend/libs/libetpan/src/driver/interface/mailstorage_tools.c \
+	./messenger-backend/libs/libetpan/src/engine/mailprivacy.c \
+	./messenger-backend/libs/libetpan/src/engine/mailprivacy_tools.c
 LOCAL_C_INCLUDES = \
 	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src \
 	$(LOCAL_PATH)/messenger-backend/libs/libetpan/src/data-types \
@@ -1220,7 +1238,6 @@ LOCAL_C_INCLUDES = \
 include $(BUILD_STATIC_LIBRARY)
 
 
-
 ################################################################################
 # cyrus sasl
 ################################################################################
@@ -1492,6 +1509,7 @@ $(LOCAL_PATH)/breakpad/common/android/include \
 $(LOCAL_PATH)/breakpad \
 $(LOCAL_PATH)/ffmpeg \
 $(LOCAL_PATH)/messenger-backend/libs/libetpan/include \
+$(LOCAL_PATH)/messenger-backend/libs/netpgp/include \
 $(LOCAL_PATH)/messenger-backend/libs/sqlite
 
 #LOCAL_SRC_FILES     += \
@@ -1599,21 +1617,41 @@ LOCAL_SRC_FILES     += \
 ./image.c \
 ./video.c \
 ./gifvideo.cpp \
+./messenger-backend/libs/netpgp/src/compress.c \
+./messenger-backend/libs/netpgp/src/create.c \
+./messenger-backend/libs/netpgp/src/crypto.c \
+./messenger-backend/libs/netpgp/src/keyring.c \
+./messenger-backend/libs/netpgp/src/misc.c \
+./messenger-backend/libs/netpgp/src/openssl_crypto.c \
+./messenger-backend/libs/netpgp/src/packet-parse.c \
+./messenger-backend/libs/netpgp/src/packet-show.c \
+./messenger-backend/libs/netpgp/src/reader.c \
+./messenger-backend/libs/netpgp/src/signature.c \
+./messenger-backend/libs/netpgp/src/symmetric.c \
+./messenger-backend/libs/netpgp/src/validate.c \
+./messenger-backend/libs/netpgp/src/writer.c \
+./messenger-backend/src/mraheader.c \
+./messenger-backend/src/mrapeerstate.c \
 ./messenger-backend/src/mrchat.c \
 ./messenger-backend/src/mrchatlist.c \
 ./messenger-backend/src/mrcmdline.c \
 ./messenger-backend/src/mrcontact.c \
-./messenger-backend/src/mre2ee.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/mrmailbox.c \
 ./messenger-backend/src/mrmailbox_configure.c \
+./messenger-backend/src/mrmailbox_e2ee.c \
+./messenger-backend/src/mrmailbox_imex.c \
 ./messenger-backend/src/mrmailbox_log.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 \

MessengerProj/jni/audio.c

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/jni/gifvideo.cpp

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/jni/gifvideo.h

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/jni/image.c

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/jni/image.h

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/jni/mrjnimain.c

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/jni/mrjnimain.h

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/jni/mrwrapper.c

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
  *
@@ -363,15 +363,19 @@ JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_getChatIdByContactId(JNIEnv *en
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_markseenMsg(JNIEnv *env, jclass cls, jint msg_id)
+JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_markseenMsgs(JNIEnv *env, jclass cls, jintArray msg_ids)
 {
-	return (jint)mrmailbox_markseen_msg(get_mrmailbox_t(env, cls), msg_id);
+	int msg_ids_cnt;
+	const uint32_t* msg_ids_ptr = jintArray2uint32Pointer(env, msg_ids, &msg_ids_cnt);
+		jint ret = mrmailbox_markseen_msgs(get_mrmailbox_t(env, cls), msg_ids_ptr, msg_ids_cnt);
+	free(msg_ids_ptr);
+	return ret;
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_markseenChat(JNIEnv *env, jclass cls, jint chat_id)
+JNIEXPORT jint Java_com_b44t_messenger_MrMailbox_marknoticedChat(JNIEnv *env, jclass cls, jint chat_id)
 {
-	return (jlong)mrmailbox_markseen_chat(get_mrmailbox_t(env, cls), chat_id);
+	return (jlong)mrmailbox_marknoticed_chat(get_mrmailbox_t(env, cls), chat_id);
 }
 
 
@@ -511,6 +515,15 @@ JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_getInfo(JNIEnv *env, jclass
 }
 
 
+JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_getContactEncrInfo(JNIEnv *env, jclass cls, jint contact_id)
+{
+	char* temp = mrmailbox_get_contact_encrinfo(get_mrmailbox_t(env, cls), contact_id);
+		jstring ret = JSTRING_NEW(temp);
+	free(temp);
+	return ret;
+}
+
+
 JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_cmdline(JNIEnv *env, jclass cls, jstring cmd)
 {
 	CHAR_REF(cmd);
@@ -522,6 +535,14 @@ JNIEXPORT jstring Java_com_b44t_messenger_MrMailbox_cmdline(JNIEnv *env, jclass
 }
 
 
+JNIEXPORT void Java_com_b44t_messenger_MrMailbox_imex(JNIEnv *env, jclass cls, jint what, jstring dir)
+{
+	CHAR_REF(dir);
+		mrmailbox_imex(get_mrmailbox_t(env, cls), what, dirPtr, "");
+	CHAR_UNREF(dir);
+}
+
+
 JNIEXPORT void Java_com_b44t_messenger_MrMailbox_heartbeat(JNIEnv *env, jclass cls)
 {
     mrmailbox_heartbeat(get_mrmailbox_t(env, cls));
@@ -659,9 +680,9 @@ JNIEXPORT jint Java_com_b44t_messenger_MrChat_MrChatGetTotalMsgCount(JNIEnv *env
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_MrChat_MrChatGetUnseenCount(JNIEnv *env, jclass c, jlong hChat)
+JNIEXPORT jint Java_com_b44t_messenger_MrChat_getFreshMsgCount(JNIEnv *env, jclass cls)
 {
-	return mrchat_get_unseen_count((mrchat_t*)hChat);
+	return mrchat_get_fresh_msg_count(get_mrchat_t(env, cls));
 }
 
 
@@ -747,9 +768,9 @@ JNIEXPORT jintArray Java_com_b44t_messenger_MrMailbox_searchMsgs(JNIEnv *env, jc
 }
 
 
-JNIEXPORT jintArray Java_com_b44t_messenger_MrMailbox_getUnseenMsgs(JNIEnv *env, jclass cls)
+JNIEXPORT jintArray Java_com_b44t_messenger_MrMailbox_getFreshMsgs(JNIEnv *env, jclass cls)
 {
-	carray* ca = mrmailbox_get_unseen_msgs(get_mrmailbox_t(env, cls));
+	carray* ca = mrmailbox_get_fresh_msgs(get_mrmailbox_t(env, cls));
 	return carray2jintArray_n_carray_free(env, ca);
 }
 

MessengerProj/jni/openssl/android-config.mk

@@ -8,7 +8,7 @@
 LOCAL_CFLAGS += -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN #-DTERMIO
 
 # From DEPFLAG=
-LOCAL_CFLAGS += -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CAST -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_SHA0 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_STORE -DOPENSSL_NO_WHIRLPOOL
+LOCAL_CFLAGS += -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_SHA0 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_STORE -DOPENSSL_NO_WHIRLPOOL
 
 # Extra
 LOCAL_CFLAGS += -DOPENSSL_NO_HW -DOPENSSL_NO_ENGINE -DZLIB

MessengerProj/jni/video.c

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -1018,7 +1018,7 @@ public class AndroidUtilities {
                         if (copied) {
                             if ( add_to_download_manager ) {
                                 DownloadManager downloadManager = (DownloadManager) ApplicationLoader.applicationContext.getSystemService(Context.DOWNLOAD_SERVICE);
-                                downloadManager.addCompletedDownload(destPathNFile.getName(), destPathNFile.getName(), false, getMimetype(msg_file_name, msg_mime), destPathNFile.getAbsolutePath(), destPathNFile.length(), true);
+                                downloadManager.addCompletedDownload(destPathNFile.getName(), destPathNFile.getName(), true, getMimetype(msg_file_name, msg_mime), destPathNFile.getAbsolutePath(), destPathNFile.length(), true);
                             } else {
                                 addMediaToGallery(Uri.fromFile(destPathNFile));
                             }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
  *

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -38,7 +38,7 @@ public class AutoMessageHeardReceiver extends BroadcastReceiver {
         if (dialog_id == 0 || max_id == 0) {
             return;
         }
-        MrMailbox.markseenChat((int)dialog_id);
+        MrMailbox.marknoticedChat((int)dialog_id);
         NotificationsController.getInstance().removeSeenMessages();
     }
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -49,7 +49,7 @@ public class AutoMessageReplyReceiver extends BroadcastReceiver {
             return;
         }
         SendMessagesHelper.getInstance().sendMessageText(text.toString(), dialog_id, null);
-        MrMailbox.markseenChat((int)dialog_id);
+        MrMailbox.marknoticedChat((int)dialog_id);
         NotificationsController.getInstance().removeSeenMessages();
     }
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
  *

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
  *

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
  *

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
  *
@@ -68,9 +68,7 @@ public class MrChat {
     public int setDraft(String draft/*NULL=delete*/, long replyToMsgId) {
         return MrChatSetDraft(m_hChat, draft, replyToMsgId);
     }
-    public int getUnseenCount() {
-        return MrChatGetUnseenCount(m_hChat);
-    }
+    public native int getFreshMsgCount();
 
     public int getTotalMsgCount() {
         return MrChatGetTotalMsgCount(m_hChat);
@@ -86,17 +84,12 @@ public class MrChat {
     private native static long    MrChatGetDraftTimestamp    (long hChat); // returns 0 for "no draft"
     private native static int     MrChatGetDraftReplyToMsgId (long hChat); // returns 0 for "no draft"
     private native static int     MrChatSetDraft             (long hChat, String draft/*NULL=delete*/, long replyToMsgId);
-    private native static int     MrChatGetUnseenCount       (long hChat);
     private native static int     MrChatGetTotalMsgCount     (long hChat);
 
 
     /* additional functions that are not 1:1 available in the backend
      **********************************************************************************************/
 
-    public int isEncrypted() {
-        return 0;
-    }
-
     public static TLRPC.Chat chatId2chat(int id)
     {
         TLRPC.Chat ret = new TLRPC.Chat();

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
  *

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
  *

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
  *
@@ -29,16 +29,16 @@ package com.b44t.messenger;
 
 
 import android.app.Activity;
+import android.app.DownloadManager;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.util.Log;
 
 import com.b44t.ui.Components.ForegroundDetector;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
@@ -69,6 +69,12 @@ public class MrMailbox {
 
     public native static String getInfo();
     public native static String cmdline(String cmd);
+
+    public final static int MR_IMEX_EXPORT_SELF_KEYS = 0x01;
+    public final static int MR_IMEX_EXPORT_BACKUP = 0x02;
+    public final static int MR_IMEX_IMPORT_SELF_KEYS = 0x00010000;
+    public native static void imex(int what, String dir);
+
     public native static void heartbeat();
 
     private static long           m_hMailbox = 0; // do not rename this, is used in C-part
@@ -91,6 +97,8 @@ public class MrMailbox {
         return MrMailboxBlockContact(m_hMailbox, id, block);
     }
 
+    public native static String getContactEncrInfo(int contact_id);
+
     public static int deleteContact(int id) {
         return MrMailboxDeleteContact(m_hMailbox, id);
     }
@@ -115,8 +123,8 @@ public class MrMailbox {
         return new MrChat(MrMailboxGetChat(m_hMailbox, chat_id));
     }
 
-    public native static int    markseenMsg        (int msg_id);
-    public native static int    markseenChat       (int chat_id);
+    public native static int    markseenMsgs       (int msg_ids[]);
+    public native static int    marknoticedChat    (int chat_id);
 
     public native static int getChatIdByContactId (int contact_id);
     public native static int createChatByContactId(int contact_id); // returns chat_id
@@ -132,7 +140,7 @@ public class MrMailbox {
 
     public native static int[] searchMsgs(int chat_id, String query);
 
-    public native static int[] getUnseenMsgs();
+    public native static int[] getFreshMsgs();
 
     public native static int[] getChatMedia(int chat_id, int msg_type, int or_msg_type);
     public native static int getNextMedia(int msg_id, int dir);
@@ -182,6 +190,10 @@ public class MrMailbox {
     public final static int MR_EVENT_CONFIGURE_ENDED          = 2040;
     public final static int MR_EVENT_CONFIGURE_PROGRESS       = 2041;
 
+    public final static int MR_EVENT_EXPORT_ENDED             = 2050;
+    public final static int MR_EVENT_EXPORT_PROGRESS          = 2051;
+    public final static int MR_EVENT_EXPORT_FILE_WRITTEN      = 2052;
+
     public final static int MR_EVENT_IS_ONLINE                = 2080;
     public final static int MR_EVENT_GET_STRING               = 2091;
     public final static int MR_EVENT_GET_QUANTITIY_STRING     = 2092;
@@ -215,6 +227,38 @@ public class MrMailbox {
                 });
                 return 0;
 
+            case MR_EVENT_EXPORT_ENDED:
+                AndroidUtilities.runOnUIThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        NotificationCenter.getInstance().postNotificationName(NotificationCenter.exportEnded, (int)data1);
+                    }
+                });
+                return 0;
+
+            case MR_EVENT_EXPORT_PROGRESS:
+                AndroidUtilities.runOnUIThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        NotificationCenter.getInstance().postNotificationName(NotificationCenter.exportProgress, (int)data1);
+                    }
+                });
+                return 0;
+
+            case MR_EVENT_EXPORT_FILE_WRITTEN: {
+                final String file_name = CPtr2String(data1);
+                final String file_mime = CPtr2String(data2);
+                AndroidUtilities.runOnUIThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        File file = new File(file_name);
+                        DownloadManager downloadManager = (DownloadManager) ApplicationLoader.applicationContext.getSystemService(Context.DOWNLOAD_SERVICE);
+                        downloadManager.addCompletedDownload(file.getName(), file.getName(), true, file_mime, file.getAbsolutePath(), file.length(), true);
+                    }
+                });
+                }
+                return 0;
+
             case MR_EVENT_MSGS_CHANGED:
             case MR_EVENT_INCOMING_MSG:
                 AndroidUtilities.runOnUIThread(new Runnable() {
@@ -327,6 +371,15 @@ public class MrMailbox {
                     case 21: s = ApplicationLoader.applicationContext.getString(R.string.ErrSelfNotInGroup); break;
                     case 22: s = ApplicationLoader.applicationContext.getString(R.string.NoNetwork); break;
                     case 23: s = ApplicationLoader.applicationContext.getString(R.string.AttachGif); break;
+                    case 24: s = ApplicationLoader.applicationContext.getString(R.string.EncryptedMessage); break;
+                    case 25: s = ApplicationLoader.applicationContext.getString(R.string.EncrinfoE2E); break;
+                    case 26: s = "<c#808080>"+ApplicationLoader.applicationContext.getString(R.string.EncrinfoE2EExplain)+"</c>"; break;
+                    case 27: s = ApplicationLoader.applicationContext.getString(R.string.EncrinfoTransport); break;
+                    case 28: s = ApplicationLoader.applicationContext.getString(R.string.EncrinfoNone); break;
+                    case 29: s = "<c#808080>"+ApplicationLoader.applicationContext.getString(R.string.EncrinfoNoE2EExplain)+"</c>"; break;
+                    case 30: s = ApplicationLoader.applicationContext.getString(R.string.EncrinfoFingerprints); break;
+                    case 31: s = ApplicationLoader.applicationContext.getString(R.string.ReadReceipt); break;
+                    case 32: s = ApplicationLoader.applicationContext.getString(R.string.ReadReceiptMailBody); break;
                 }
                 return String2CPtr(s);
 

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
  *
@@ -48,13 +48,12 @@ public class MrMsg {
     public final static int      MR_MSG_FILE                = 60;
 
     public final static int      MR_STATE_UNDEFINED         =  0;
-    public final static int      MR_IN_UNREAD               = 10;
-    public final static int      MR_IN_READ                 = 16;
+    public final static int      MR_IN_FRESH                = 10;
+    public final static int      MR_IN_NOTICED              = 13;
     public final static int      MR_OUT_PENDING             = 20;
-    public final static int      MR_OUT_SENDING             = 22;
     public final static int      MR_OUT_ERROR               = 24;
     public final static int      MR_OUT_DELIVERED           = 26;
-    public final static int      MR_OUT_READ                = 28;
+    public final static int      MR_OUT_MDN_RCVD            = 28;
 
     public final static int      MR_MSG_ID_MARKER1    = 1;
     public final static int      MR_MSG_ID_DAYMARKER  = 9;
@@ -138,7 +137,7 @@ public class MrMsg {
             case MR_OUT_DELIVERED: ret.send_state = MessageObject.MESSAGE_SEND_STATE_SENT; break;
             case MR_OUT_ERROR:     ret.send_state = MessageObject.MESSAGE_SEND_STATE_SEND_ERROR; break;
             case MR_OUT_PENDING:   ret.send_state = MessageObject.MESSAGE_SEND_STATE_SENDING; break;
-            case MR_OUT_READ:      ret.send_state = MessageObject.MESSAGE_SEND_STATE_SENT; break;
+            case MR_OUT_MDN_RCVD:  ret.send_state = MessageObject.MESSAGE_SEND_STATE_SENT; break;
         }
 
         ret.id            = getId();
@@ -147,11 +146,12 @@ public class MrMsg {
         ret.to_id.user_id = getToId();
         ret.date          = (int)getTimestamp();
         ret.dialog_id     = getChatId();
-        ret.unread        = state!=MR_OUT_READ; // the state of outgoing messages
+        ret.unread        = state!=MR_OUT_MDN_RCVD; // the state of outgoing messages
         ret.media_unread  = ret.unread;
         ret.flags         = 0; // posible flags: MESSAGE_FLAG_HAS_FROM_ID, however, this seems to be read only
         ret.out           = ret.from_id==MrContact.MR_CONTACT_ID_SELF; // true=outgoing message, read eg. in MessageObject.isOutOwner()
         ret.created_by_mr = true;
+        ret.e2ee          = getParamInt('c', 0)!=0;
 
         if( type == MR_MSG_TEXT ) {
             ret.message       = getText();

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
  *

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -33,6 +33,8 @@ public class NotificationCenter {
 
     public static final int configureEnded = totalEvents++;
     public static final int configureProgress = totalEvents++;
+    public static final int exportEnded = totalEvents++;
+    public static final int exportProgress = totalEvents++;
     public static final int didReceivedNewMessages = totalEvents++;
     public static final int updateInterfaces = totalEvents++;
     public static final int dialogsNeedReload = totalEvents++;

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -502,7 +502,7 @@ public class NotificationsController {
         }
 
         // get all unread messages as a hash
-        int unseenArr[] = MrMailbox.getUnseenMsgs();
+        int unseenArr[] = MrMailbox.getFreshMsgs();
         int unseenCnt = unseenArr.length;
         HashMap<Integer, Boolean> unseenHash = new HashMap<>();
         for( int i = 0; i < unseenCnt; i++ ) {
@@ -752,6 +752,7 @@ public class NotificationsController {
                     cv.put("count", count);
                     ApplicationLoader.applicationContext.getContentResolver().insert(Uri.parse("content://com.teslacoilsw.notifier/unread_count"), cv);
                 } catch (Throwable e) {
+                    e.printStackTrace();
                 }
 
                 try {
@@ -771,12 +772,12 @@ public class NotificationsController {
                                 intent.putExtra("badge_count_class_name", launcherClassName);
                                 ApplicationLoader.applicationContext.sendBroadcast(intent);
                             } catch (Exception e) {
-
+                                e.printStackTrace();
                             }
                         }
                     });
                 } catch (Throwable e) {
-
+                    e.printStackTrace();
                 }
             }
         });

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -291,6 +291,7 @@ public class TLRPC {
         public long dialog_id; //custom
         public final int layer = 0; //custom
 		public boolean created_by_mr;
+		public boolean e2ee;
     }
 
 	public static class TL_message extends Message {

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
  *

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -49,7 +49,7 @@ public class WearReplyReceiver extends BroadcastReceiver {
             return;
         }
         SendMessagesHelper.getInstance().sendMessageText(text.toString(), dialog_id, null);
-        MrMailbox.markseenChat((int)dialog_id);
+        MrMailbox.marknoticedChat((int)dialog_id);
         NotificationsController.getInstance().removeSeenMessages();
     }
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/src/main/java/com/b44t/messenger/video/MP4Builder.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/src/main/java/com/b44t/messenger/video/Mp4Movie.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/src/main/java/com/b44t/messenger/video/Sample.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/src/main/java/com/b44t/messenger/video/Track.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -56,6 +56,10 @@ public class ActionBar extends FrameLayout {
         }
     }
 
+    public static final int TITLE_WITHOUT_BACK_X  = 16; /*original value: 18*/
+    public static final int TITLE_AFTER_BACK_X    = 58; /*original value: 72*/
+    public static final int AVATAR_AFTER_BACK_X   = 48; /*original value: 56, you have also to adapt the animation, if you change this value (see ProfileActivity.ANIM_OFF) */
+
     private ImageView backButtonImageView;
     private SimpleTextView titleTextView;
     private SimpleTextView subtitleTextView;
@@ -374,9 +378,11 @@ public class ActionBar extends FrameLayout {
         if (subtitleTextView != null) {
             subtitleTextView.setVisibility(visible ? INVISIBLE : VISIBLE);
         }
-        Drawable drawable = backButtonImageView.getDrawable();
-        if (drawable != null && drawable instanceof MenuDrawable) {
-            ((MenuDrawable) drawable).setRotation(visible ? 1 : 0, true);
+        if( backButtonImageView != null ) {
+            Drawable drawable = backButtonImageView.getDrawable();
+            if (drawable != null && drawable instanceof MenuDrawable) {
+                ((MenuDrawable) drawable).setRotation(visible ? 1 : 0, true);
+            }
         }
     }
 
@@ -410,15 +416,15 @@ public class ActionBar extends FrameLayout {
         int textLeft;
         if (backButtonImageView != null && backButtonImageView.getVisibility() != GONE) {
             backButtonImageView.measure(MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(54), MeasureSpec.EXACTLY), actionBarHeightSpec);
-            textLeft = AndroidUtilities.dp(AndroidUtilities.isTablet() ? 80 : 72);
+            textLeft = AndroidUtilities.dp(TITLE_AFTER_BACK_X);
         } else {
-            textLeft = AndroidUtilities.dp(AndroidUtilities.isTablet() ? 26 : 18);
+            textLeft = AndroidUtilities.dp(TITLE_WITHOUT_BACK_X);
         }
 
         if (menu != null && menu.getVisibility() != GONE) {
             int menuWidth;
             if (isSearchFieldVisible) {
-                menuWidth = MeasureSpec.makeMeasureSpec(width - AndroidUtilities.dp(AndroidUtilities.isTablet() ? 74 : 66), MeasureSpec.EXACTLY);
+                menuWidth = MeasureSpec.makeMeasureSpec(width - AndroidUtilities.dp(TITLE_AFTER_BACK_X), MeasureSpec.EXACTLY);
             } else {
                 menuWidth = MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST);
             }
@@ -456,13 +462,13 @@ public class ActionBar extends FrameLayout {
         int textLeft;
         if (backButtonImageView != null && backButtonImageView.getVisibility() != GONE) {
             backButtonImageView.layout(0, additionalTop, backButtonImageView.getMeasuredWidth(), additionalTop + backButtonImageView.getMeasuredHeight());
-            textLeft = AndroidUtilities.dp(AndroidUtilities.isTablet() ? 80 : 72);
+            textLeft = AndroidUtilities.dp(TITLE_AFTER_BACK_X);
         } else {
-            textLeft = AndroidUtilities.dp(AndroidUtilities.isTablet() ? 26 : 18);
+            textLeft = AndroidUtilities.dp(TITLE_WITHOUT_BACK_X);
         }
 
         if (menu != null && menu.getVisibility() != GONE) {
-            int menuLeft = isSearchFieldVisible ? AndroidUtilities.dp(AndroidUtilities.isTablet() ? 74 : 66) : (right - left) - menu.getMeasuredWidth();
+            int menuLeft = isSearchFieldVisible ? AndroidUtilities.dp(TITLE_AFTER_BACK_X) : (right - left) - menu.getMeasuredWidth();
             menu.layout(menuLeft, additionalTop, menuLeft + menu.getMeasuredWidth(), additionalTop + menu.getMeasuredHeight());
         }
 

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -103,7 +103,7 @@ public class ActionBarMenu extends LinearLayout {
                     case R.drawable.photo_crop:        hint = ApplicationLoader.applicationContext.getString(R.string.CropImage); break;
                     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.lock_close:        hint = ApplicationLoader.applicationContext.getString(R.string.Passcode); break;
+                    case R.drawable.ic_ab_lock_screen: hint = ApplicationLoader.applicationContext.getString(R.string.Passcode); break;
                 }
                 if( hint != null ) {
                     if( s_menuItemHint != null ) {

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/src/main/java/com/b44t/ui/ActionBar/DrawerLayoutContainer.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -44,11 +44,14 @@ import android.widget.FrameLayout;
 import android.widget.ListView;
 
 import com.b44t.messenger.AndroidUtilities;
+import com.b44t.messenger.MrMailbox;
 import com.b44t.messenger.R;
 import com.b44t.messenger.AnimatorListenerAdapterProxy;
 
 public class DrawerLayoutContainer extends FrameLayout {
 
+    public static boolean USE_DRAWER;
+
     private static final int MIN_DRAWER_MARGIN = 64;
 
     private ViewGroup drawerLayout;
@@ -79,6 +82,8 @@ public class DrawerLayoutContainer extends FrameLayout {
     public DrawerLayoutContainer(Context context) {
         super(context);
 
+        USE_DRAWER = MrMailbox.getConfigInt("drawer", 0)!=0;
+
         minDrawerMargin = (int) (MIN_DRAWER_MARGIN * AndroidUtilities.density + 0.5f);
         setDescendantFocusability(ViewGroup.FOCUS_AFTER_DESCENDANTS);
         setFocusableInTouchMode(true);
@@ -249,6 +254,11 @@ public class DrawerLayoutContainer extends FrameLayout {
     }
 
     public void setAllowOpenDrawer(boolean value, boolean animated) {
+        if( !USE_DRAWER ) {
+            allowOpenDrawer = false;
+            return;
+        }
+
         allowOpenDrawer = value;
         if (!allowOpenDrawer && drawerPosition != 0) {
             if (!animated) {

MessengerProj/src/main/java/com/b44t/ui/ActionBar/MenuDrawable.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -110,6 +110,9 @@ public class Theme {
     public static Drawable systemDrawable;
     public static Drawable timeBackgroundDrawable;
     public static Drawable timeStickerBackgroundDrawable;
+    public static Drawable encrOutDrawable;
+    public static Drawable encrInDrawable;
+    public static Drawable encrMediaDrawable;
 
     public static Drawable[] cornerOuter = new Drawable[4];
     public static Drawable[] cornerInner = new Drawable[4];
@@ -147,6 +150,10 @@ public class Theme {
             timeStickerBackgroundDrawable = context.getResources().getDrawable(R.drawable.phototime2);
             systemDrawable = context.getResources().getDrawable(R.drawable.system);
 
+            encrInDrawable = context.getResources().getDrawable(R.drawable.msg_encr_in);
+            encrOutDrawable = context.getResources().getDrawable(R.drawable.msg_encr_out);
+            encrMediaDrawable = context.getResources().getDrawable(R.drawable.msg_encr_media);
+
             inlistDrawable[INLIST_FILE]        = context.getResources().getDrawable(R.drawable.attach_file_inlist);
             inlistDrawable[INLIST_PLAY]        = context.getResources().getDrawable(R.drawable.attach_audio_inlist_play);
             inlistDrawable[INLIST_TRANSP_PLAY] = context.getResources().getDrawable(R.drawable.video_play);

MessengerProj/src/main/java/com/b44t/ui/Adapters/BaseFragmentAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/src/main/java/com/b44t/ui/Adapters/ContactsAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/src/main/java/com/b44t/ui/Adapters/DialogsAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/src/main/java/com/b44t/ui/Adapters/DialogsSearchAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -169,7 +169,7 @@ public class DialogsSearchAdapter extends RecyclerView.Adapter {
                         MrPoortext mrSummary = mrMsg.getSummary(mrChat);
 
                         cell.setDialog(mrChat, mrSummary, -1,
-                                mrMsg.getState()==MrMsg.MR_IN_UNREAD /*show unread count only if the message itself is unread*/ );
+                                mrMsg.getState()==MrMsg.MR_IN_FRESH /*show unread count only if the message itself is unread*/ );
                     }
                 }
                 break;

MessengerProj/src/main/java/com/b44t/ui/Adapters/DrawerLayoutAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/src/main/java/com/b44t/ui/Adapters/StickersAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -231,8 +231,8 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
     private float forwardNameOffsetX[] = new float[2];
 
     private StaticLayout timeLayout;
-    private int timeWidth;
-    private int timeTextWidth;
+    private int timeWidth; // includes timeEncrWidth
+    private int timeEncrWidth;
     private int timeX;
     private String currentTimeString;
     private boolean drawTime = true;
@@ -1655,10 +1655,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
         if (changed || !wasLayout) {
             layoutWidth = getMeasuredWidth();
             layoutHeight = getMeasuredHeight() - substractBackgroundHeight;
-            if (timeTextWidth < 0) {
-                timeTextWidth = dp(10);
-            }
-            timeLayout = new StaticLayout(currentTimeString, timePaint, timeTextWidth + dp(6), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
+            timeLayout = new StaticLayout(currentTimeString, timePaint, timeWidth + dp(6), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
             if (!mediaBackground) {
                 if (!currentMessageObject.isOutOwner()) {
                     timeX = backgroundWidth - dp(9) - timeWidth + (isGroupChat && currentMessageObject.isFromUser() ? dp(48) : 0);
@@ -2089,7 +2086,12 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
 
     private void measureTime(MessageObject messageObject) {
         currentTimeString = LocaleController.getInstance().formatterDay.format((long) (messageObject.messageOwner.date) * 1000);
-        timeTextWidth = timeWidth = (int) Math.ceil(timePaint.measureText(currentTimeString));
+        timeWidth = (int) Math.ceil(timePaint.measureText(currentTimeString));
+        timeEncrWidth = 0;
+        if( messageObject.messageOwner.e2ee ) {
+            timeEncrWidth = Theme.encrOutDrawable.getIntrinsicWidth();
+            timeWidth += timeEncrWidth;
+        }
     }
 
     private boolean isDrawSelectedBackground() {
@@ -2333,19 +2335,36 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
                 int additionalX = 0;
 
                 canvas.save();
-                canvas.translate(timeX + additionalX, layoutHeight - dp(11.3f) - timeLayout.getHeight());
+                canvas.translate(timeX + additionalX + timeEncrWidth, layoutHeight - dp(11.3f) - timeLayout.getHeight());
                 timeLayout.draw(canvas);
                 canvas.restore();
             } else {
                 int additionalX = 0;
 
                 canvas.save();
-                canvas.translate(timeX + additionalX, layoutHeight - dp(6.5f) - timeLayout.getHeight());
+                canvas.translate(timeX + additionalX + timeEncrWidth, layoutHeight - dp(6.5f) - timeLayout.getHeight());
                 timeLayout.draw(canvas);
                 canvas.restore();
                 //canvas.drawRect(timeX, layoutHeight - AndroidUtilities.dp(6.5f) - timeLayout.getHeight(), timeX + availableTimeWidth, layoutHeight - AndroidUtilities.dp(4.5f) - timeLayout.getHeight(), timePaint);
             }
 
+            // draw encryption icon left of clock
+            if( timeEncrWidth>0 ) {
+                if (!mediaBackground) {
+                    if (currentMessageObject.isOutOwner()) {
+                        setDrawableBounds(Theme.encrOutDrawable, timeX, layoutHeight - dp(8.5f) - Theme.encrOutDrawable.getIntrinsicHeight());
+                        Theme.encrOutDrawable.draw(canvas);
+                    } else {
+                        setDrawableBounds(Theme.encrInDrawable, timeX, layoutHeight - dp(8.5f) - Theme.encrInDrawable.getIntrinsicHeight());
+                        Theme.encrInDrawable.draw(canvas);
+                    }
+                } else {
+                    setDrawableBounds(Theme.encrMediaDrawable, timeX, layoutHeight - dp(13.2f) - Theme.encrMediaDrawable.getIntrinsicHeight());
+                    Theme.encrMediaDrawable.draw(canvas);
+                }
+            }
+
+            // draw checkmarks right of clock
             if (currentMessageObject.isOutOwner()) {
                 boolean drawCheck1 = false;
                 boolean drawCheck2 = false;

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/src/main/java/com/b44t/ui/Cells/ContextLinkCell.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -70,7 +70,6 @@ public class DialogCell extends BaseCell {
     private static Drawable countDrawableGrey;
     private static Drawable groupDrawable;
     private static Drawable muteDrawable;
-    private static Drawable verifiedDrawable;
 
     private static Paint linePaint;
     private static Paint backPaint;
@@ -114,7 +113,7 @@ public class DialogCell extends BaseCell {
     private StaticLayout messageLayout;
 
     private boolean drawError;
-    private int errorTop = AndroidUtilities.dp(39);
+    private int errorTop = AndroidUtilities.dp(42);
     private int errorLeft;
 
     private boolean drawCount;
@@ -123,8 +122,6 @@ public class DialogCell extends BaseCell {
     private int countWidth;
     private StaticLayout countLayout;
 
-    private boolean drawVerified;
-
     private int avatarTop = AndroidUtilities.dp(10);
 
     private boolean isSelected;
@@ -168,12 +165,11 @@ public class DialogCell extends BaseCell {
             checkDrawable = getResources().getDrawable(R.drawable.dialogs_check);
             halfCheckDrawable = getResources().getDrawable(R.drawable.dialogs_halfcheck);
             clockDrawable = getResources().getDrawable(R.drawable.msg_clock);
-            errorDrawable = getResources().getDrawable(R.drawable.dialogs_warning);
+            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.check_list);
         }
 
         setBackgroundResource(R.drawable.list_selector);
@@ -253,10 +249,6 @@ public class DialogCell extends BaseCell {
         boolean checkMessage = true;
 
         drawNameGroup = false;
-        //drawNameBroadcast = false;
-        //drawNameLock = false;
-        //drawNameBot = false;
-        drawVerified = false;
 
         {
             if (m_mrChat.getType()==MrChat.MR_CHAT_GROUP) { // EDIT BY MR
@@ -267,7 +259,6 @@ public class DialogCell extends BaseCell {
                     drawNameGroup = true;
                     nameLockTop = AndroidUtilities.dp(17.5f);
                 //}
-                //drawVerified = chat.verified; -- /EDIT BY MR
 
                 if (!LocaleController.isRTL) {
                     nameLockLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline);
@@ -326,9 +317,8 @@ public class DialogCell extends BaseCell {
                     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_READ: drawCheck1 = true; drawCheck2 = true; break;
+                    case MrMsg.MR_OUT_MDN_RCVD: drawCheck1 = true; drawCheck2 = true; break;
                 }
-                drawVerified = m_mrChat.isEncrypted()!=0; // we use the "verified" check as an icon for "encryted" and "verified"
         }
 
         if (unreadCount != 0) {
@@ -393,18 +383,12 @@ public class DialogCell extends BaseCell {
             }
         }
 
-        if (dialogMuted && !drawVerified) {
+        if (dialogMuted) {
             int w = AndroidUtilities.dp(6) + muteDrawable.getIntrinsicWidth();
             nameWidth -= w;
             if (LocaleController.isRTL) {
                 nameLeft += w;
             }
-        } else if (drawVerified) {
-            int w = AndroidUtilities.dp(6) + verifiedDrawable.getIntrinsicWidth();
-            nameWidth -= w;
-            if (LocaleController.isRTL) {
-                nameLeft += w;
-            }
         }
 
         nameWidth = Math.max(AndroidUtilities.dp(12), nameWidth);
@@ -429,9 +413,9 @@ public class DialogCell extends BaseCell {
             int w = errorDrawable.getIntrinsicWidth() + AndroidUtilities.dp(8);
             messageWidth -= w;
             if (!LocaleController.isRTL) {
-                errorLeft = getMeasuredWidth() - errorDrawable.getIntrinsicWidth() - AndroidUtilities.dp(11);
+                errorLeft = getMeasuredWidth() - errorDrawable.getIntrinsicWidth() - AndroidUtilities.dp(16);
             } else {
-                errorLeft = AndroidUtilities.dp(11);
+                errorLeft = AndroidUtilities.dp(16);
                 messageLeft += w;
             }
         } else if (countString != null) {
@@ -475,10 +459,8 @@ public class DialogCell extends BaseCell {
             if (nameLayout != null && nameLayout.getLineCount() > 0) {
                 left = nameLayout.getLineLeft(0);
                 widthpx = Math.ceil(nameLayout.getLineWidth(0));
-                if (dialogMuted && !drawVerified) {
+                if (dialogMuted) {
                     nameMuteLeft = (int) (nameLeft + (nameWidth - widthpx) - AndroidUtilities.dp(6) - muteDrawable.getIntrinsicWidth());
-                } else if (drawVerified) {
-                    nameMuteLeft = (int) (nameLeft + (nameWidth - widthpx) - AndroidUtilities.dp(6) - verifiedDrawable.getIntrinsicWidth());
                 }
                 if (left == 0) {
                     if (widthpx < nameWidth) {
@@ -504,7 +486,7 @@ public class DialogCell extends BaseCell {
                         nameLeft -= (nameWidth - widthpx);
                     }
                 }
-                if (dialogMuted || drawVerified) {
+                if (dialogMuted) {
                     nameMuteLeft = (int) (nameLeft + left + AndroidUtilities.dp(6));
                 }
             }
@@ -544,7 +526,7 @@ public class DialogCell extends BaseCell {
 
     public void update(int mask) {
         if( m_showUnreadCount ) {
-            unreadCount = m_mrChat.getUnseenCount();
+            unreadCount = m_mrChat.getFreshMsgCount();
         }
 
         if (mask != 0) {
@@ -669,12 +651,9 @@ public class DialogCell extends BaseCell {
             }
         }
 
-        if (dialogMuted && !drawVerified) { // TODO: if we enable encrypted chats and show the verified logo, we may show both, muted and verivied
+        if (dialogMuted) {
             setDrawableBounds(muteDrawable, nameMuteLeft, AndroidUtilities.dp(16.5f));
             muteDrawable.draw(canvas);
-        } else if (drawVerified) {
-            setDrawableBounds(verifiedDrawable, nameMuteLeft, AndroidUtilities.dp(16.5f));
-            verifiedDrawable.draw(canvas);
         }
 
         if (drawError) {

MessengerProj/src/main/java/com/b44t/ui/Cells/DividerCell.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerActionCell.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerProfileCell.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
@@ -46,6 +46,7 @@ import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.MrMailbox;
 import com.b44t.messenger.ApplicationLoader;
 import com.b44t.messenger.R;
+import com.b44t.ui.ActionBar.DrawerLayoutContainer;
 import com.b44t.ui.Components.LayoutHelper;
 import com.b44t.ui.ActionBar.Theme;
 
@@ -64,11 +65,11 @@ public class DrawerProfileCell extends FrameLayout {
         ImageView shadowView = new ImageView(context);
         shadowView.setScaleType(ImageView.ScaleType.FIT_XY);
         shadowView.setImageResource(R.drawable.bottom_shadow);
-        addView(shadowView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 100/*EDIT BY MR, was 70*/, Gravity.START | Gravity.BOTTOM));
+        addView(shadowView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 85/*shadow height*/, Gravity.START | Gravity.BOTTOM));
 
         nameTextView = new TextView(context);
         nameTextView.setTextColor(0xffffffff);
-        nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 23);
+        nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, DrawerLayoutContainer.USE_DRAWER? 23 : 26);
         nameTextView.setLines(1);
         nameTextView.setMaxLines(1);
         nameTextView.setSingleLine(true);
@@ -78,7 +79,7 @@ public class DrawerProfileCell extends FrameLayout {
 
         subtitleTextView = new TextView(context);
         subtitleTextView.setTextColor(0xffc2e5ff);
-        subtitleTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 13);
+        subtitleTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, DrawerLayoutContainer.USE_DRAWER? 13 : Theme.ACTION_BAR_SUBTITLE_TEXT_SIZE);
         subtitleTextView.setLines(1);
         subtitleTextView.setMaxLines(1);
         subtitleTextView.setSingleLine(true);
@@ -89,7 +90,7 @@ public class DrawerProfileCell extends FrameLayout {
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        int mrHeight = 180;
+        int mrHeight = DrawerLayoutContainer.USE_DRAWER? 180 : 100/*see also shadow height above*/;
         if (Build.VERSION.SDK_INT >= 21) {
             super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(mrHeight) + AndroidUtilities.statusBarHeight, MeasureSpec.EXACTLY));
         } else {

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com
  *

MessengerProj/src/main/java/com/b44t/ui/Cells/EmptyCell.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  *
- *                          Messenger Android Frontend
+ *                              Delta Chat Android
  *                        (C) 2013-2016 Nikolai Kudashov
  *                           (C) 2017 Björn Petersen
  *                    Contact: r10s@b44t.com, http://b44t.com