Bug fixes

TMessagesProj/build.gradle

@@ -80,7 +80,7 @@ android {
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 21
-        versionCode 383
+        versionCode 384
         versionName "2.0.0"
     }
 }

TMessagesProj/jni/Android.mk

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE 	:= tmessages.2
+LOCAL_MODULE 	:= tmessages.3
 LOCAL_CFLAGS 	:= -w -std=gnu99 -O2 -DNULL=0 -DSOCKLEN_T=socklen_t -DLOCALE_NOT_USED -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
 LOCAL_CFLAGS 	+= -Drestrict='' -D__EMX__ -DOPUS_BUILD -DFIXED_POINT -DUSE_ALLOCA -DHAVE_LRINT -DHAVE_LRINTF -fno-math-errno
 LOCAL_CFLAGS 	+= -DANDROID_NDK -DDISABLE_IMPORTGL -fno-strict-aliasing -fprefetch-loop-arrays -DAVOID_TABLES -DANDROID_TILE_BASED_DECODE -DANDROID_ARMV6_IDCT -DHAVE_STRCHRNUL=0

TMessagesProj/jni/image.c

@@ -229,7 +229,7 @@ JNIEXPORT void Java_org_telegram_messenger_Utilities_blurBitmap(JNIEnv *env, jcl
     AndroidBitmap_unlockPixels(env, bitmap);
 }
 
-JNIEXPORT void Java_org_telegram_messenger_Utilities_loadBitmap(JNIEnv *env, jclass class, jstring path, jobject bitmap, int scale) {
+JNIEXPORT void Java_org_telegram_messenger_Utilities_loadBitmap(JNIEnv *env, jclass class, jstring path, jobject bitmap, int scale, int width, int height, int stride) {
     
     AndroidBitmapInfo info;
     int i;
@@ -260,13 +260,13 @@ JNIEXPORT void Java_org_telegram_messenger_Utilities_loadBitmap(JNIEnv *env, jcl
 
                 unsigned char *pixels;
                 if ((i = AndroidBitmap_lockPixels(env, bitmap, &pixels)) >= 0) {
-                    int rowCount = min(cinfo.output_height, info.height);
-                    int colCount = min(cinfo.output_width, info.width);
+                    int rowCount = min(cinfo.output_height, height);
+                    int colCount = min(cinfo.output_width, width);
                     
                     while (cinfo.output_scanline < rowCount) {
                         jpeg_read_scanlines(&cinfo, buffer, 1);
                         
-                        if (info.format == ANDROID_BITMAP_FORMAT_RGBA_8888) {
+                        //if (info.format == ANDROID_BITMAP_FORMAT_RGBA_8888) {
                             if (cinfo.out_color_space == JCS_GRAYSCALE) {
                                 for (i = 0; i < colCount; i++) {
                                     float alpha = buffer[0][i] / 255.0f;
@@ -285,11 +285,11 @@ JNIEXPORT void Java_org_telegram_messenger_Utilities_loadBitmap(JNIEnv *env, jcl
                                     c += 4;
                                 }
                             }
-                        } else if (info.format == ANDROID_BITMAP_FORMAT_RGB_565) {
+                        //} else if (info.format == ANDROID_BITMAP_FORMAT_RGB_565) {
                             
-                        }
+                        //}
                         
-                        pixels += info.stride;
+                        pixels += stride;
                     }
                     
                     AndroidBitmap_unlockPixels(env, bitmap);

TMessagesProj/src/main/java/org/telegram/android/ContactsController.java

@@ -1604,6 +1604,15 @@ public class ContactsController {
                                 for (Object object : vector.objects) {
                                     TLRPC.User toDbUser = new TLRPC.User();
                                     TLRPC.TL_contactStatus status = (TLRPC.TL_contactStatus) object;
+
+                                    if (status.status instanceof TLRPC.TL_userStatusRecently) {
+                                        status.status.expires = -100;
+                                    } else if (status.status instanceof TLRPC.TL_userStatusLastWeek) {
+                                        status.status.expires = -101;
+                                    } else if (status.status instanceof TLRPC.TL_userStatusLastMonth) {
+                                        status.status.expires = -102;
+                                    }
+
                                     TLRPC.User user = MessagesController.getInstance().getUser(status.user_id);
                                     if (user != null) {
                                         user.status = status.status;

TMessagesProj/src/main/java/org/telegram/android/Emoji.java

@@ -246,8 +246,12 @@ public class Emoji {
             opts.inJustDecodeBounds = true;
             BitmapFactory.decodeFile(imageFile.getAbsolutePath(), opts);
 
-            final Bitmap bitmap = Bitmap.createBitmap(opts.outWidth / imageResize, opts.outHeight / imageResize, Bitmap.Config.ARGB_8888);
-            Utilities.loadBitmap(imageFile.getAbsolutePath(), bitmap, imageResize);
+            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, "emoji%.01fx_a_%d.jpg", scale, page);
             imageFile = ApplicationLoader.applicationContext.getFileStreamPath(imageName);
@@ -257,7 +261,7 @@ public class Emoji {
                 is.close();
             }
 
-            Utilities.loadBitmap(imageFile.getAbsolutePath(), bitmap, imageResize);
+            Utilities.loadBitmap(imageFile.getAbsolutePath(), bitmap, imageResize, width, height, stride);
 
             AndroidUtilities.runOnUIThread(new Runnable() {
                 @Override

TMessagesProj/src/main/java/org/telegram/android/LocaleController.java

@@ -782,6 +782,15 @@ public class LocaleController {
     }
 
     public static String formatUserStatus(TLRPC.User user) {
+        if (user != null && user.status != null && user.status.expires == 0) {
+            if (user.status instanceof TLRPC.TL_userStatusRecently) {
+                user.status.expires = -100;
+            } else if (user.status instanceof TLRPC.TL_userStatusLastWeek) {
+                user.status.expires = -101;
+            } else if (user.status instanceof TLRPC.TL_userStatusLastMonth) {
+                user.status.expires = -102;
+            }
+        }
         if (user == null || user.status == null || user.status.expires == 0 || user instanceof TLRPC.TL_userDeleted || user instanceof TLRPC.TL_userEmpty) {
             return getString("ALongTimeAgo", R.string.ALongTimeAgo);
         } else {

TMessagesProj/src/main/java/org/telegram/android/MessagesController.java

@@ -1334,7 +1334,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
         }
     }
 
-    public void loadMessages(final long dialog_id, final int count, final int max_id, boolean fromCache, int midDate, final int classGuid, final int load_type) {
+    public void loadMessages(final long dialog_id, final int count, final int max_id, boolean fromCache, int midDate, final int classGuid, final int load_type, final int last_message_id, final int first_message_id, final boolean allowCache) {
         int lower_part = (int)dialog_id;
         if (fromCache || lower_part == 0) {
             MessagesStorage.getInstance().getMessages(dialog_id, count, max_id, midDate, classGuid, load_type);
@@ -1356,6 +1356,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter
             }
             if (load_type == 3) {
                 req.offset = -count / 2;
+            } else if (load_type == 1) {
+                req.offset = -count - 1;
             } else {
                 req.offset = 0;
             }
@@ -1366,7 +1368,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
                 public void run(TLObject response, TLRPC.TL_error error) {
                     if (error == null) {
                         final TLRPC.messages_Messages res = (TLRPC.messages_Messages) response;
-                        processLoadedMessages(res, dialog_id, count, max_id, false, classGuid, 0, 0, 0, 0, load_type);
+                        processLoadedMessages(res, dialog_id, count, max_id, false, classGuid, 0, last_message_id, first_message_id, 0, 0, load_type, allowCache);
                     }
                 }
             });
@@ -1374,20 +1376,21 @@ public class MessagesController implements NotificationCenter.NotificationCenter
         }
     }
 
-    public void processLoadedMessages(final TLRPC.messages_Messages messagesRes, final long dialog_id, final int count, final int max_id, final boolean isCache, final int classGuid, final int first_unread, final int last_message_id, final int unread_count, final int last_date, final int load_type) {
+    public void processLoadedMessages(final TLRPC.messages_Messages messagesRes, final long dialog_id, final int count, final int max_id, final boolean isCache, final int classGuid,
+                                      final int first_unread, final int last_message_id, final int first_message_id, final int unread_count, final int last_date, final int load_type, final boolean allowCache) {
         Utilities.stageQueue.postRunnable(new Runnable() {
             @Override
             public void run() {
                 int lower_id = (int)dialog_id;
                 int high_id = (int)(dialog_id >> 32);
-                if (!isCache) {
+                if (!isCache && allowCache) {
                     MessagesStorage.getInstance().putMessages(messagesRes, dialog_id);
                 }
                 if (high_id != 1 && lower_id != 0 && isCache && messagesRes.messages.size() == 0 && (load_type == 0 || load_type == 2 || load_type == 3)) {
                     AndroidUtilities.runOnUIThread(new Runnable() {
                         @Override
                         public void run() {
-                            loadMessages(dialog_id, count, max_id, false, 0, classGuid, load_type);
+                            loadMessages(dialog_id, count, max_id, false, 0, classGuid, load_type, last_message_id, first_message_id, allowCache);
                         }
                     });
                     return;
@@ -1406,7 +1409,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
                     public void run() {
                         putUsers(messagesRes.users, isCache);
                         putChats(messagesRes.chats, isCache);
-                        NotificationCenter.getInstance().postNotificationName(NotificationCenter.messagesDidLoaded, dialog_id, count, objects, isCache, first_unread, last_message_id, unread_count, last_date, load_type);
+                        NotificationCenter.getInstance().postNotificationName(NotificationCenter.messagesDidLoaded, dialog_id, count, objects, isCache, first_unread, last_message_id, first_message_id, unread_count, last_date, load_type);
                     }
                 });
             }

TMessagesProj/src/main/java/org/telegram/android/NativeLoader.java

@@ -23,7 +23,7 @@ import java.util.zip.ZipFile;
 
 public class NativeLoader {
 
-    private final static int LIB_VERSION = 2;
+    private final static int LIB_VERSION = 3;
     private final static String LIB_NAME = "tmessages." + LIB_VERSION;
     private final static String LIB_SO_NAME = "lib" + LIB_NAME + ".so";
     private final static String LOCALE_LIB_SO_NAME = "lib" + LIB_NAME + "loc.so";

TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java

@@ -108,7 +108,7 @@ public class Utilities {
     }
 
     public native static long doPQNative(long _what);
-    public native static void loadBitmap(String path, Bitmap bitmap, int scale);
+    public native static void loadBitmap(String path, Bitmap bitmap, int scale, int width, int height, int stride);
     public native static void blurBitmap(Object bitmap, int radius);
     public native static int convertVideoFrame(ByteBuffer src, ByteBuffer dest, int destFormat, int width, int height, int padding, int swap);
     private native static void aesIgeEncryption(ByteBuffer buffer, byte[] key, byte[] iv, boolean encrypt, int offset, int length);

TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java

@@ -284,6 +284,7 @@ public class ActionBarLayout extends FrameLayout {
             bringChildToFront(containerView);
 
             lastFragment = fragmentsStack.get(fragmentsStack.size() - 1);
+            currentActionBar = lastFragment.actionBar;
             lastFragment.onResume();
         } else {
             BaseFragment lastFragment = fragmentsStack.get(fragmentsStack.size() - 2);
@@ -302,7 +303,7 @@ public class ActionBarLayout extends FrameLayout {
             }
         }
         containerViewBack.setVisibility(View.GONE);
-        AndroidUtilities.unlockOrientation(parentActivity);
+        //AndroidUtilities.unlockOrientation(parentActivity);
         startedTracking = false;
         animationInProgress = false;
 
@@ -345,7 +346,7 @@ public class ActionBarLayout extends FrameLayout {
         }
         lastFragment.onResume();
 
-        AndroidUtilities.lockOrientation(parentActivity);
+        //AndroidUtilities.lockOrientation(parentActivity);
     }
 
     public boolean onTouchEvent(MotionEvent ev) {

TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java

@@ -247,6 +247,10 @@ public class DrawerLayoutContainer extends FrameLayout {
 
     public void setAllowOpenDrawer(boolean value) {
         allowOpenDrawer = value;
+        if (!allowOpenDrawer && drawerPosition != 0) {
+            setDrawerPosition(0);
+            onDrawerAnimationEnd(false);
+        }
     }
 
     private void prepareForDrawerOpen(MotionEvent ev) {
@@ -287,7 +291,7 @@ public class DrawerLayoutContainer extends FrameLayout {
                     int dx = (int) (ev.getX() - startedTrackingX);
                     int dy = Math.abs((int) ev.getY() - startedTrackingY);
                     velocityTracker.addMovement(ev);
-                    if (maybeStartTracking && !startedTracking && Math.abs(dx) / 3 > Math.abs(dy)) {
+                    if (maybeStartTracking && !startedTracking && Math.abs(dx) / 3 > Math.abs(dy) && (dx < 0 || dx > 0 && dx > AndroidUtilities.dp(10))) {
                         prepareForDrawerOpen(ev);
                         startedTrackingX = (int) ev.getX();
                     } else if (startedTracking) {

TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java

@@ -9,16 +9,15 @@
 package org.telegram.ui.Adapters;
 
 import android.content.Context;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.telegram.android.AndroidUtilities;
 import org.telegram.android.MessageObject;
 import org.telegram.android.MessagesController;
-import org.telegram.messenger.R;
 import org.telegram.messenger.TLRPC;
 import org.telegram.ui.Cells.DialogCell;
+import org.telegram.ui.Cells.LoadingCell;
 
 public class DialogsAdapter extends BaseFragmentAdapter {
 
@@ -92,8 +91,7 @@ public class DialogsAdapter extends BaseFragmentAdapter {
         int type = getItemViewType(i);
         if (type == 1) {
             if (view == null) {
-                LayoutInflater li = (LayoutInflater)mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-                view = li.inflate(R.layout.loading_more_layout, viewGroup, false);
+                view = new LoadingCell(mContext);
             }
         } else if (type == 0) {
             if (view == null) {

TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java

@@ -32,6 +32,7 @@ import org.telegram.messenger.UserConfig;
 import org.telegram.messenger.Utilities;
 import org.telegram.ui.Cells.DialogCell;
 import org.telegram.ui.Cells.GreySectionCell;
+import org.telegram.ui.Cells.LoadingCell;
 import org.telegram.ui.Cells.ProfileSearchCell;
 
 import java.util.ArrayList;
@@ -49,6 +50,8 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
     private int lastReqId;
     private MessagesActivitySearchAdapterDelegate delegate;
     private boolean needMessagesSearch;
+    private boolean messagesSearchEndReached;
+    private String lastMessagesSearchString;
 
     public static interface MessagesActivitySearchAdapterDelegate {
         public abstract void searchStateChanged(boolean searching);
@@ -57,13 +60,20 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
     public DialogsSearchAdapter(Context context, boolean messagesSearch) {
         mContext = context;
         needMessagesSearch = messagesSearch;
-        needMessagesSearch = false;
     }
 
     public void setDelegate(MessagesActivitySearchAdapterDelegate delegate) {
         this.delegate = delegate;
     }
 
+    public boolean isMessagesSearchEndReached() {
+        return messagesSearchEndReached;
+    }
+
+    public void loadMoreSearchMessages() {
+        searchMessagesInternal(lastMessagesSearchString);
+    }
+
     private void searchMessagesInternal(final String query) {
         if (!needMessagesSearch) {
             return;
@@ -75,16 +85,21 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
         if (query == null || query.length() == 0) {
             searchResultMessages.clear();
             lastReqId = 0;
+            lastMessagesSearchString = null;
             notifyDataSetChanged();
             if (delegate != null) {
                 delegate.searchStateChanged(false);
             }
             return;
         }
-        TLRPC.TL_messages_search req = new TLRPC.TL_messages_search();
-        req.limit = 128;
+        final TLRPC.TL_messages_search req = new TLRPC.TL_messages_search();
+        req.limit = 20;
         req.peer = new TLRPC.TL_inputPeerEmpty();
         req.q = query;
+        if (lastMessagesSearchString != null && query.equals(lastMessagesSearchString) && !searchResultMessages.isEmpty()) {
+            req.max_id = searchResultMessages.get(searchResultMessages.size() - 1).messageOwner.id;
+        }
+        lastMessagesSearchString = query;
         req.filter = new TLRPC.TL_inputMessagesFilterEmpty();
         final int currentReqId = ++lastReqId;
         if (delegate != null) {
@@ -102,10 +117,13 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
                                 MessagesStorage.getInstance().putUsersAndChats(res.users, res.chats, true, true);
                                 MessagesController.getInstance().putUsers(res.users, false);
                                 MessagesController.getInstance().putChats(res.chats, false);
-                                searchResultMessages.clear();
+                                if (req.max_id == 0) {
+                                    searchResultMessages.clear();
+                                }
                                 for (TLRPC.Message message : res.messages) {
                                     searchResultMessages.add(new MessageObject(message, null, 0));
                                 }
+                                messagesSearchEndReached = res.messages.size() != 20;
                                 notifyDataSetChanged();
                             }
                         }
@@ -278,7 +296,7 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
     }
 
     public void searchDialogs(final String query, final boolean serverOnly) {
-        if (query == null && lastSearchText == null || query != null && lastSearchText != null && query.equals(lastSearchText)) {
+        if (query != null && lastSearchText != null && query.equals(lastSearchText)) {
             return;
         }
         try {
@@ -337,7 +355,7 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
             count += globalCount + 1;
         }
         if (messagesCount != 0) {
-            count += messagesCount + 1;
+            count += messagesCount + 1 + (messagesSearchEndReached ? 0 : 1);
         }
         return count;
     }
@@ -433,6 +451,10 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
             ((DialogCell) view).useSeparator = (i != getCount() - 1);
             MessageObject messageObject = (MessageObject)getItem(i);
             ((DialogCell) view).setDialog(messageObject.getDialogId(), messageObject, false, messageObject.messageOwner.date, 0);
+        } else if (type == 3) {
+            if (view == null) {
+                view = new LoadingCell(mContext);
+            }
         }
 
         return view;
@@ -447,13 +469,15 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
             return 0;
         } else if (i > globalCount + localCount && i < globalCount + localCount + messagesCount) {
             return 2;
+        } else if (messagesCount != 0 && i == globalCount + localCount + messagesCount) {
+            return 3;
         }
         return 1;
     }
 
     @Override
     public int getViewTypeCount() {
-        return 3;
+        return 4;
     }
 
     @Override

TMessagesProj/src/main/java/org/telegram/ui/Animation/View10.java

@@ -35,9 +35,12 @@ public class View10 extends Animation {
 
     public static View10 wrap(View view) {
         View10 proxy = PROXIES.get(view);
-        if (proxy == null || proxy != view.getAnimation()) {
+        Animation animation = view.getAnimation();
+        if (proxy == null || proxy != animation && animation != null) {
             proxy = new View10(view);
             PROXIES.put(view, proxy);
+        } else if (animation == null) {
+            view.setAnimation(proxy);
         }
         return proxy;
     }

TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java

@@ -161,9 +161,7 @@ public class BlockedUsersActivity extends BaseFragment implements NotificationCe
                     selectedUserId = MessagesController.getInstance().blockedUsers.get(i);
 
                     AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
-
                     CharSequence[] items = new CharSequence[] {LocaleController.getString("Unblock", R.string.Unblock)};
-
                     builder.setItems(items, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialogInterface, int i) {

TMessagesProj/src/main/java/org/telegram/ui/Cells/LoadingCell.java

+/*
+ * This is the source code of Telegram for Android v. 1.7.x.
+ * It is licensed under GNU GPL v. 2 or later.
+ * You should have received a copy of the license in this archive (see LICENSE).
+ *
+ * Copyright Nikolai Kudashov, 2013-2014.
+ */
+
+package org.telegram.ui.Cells;
+
+import android.content.Context;
+import android.view.Gravity;
+import android.widget.FrameLayout;
+import android.widget.ProgressBar;
+
+import org.telegram.android.AndroidUtilities;
+
+public class LoadingCell extends FrameLayout {
+
+    public LoadingCell(Context context) {
+        super(context);
+
+        ProgressBar progressBar = new ProgressBar(context);
+        addView(progressBar);
+        LayoutParams layoutParams = (FrameLayout.LayoutParams) progressBar.getLayoutParams();
+        layoutParams.width = LayoutParams.WRAP_CONTENT;
+        layoutParams.height = LayoutParams.WRAP_CONTENT;
+        layoutParams.gravity = Gravity.CENTER;
+        progressBar.setLayoutParams(layoutParams);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(54), MeasureSpec.EXACTLY));
+    }
+}

TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java

@@ -392,15 +392,19 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
                     }
 
                     if (selectedContacts.containsKey(user.id)) {
-                        XImageSpan 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;
+                        try {
+                            XImageSpan 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) {
+                            FileLog.e("tmessages", e);
+                        }
                     } else {
                         if (selectedContacts.size() == maxCount) {
                             return;

TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java

@@ -46,6 +46,7 @@ import org.telegram.ui.Views.AvatarDrawable;
 import org.telegram.ui.Views.AvatarUpdater;
 import org.telegram.ui.Views.BackupImageView;
 import org.telegram.ui.ActionBar.BaseFragment;
+import org.telegram.ui.Views.FrameLayoutFixed;
 
 import java.util.ArrayList;
 import java.util.concurrent.Semaphore;
@@ -200,11 +201,12 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
             LinearLayout linearLayout = (LinearLayout) fragmentView;
             linearLayout.setOrientation(LinearLayout.VERTICAL);
 
-            FrameLayout frameLayout = new FrameLayout(getParentActivity());
+            FrameLayout frameLayout = new FrameLayoutFixed(getParentActivity());
             linearLayout.addView(frameLayout);
             LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) frameLayout.getLayoutParams();
             layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT;
             layoutParams.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+            layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
             frameLayout.setLayoutParams(layoutParams);
 
             avatarImage = new BackupImageView(getParentActivity());
@@ -217,7 +219,9 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
             layoutParams1.height = AndroidUtilities.dp(64);
             layoutParams1.topMargin = AndroidUtilities.dp(12);
             layoutParams1.bottomMargin = AndroidUtilities.dp(12);
-            layoutParams1.leftMargin = AndroidUtilities.dp(16);
+            layoutParams1.leftMargin = LocaleController.isRTL ? 0 : AndroidUtilities.dp(16);
+            layoutParams1.rightMargin = LocaleController.isRTL ? AndroidUtilities.dp(16) : 0;
+            layoutParams1.gravity = Gravity.TOP | (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT);
             avatarImage.setLayoutParams(layoutParams1);
             if (!isBroadcast) {
                 avatarDrawable.setDrawPhoto(true);
@@ -263,7 +267,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
                 nameToSet = null;
             }
             nameTextView.setMaxLines(4);
-            nameTextView.setGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT);
+            nameTextView.setGravity(Gravity.CENTER_VERTICAL | (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT));
             nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
             nameTextView.setHintTextColor(0xff979797);
             nameTextView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
@@ -275,8 +279,8 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
             layoutParams1 = (FrameLayout.LayoutParams) nameTextView.getLayoutParams();
             layoutParams1.width = FrameLayout.LayoutParams.MATCH_PARENT;
             layoutParams1.height =  FrameLayout.LayoutParams.WRAP_CONTENT;
-            layoutParams1.leftMargin = AndroidUtilities.dp(96);
-            layoutParams1.rightMargin = AndroidUtilities.dp(16);
+            layoutParams1.leftMargin = LocaleController.isRTL ? AndroidUtilities.dp(16) : AndroidUtilities.dp(96);
+            layoutParams1.rightMargin = LocaleController.isRTL ? AndroidUtilities.dp(96) : AndroidUtilities.dp(16);
             layoutParams1.gravity = Gravity.CENTER_VERTICAL;
             nameTextView.setLayoutParams(layoutParams1);
             if (!isBroadcast) {

TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java

@@ -648,9 +648,15 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
                 actionBarLayout.showLastFragment();
                 rightActionBarLayout.showLastFragment();
             }
+            drawerLayoutContainer.setAllowOpenDrawer(false);
         }
         if (open_settings != 0) {
             actionBarLayout.presentFragment(new SettingsActivity(), false, true, true);
+            drawerLayoutContainer.setAllowOpenDrawer(false);
+            if (AndroidUtilities.isTablet()) {
+                layersActionBarLayout.showLastFragment();
+                rightActionBarLayout.showLastFragment();
+            }
             pushOpened = true;
         }
         if (!pushOpened && !isNew) {
@@ -1280,5 +1286,6 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
                 actionBarLayout.showLastFragment();
             }
         }
+        drawerLayoutAdapter.notifyDataSetChanged();
     }
 }

TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java

@@ -447,6 +447,9 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
                 @Override
                 public void onScroll(AbsListView absListView, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
                     if (searching && searchWas) {
+                        if (visibleItemCount > 0 && absListView.getLastVisiblePosition() == totalItemCount - 1 && !dialogsSearchAdapter.isMessagesSearchEndReached()) {
+                            dialogsSearchAdapter.loadMoreSearchMessages();
+                        }
                         return;
                     }
                     if (visibleItemCount > 0) {
@@ -507,6 +510,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
                 @Override
                 public void onGlobalLayout() {
                     ViewProxy.setTranslationY(floatingButton, floatingHidden ? AndroidUtilities.dp(100) : 0);
+                    floatingButton.setClickable(!floatingHidden);
                     if (floatingButton != null) {
                         if (Build.VERSION.SDK_INT < 16) {
                             floatingButton.getViewTreeObserver().removeGlobalOnLayoutListener(this);
@@ -578,6 +582,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
         floatingHidden = hide;
         ObjectAnimatorProxy animator = ObjectAnimatorProxy.ofFloatProxy(floatingButton, "translationY", floatingHidden ? AndroidUtilities.dp(100) : 0).setDuration(300);
         animator.setInterpolator(floatingInterpolator);
+        floatingButton.setClickable(!hide);
         animator.start();
     }
 

TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java

@@ -146,7 +146,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
     private long animationDuration;
     private long animationStartTime;
     private GestureDetector gestureDetector;
-    private DecelerateInterpolator interpolator = new DecelerateInterpolator();
+    private DecelerateInterpolator interpolator = new DecelerateInterpolator(1.5f);
     private float pinchStartDistance = 0;
     private float pinchStartScale = 1;
     private float pinchCenterX;
@@ -247,14 +247,6 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
             }
         }
 
-        public float getRadOffset() {
-            return radOffset;
-        }
-
-        public void setRadOffset(float value) {
-            radOffset = value;
-        }
-
         public void setProgress(float value, boolean animated) {
             if (!animated) {
                 animatedProgressValue = value;
@@ -1396,26 +1388,39 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
             setIndexToImage(centerImage, currentIndex);
             setIndexToImage(rightImage, currentIndex + 1);
             setIndexToImage(leftImage, currentIndex - 1);
+
+            for (int a = 0; a < 3; a++) {
+                checkProgress(a, false);
+            }
         } else {
+            checkProgress(0, false);
             if (prevIndex > currentIndex) {
                 ImageReceiver temp = rightImage;
                 rightImage = centerImage;
                 centerImage = leftImage;
                 leftImage = temp;
+
+                RadialProgressView tempProgress = radialProgressViews[0];
+                radialProgressViews[0] = radialProgressViews[2];
+                radialProgressViews[2] = tempProgress;
                 setIndexToImage(leftImage, currentIndex - 1);
-                radialProgressViews[0].setRadOffset(radialProgressViews[2].getRadOffset());
+
+                checkProgress(1, false);
+                checkProgress(2, false);
             } else if (prevIndex < currentIndex) {
                 ImageReceiver temp = leftImage;
                 leftImage = centerImage;
                 centerImage = rightImage;
                 rightImage = temp;
-                radialProgressViews[0].setRadOffset(radialProgressViews[1].getRadOffset());
+
+                RadialProgressView tempProgress = radialProgressViews[0];
+                radialProgressViews[0] = radialProgressViews[1];
+                radialProgressViews[1] = tempProgress;
                 setIndexToImage(rightImage, currentIndex + 1);
-            }
-        }
 
-        for (int a = 0; a < 3; a++) {
-            checkProgress(a, false);
+                checkProgress(1, false);
+                checkProgress(2, false);
+            }
         }
     }
 
@@ -1970,23 +1975,25 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
             if (animationStartTime == 0) {
                 AndroidUtilities.unlockOrientation(parentActivity);
             }
-            return false;
+            //return false;
         }
 
         if(ev.getPointerCount() == 1 && gestureDetector.onTouchEvent(ev) && doubleTap) {
             doubleTap = false;
             moving = false;
             zooming = false;
-            checkMinMax(false);
-            return true;
+            if (animationInProgress == 0 && animationStartTime == 0) {
+                checkMinMax(false);
+                return true;
+            }
         }
 
         if (ev.getActionMasked() == MotionEvent.ACTION_DOWN || ev.getActionMasked() == MotionEvent.ACTION_POINTER_DOWN) {
             if (!scroller.isFinished()) {
                 scroller.abortAnimation();
             }
-            if (!draggingDown && !changingPage) {
-                if (canZoom && ev.getPointerCount() == 2) {
+            if (!draggingDown) {
+                if (canZoom && ev.getPointerCount() == 2 && !changingPage) {
                     pinchStartDistance = (float) Math.hypot(ev.getX(1) - ev.getX(0), ev.getY(1) - ev.getY(0));
                     pinchStartScale = scale;
                     pinchCenterX = (ev.getX(0) + ev.getX(1)) / 2.0f;
@@ -2033,7 +2040,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
                 } else if (draggingDown) {
                     translationY = ev.getY() - dragY;
                     containerView.invalidate();
-                } else if (!invalidCoords && animationStartTime == 0) {
+                } else if (!invalidCoords/* && animationStartTime == 0*/) {
                     float moveDx = moveStartX - ev.getX();
                     float moveDy = moveStartY - ev.getY();
                     if (moving || scale == 1 && Math.abs(moveDy) + AndroidUtilities.dp(12) < Math.abs(moveDx) || scale != 1) {
@@ -2217,7 +2224,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
         float ai = -1;
         if (System.currentTimeMillis() - animationStartTime < animationDuration) {
             ai = interpolator.getInterpolation((float)(System.currentTimeMillis() - animationStartTime) / animationDuration);
-            if (ai >= 0.95f) {
+            if (ai >= 0.99f) {
                 ai = -1;
             }
         }
@@ -2478,7 +2485,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
         if (!canZoom || scale == 1.0f && (translationY != 0 || translationX != 0)) {
             return false;
         }
-        if (animationStartTime != 0) {
+        if (animationStartTime != 0 || animationInProgress != 0) {
             return false;
         }
         if (scale == 1.0f) {

TMessagesProj/src/main/java/org/telegram/ui/PopupNotificationActivity.java

@@ -178,6 +178,16 @@ public class PopupNotificationActivity extends Activity implements NotificationC
                     MessagesController.getInstance().sendTyping(currentMessageObject.getDialogId(), classGuid);
                 }
             }
+
+            @Override
+            public void onAttachButtonHidden() {
+
+            }
+
+            @Override
+            public void onAttachButtonShow() {
+
+            }
         });
 
         setContentView(R.layout.popup_notification_layout);

TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java

@@ -618,20 +618,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
 
                 @Override
                 public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-                    if (totalItemCount == 0) {
-                        return;
-                    }
-                    int height = 0;
-                    View child = view.getChildAt(0);
-                    if (child != null) {
-                        if (firstVisibleItem == 0) {
-                            height = AndroidUtilities.dp(88) + child.getTop();
-                        }
-                        if (actionBar.getExtraHeight() != height) {
-                            actionBar.setExtraHeight(height, true);
-                            needLayout();
-                        }
-                    }
+                    checkListViewScroll();
                 }
             });
 
@@ -671,6 +658,23 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
         }
     }
 
+    private void checkListViewScroll() {
+        if (listView.getChildCount() == 0) {
+            return;
+        }
+        int height = 0;
+        View child = listView.getChildAt(0);
+        if (child != null) {
+            if (listView.getFirstVisiblePosition() == 0) {
+                height = AndroidUtilities.dp(88) + (child.getTop() < 0 ? child.getTop() : 0);
+            }
+            if (actionBar.getExtraHeight() != height) {
+                actionBar.setExtraHeight(height, true);
+                needLayout();
+            }
+        }
+    }
+
     private void needLayout() {
         FrameLayout.LayoutParams layoutParams;
         if (listView != null) {
@@ -697,8 +701,10 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                 layoutParams.topMargin = (actionBar.getOccupyStatusBar() ? AndroidUtilities.statusBarHeight : 0) + AndroidUtilities.getCurrentActionBarHeight() + actionBar.getExtraHeight() - AndroidUtilities.dp(29.5f);
                 writeButton.setLayoutParams(layoutParams);
                 ViewProxy.setAlpha(writeButton, diff);
-                writeButton.setEnabled(diff > 0.02);
                 writeButton.setVisibility(diff <= 0.02 ? View.GONE : View.VISIBLE);
+                if (writeButton.getVisibility() == View.GONE) {
+                    writeButton.clearAnimation();
+                }
             }
 
             avatarImage.imageReceiver.setRoundRadius(AndroidUtilities.dp(avatarSize / 2));
@@ -815,6 +821,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                 updateRowsIds();
                 if (listAdapter != null) {
                     listAdapter.notifyDataSetChanged();
+                    checkListViewScroll();
                 }
             }
         } else if (id == NotificationCenter.blockedUsersDidLoaded) {
@@ -831,6 +838,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                 updateRowsIds();
                 if (listAdapter != null) {
                     listAdapter.notifyDataSetChanged();
+                    checkListViewScroll();
                 }
             }
         } else if (id == NotificationCenter.closeChats) {

TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java

@@ -373,7 +373,6 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
 
             listView = new ListView(getParentActivity());
             listView.setDivider(null);
-            listView.setDrawingCacheEnabled(false);
             listView.setDividerHeight(0);
             listView.setVerticalScrollBarEnabled(false);
             AndroidUtilities.setListViewEdgeEffectColor(listView, AvatarDrawable.getProfileBackColorForId(5));
@@ -659,7 +658,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
                     View child = view.getChildAt(0);
                     if (child != null) {
                         if (firstVisibleItem == 0) {
-                            height = AndroidUtilities.dp(88) + child.getTop();
+                            height = AndroidUtilities.dp(88) + (child.getTop() < 0 ? child.getTop() : 0);
                         }
                         if (actionBar.getExtraHeight() != height) {
                             actionBar.setExtraHeight(height, true);
@@ -885,8 +884,10 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
             layoutParams.topMargin = (actionBar.getOccupyStatusBar() ? AndroidUtilities.statusBarHeight : 0) + AndroidUtilities.getCurrentActionBarHeight() + actionBar.getExtraHeight() - AndroidUtilities.dp(29.5f);
             writeButton.setLayoutParams(layoutParams);
             ViewProxy.setAlpha(writeButton, diff);
-            writeButton.setEnabled(diff > 0.02);
             writeButton.setVisibility(diff <= 0.02 ? View.GONE : View.VISIBLE);
+            if (writeButton.getVisibility() == View.GONE) {
+                writeButton.clearAnimation();
+            }
 
             avatarImage.imageReceiver.setRoundRadius(AndroidUtilities.dp(avatarSize / 2));
             layoutParams = (FrameLayout.LayoutParams) avatarImage.getLayoutParams();
@@ -936,7 +937,9 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
             photo = user.photo.photo_small;
             photoBig = user.photo.photo_big;
         }
-        avatarImage.setImage(photo, "50_50", new AvatarDrawable(user, true));
+        AvatarDrawable avatarDrawable = new AvatarDrawable(user, true);
+        avatarDrawable.setColor(0xff5c98cd);
+        avatarImage.setImage(photo, "50_50", avatarDrawable);
         avatarImage.imageReceiver.setVisible(!PhotoViewer.getInstance().isShowingImage(photoBig), false);
 
         nameTextView.setText(ContactsController.formatName(user.first_name, user.last_name));

TMessagesProj/src/main/java/org/telegram/ui/Views/ChatActivityEnterView.java

@@ -54,6 +54,8 @@ public class ChatActivityEnterView implements NotificationCenter.NotificationCen
     public static interface ChatActivityEnterViewDelegate {
         public abstract void onMessageSend();
         public abstract void needSendTyping();
+        public abstract void onAttachButtonHidden();
+        public abstract void onAttachButtonShow();
     }
 
     private EditText messsageEditText;
@@ -136,6 +138,9 @@ public class ChatActivityEnterView implements NotificationCenter.NotificationCen
         attachButton = (FrameLayout) containerView.findViewById(R.id.chat_attach_button);
         if (attachButton != null) {
             ViewProxy.setPivotX(attachButton, AndroidUtilities.dp(48));
+            FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) messsageEditText.getLayoutParams();
+            layoutParams.rightMargin = AndroidUtilities.dp(50);
+            messsageEditText.setLayoutParams(layoutParams);
         }
 
         sendButton = (ImageButton) containerView.findViewById(R.id.chat_send_button);
@@ -380,14 +385,17 @@ public class ChatActivityEnterView implements NotificationCenter.NotificationCen
                             public void onAnimationEnd(Object animation) {
                                 if (runningAnimation2.equals(animation)) {
                                     attachButton.setVisibility(View.GONE);
+                                    attachButton.clearAnimation();
                                 }
                             }
                         });
                         runningAnimation2.start();
 
                         FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) messsageEditText.getLayoutParams();
-                        layoutParams.rightMargin = AndroidUtilities.dp(2);
+                        layoutParams.rightMargin = AndroidUtilities.dp(0);
                         messsageEditText.setLayoutParams(layoutParams);
+
+                        delegate.onAttachButtonHidden();
                     }
 
                     sendButton.setVisibility(View.VISIBLE);
@@ -409,7 +417,8 @@ public class ChatActivityEnterView implements NotificationCenter.NotificationCen
                         public void onAnimationEnd(Object animation) {
                             if (runningAnimation.equals(animation)) {
                                 sendButton.setVisibility(View.VISIBLE);
-                                audioSendButton.setVisibility(View.INVISIBLE);
+                                audioSendButton.setVisibility(View.GONE);
+                                audioSendButton.clearAnimation();
                                 runningAnimation = null;
                                 runningAnimationType = 0;
                             }
@@ -424,9 +433,15 @@ public class ChatActivityEnterView implements NotificationCenter.NotificationCen
                     ViewProxy.setScaleY(sendButton, 1.0f);
                     ViewProxy.setAlpha(sendButton, 1.0f);
                     sendButton.setVisibility(View.VISIBLE);
-                    audioSendButton.setVisibility(View.INVISIBLE);
+                    audioSendButton.setVisibility(View.GONE);
+                    audioSendButton.clearAnimation();
                     if (attachButton != null) {
                         attachButton.setVisibility(View.GONE);
+                        attachButton.clearAnimation();
+
+                        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) messsageEditText.getLayoutParams();
+                        layoutParams.rightMargin = AndroidUtilities.dp(0);
+                        messsageEditText.setLayoutParams(layoutParams);
                     }
                 }
             }
@@ -456,8 +471,10 @@ public class ChatActivityEnterView implements NotificationCenter.NotificationCen
                     runningAnimation2.start();
 
                     FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) messsageEditText.getLayoutParams();
-                    layoutParams.rightMargin = AndroidUtilities.dp(2);
+                    layoutParams.rightMargin = AndroidUtilities.dp(50);
                     messsageEditText.setLayoutParams(layoutParams);
+
+                    delegate.onAttachButtonShow();
                 }
 
                 audioSendButton.setVisibility(View.VISIBLE);
@@ -478,7 +495,8 @@ public class ChatActivityEnterView implements NotificationCenter.NotificationCen
                     @Override
                     public void onAnimationEnd(Object animation) {
                         if (runningAnimation.equals(animation)) {
-                            sendButton.setVisibility(View.INVISIBLE);
+                            sendButton.setVisibility(View.GONE);
+                            sendButton.clearAnimation();
                             audioSendButton.setVisibility(View.VISIBLE);
                             runningAnimation = null;
                             runningAnimationType = 0;
@@ -493,10 +511,14 @@ public class ChatActivityEnterView implements NotificationCenter.NotificationCen
                 ViewProxy.setScaleX(audioSendButton, 1.0f);
                 ViewProxy.setScaleY(audioSendButton, 1.0f);
                 ViewProxy.setAlpha(audioSendButton, 1.0f);
-                sendButton.setVisibility(View.INVISIBLE);
+                sendButton.setVisibility(View.GONE);
+                sendButton.clearAnimation();
                 audioSendButton.setVisibility(View.VISIBLE);
                 if (attachButton != null) {
                     attachButton.setVisibility(View.VISIBLE);
+                    FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) messsageEditText.getLayoutParams();
+                    layoutParams.rightMargin = AndroidUtilities.dp(50);
+                    messsageEditText.setLayoutParams(layoutParams);
                 }
             }
         }

TMessagesProj/src/main/java/org/telegram/ui/Views/SectionsListView.java

@@ -17,6 +17,7 @@ import android.widget.AbsListView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
+import org.telegram.android.LocaleController;
 import org.telegram.messenger.FileLog;
 import org.telegram.ui.Adapters.BaseSectionsAdapter;
 
@@ -181,7 +182,7 @@ public class SectionsListView extends ListView implements AbsListView.OnScrollLi
         for (View header : headers) {
             int saveCount = canvas.save();
             int top = (Integer)header.getTag();
-            canvas.translate(0, top);
+            canvas.translate(LocaleController.isRTL ? getWidth() - header.getWidth() : 0, top);
             canvas.clipRect(0, 0, getWidth(), header.getMeasuredHeight());
             if (top < 0) {
                 canvas.saveLayerAlpha(0, top, header.getWidth(), top + canvas.getHeight(), (int)(255 * (1.0f + (float)top / (float)header.getMeasuredHeight())), Canvas.HAS_ALPHA_LAYER_SAVE_FLAG);

TMessagesProj/src/main/java/org/telegram/ui/WallpapersActivity.java

@@ -297,7 +297,11 @@ public class WallpapersActivity extends BaseFragment implements NotificationCent
                 loadingFileObject = null;
                 loadingFile = null;
                 loadingSize = null;
-                backgroundImage.setImageURI(Uri.fromFile(f));
+                try {
+                    backgroundImage.setImageURI(Uri.fromFile(f));
+                } catch (Throwable e) {
+                    FileLog.e("tmessages", e);
+                }
                 backgroundImage.setBackgroundColor(0);
                 selectedColor = 0;
                 doneButton.setEnabled(true);

TMessagesProj/src/main/res/layout/chat_layout.xml

@@ -87,7 +87,7 @@
         android:background="@drawable/compose_panel"
         android:orientation="horizontal">
 
-        <FrameLayout
+        <org.telegram.ui.Views.FrameLayoutFixed
             android:layout_height="wrap_content"
             android:layout_width="0dp"
             android:layout_weight="1">
@@ -197,7 +197,7 @@
 
             </org.telegram.ui.Views.FrameLayoutFixed>
 
-        </FrameLayout>
+        </org.telegram.ui.Views.FrameLayoutFixed>
 
         <FrameLayout
             android:layout_width="48dp"

TMessagesProj/src/main/res/layout/loading_more_layout.xml

-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-    <ProgressBar
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:padding="6dp"
-            android:id="@+id/progress">
-    </ProgressBar>
-</RelativeLayout>

TMessagesProj/src/main/res/layout/popup_notification_layout.xml

@@ -29,7 +29,7 @@
                 android:background="@drawable/compose_panel"
                 android:orientation="horizontal">
 
-                <FrameLayout
+                <org.telegram.ui.Views.FrameLayoutFixed
                     android:layout_height="wrap_content"
                     android:layout_width="0dp"
                     android:layout_weight="1">
@@ -131,7 +131,7 @@
 
                     </org.telegram.ui.Views.FrameLayoutFixed>
 
-                </FrameLayout>
+                </org.telegram.ui.Views.FrameLayoutFixed>
 
                 <FrameLayout
                     android:layout_width="48dp"

TMessagesProj/src/main/res/values-es/strings.xml

@@ -143,6 +143,7 @@
     <string name="ReplyToUser">Responder a %1$s</string>
     <string name="NotificationMessagesPeopleDisplayOrder">%1$s %2$s</string>
     <!--contacts view-->
+    <string name="NewMessageTitle">Nuevo mensaje</string>
     <string name="SelectContact">Elegir contacto</string>
     <string name="NoContacts">Aún sin contactos</string>
     <string name="InviteText">Oye, cambiémonos a Telegram: http://telegram.org/dl2</string>
@@ -308,7 +309,7 @@
     <string name="LastSeenHelp">Elige quién puede ver tu última conexión.</string>
     <string name="LastSeenTitle">¿Quién puede ver tu última conexión?</string>
     <string name="AddExceptions">Añadir excepciones</string>
-    <string name="CustomHelp">Importante: no podrás ver la última conexión de las personas con las que no compartes la tuya. En su lugar, se mostrarán conexiones indeterminadas (recientemente, hace unos días, hace unas semanas).</string>
+    <string name="CustomHelp">Importante: No podrás ver la última conexión de las personas con las que no compartes la tuya. En su lugar, se mostrarán conexiones indeterminadas (recientemente, hace unos días, hace unas semanas).</string>
     <string name="AlwaysShareWith">Compartir siempre con</string>
     <string name="NeverShareWith">Nunca compartir con</string>
     <string name="CustomShareSettingsHelp">Estos ajustes anularán los valores de arriba.</string>
@@ -399,6 +400,7 @@
     <string name="AreYouSureSecretChat">¿Quieres iniciar un chat secreto?</string>
     <string name="AreYouSureRegistration">¿Quieres cancelar el registro?</string>
     <string name="AreYouSureClearHistory">¿Quieres eliminar el historial?</string>
+    <string name="AreYouSureDeleteMessages">¿Quieres eliminar %1$s?</string>
     <string name="SendMessagesToGroup">¿Enviar mensajes a %1$s?</string>
     <string name="ForwardMessagesToGroup">¿Reenviar mensajes a %1$s?</string>
     <string name="FeatureUnavailable">Lo siento, esta característica no está disponible en tu país actualmente.</string>