Optimized battery consumption, fixed blurry photos on some devices, added...

Optimized battery consumption, fixed blurry photos on some devices, added option to auto download media only via WiFi, changed way of contacts changes monitoring

https://github.com/DrKLO/Telegram/pull/422
https://github.com/rubenlagus/Telegram/commit/d96ce3c140bd49c5c8c63cea2b
c9afad8a16b8bb

TMessagesProj/build.gradle

@@ -82,7 +82,7 @@ android {
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 19
-        versionCode 231
-        versionName "1.4.13"
+        versionCode 233
+        versionName "1.4.14"
     }
 }

TMessagesProj/src/main/java/jawnae/pyronet/PyroSelector.java

@@ -83,7 +83,7 @@ public class PyroSelector {
     }
 
     public void select() {
-        this.select(10);
+        this.select(0);
     }
 
     public void select(long eventTimeout) {

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

@@ -42,18 +42,18 @@ public class BuffersStorage {
         for (int a = 0; a < 5; a++) {
             freeBuffers128.add(new ByteBufferDesc(128));
         }
-        for (int a = 0; a < 5; a++) {
-            freeBuffers1024.add(new ByteBufferDesc(1024 + 200));
-        }
-        for (int a = 0; a < 2; a++) {
-            freeBuffers4096.add(new ByteBufferDesc(4096 + 200));
-        }
-        for (int a = 0; a < 2; a++) {
-            freeBuffers16384.add(new ByteBufferDesc(16384 + 200));
-        }
-        for (int a = 0; a < 2; a++) {
-            freeBuffers32768.add(new ByteBufferDesc(40000));
-        }
+//        for (int a = 0; a < 5; a++) {
+//            freeBuffers1024.add(new ByteBufferDesc(1024 + 200));
+//        }
+//        for (int a = 0; a < 2; a++) {
+//            freeBuffers4096.add(new ByteBufferDesc(4096 + 200));
+//        }
+//        for (int a = 0; a < 2; a++) {
+//            freeBuffers16384.add(new ByteBufferDesc(16384 + 200));
+//        }
+//        for (int a = 0; a < 2; a++) {
+//            freeBuffers32768.add(new ByteBufferDesc(40000));
+//        }
     }
 
     public ByteBufferDesc getFreeBuffer(int size) {

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

@@ -13,7 +13,6 @@ import android.accounts.AccountManager;
 import android.content.ContentProviderOperation;
 import android.content.ContentProviderResult;
 import android.content.ContentResolver;
-import android.database.ContentObserver;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.BaseColumns;
@@ -37,6 +36,10 @@ public class ContactsController {
     private final Integer observerLock = 1;
     public boolean contactsLoaded = false;
     private boolean contactsBookLoaded = false;
+    private int lastContactsPhonesCount = -1;
+    private int lastContactsPhonesMaxId = -1;
+    private int lastContactsNamesCount = -1;
+    private int lastContactsNamesMaxId = -1;
     private ArrayList<Integer> delayedContactsUpdate = new ArrayList<Integer>();
 
     public static class Contact {
@@ -75,37 +78,6 @@ public class ContactsController {
 
     public HashMap<String, TLRPC.TL_contact> contactsByPhone = new HashMap<String, TLRPC.TL_contact>();
 
-    private class MyContentObserver extends ContentObserver {
-
-        public MyContentObserver() {
-            super(null);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            super.onChange(selfChange);
-            synchronized (observerLock) {
-                if (ignoreChanges) {
-                    FileLog.e("tmessages", "contacts changed - ignore");
-                    return;
-                }
-            }
-
-            Utilities.stageQueue.postRunnable(new Runnable() {
-                @Override
-                public void run() {
-                    MessagesController.getInstance().scheduleContactsReload = System.currentTimeMillis() + 2000;
-                    FileLog.e("tmessages", "contacts changed schedule - apply in " + MessagesController.getInstance().scheduleContactsReload);
-                }
-            });
-        }
-
-        @Override
-        public boolean deliverSelfNotifications() {
-            return false;
-        }
-    }
-
     private static volatile ContactsController Instance = null;
     public static ContactsController getInstance() {
         ContactsController localInstance = Instance;
@@ -120,15 +92,6 @@ public class ContactsController {
         return localInstance;
     }
 
-    public ContactsController() {
-        Utilities.globalQueue.postRunnable(new Runnable() {
-            @Override
-            public void run() {
-                ApplicationLoader.applicationContext.getContentResolver().registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, new MyContentObserver());
-            }
-        });
-    }
-
     public void cleanup() {
         contactsBook.clear();
         contactsBookSPhones.clear();
@@ -145,6 +108,10 @@ public class ContactsController {
         contactsSyncInProgress = false;
         contactsLoaded = false;
         contactsBookLoaded = false;
+        lastContactsPhonesCount = -1;
+        lastContactsPhonesMaxId = -1;
+        lastContactsNamesCount = -1;
+        lastContactsNamesMaxId = -1;
     }
 
     public void checkAppAccount() {
@@ -183,6 +150,85 @@ public class ContactsController {
         }
     }
 
+    public void checkContacts() {
+        Utilities.globalQueue.postRunnable(new Runnable() {
+            @Override
+            public void run() {
+                if (checkContactsInternal()) {
+                    FileLog.e("tmessages", "detected contacts change");
+                    ContactsController.getInstance().performSyncPhoneBook(ContactsController.getInstance().getContactsCopy(ContactsController.getInstance().contactsBook), true, false, true);
+                }
+            }
+        });
+    }
+
+    private boolean checkContactsInternal() {
+        boolean reload = false;
+        try {
+            ContentResolver cr = ApplicationLoader.applicationContext.getContentResolver();
+            Cursor pCur = null;
+            try {
+                pCur = cr.query(ContactsContract.CommonDataKinds.Phone.CONTENT_URI, new String[]{ContactsContract.CommonDataKinds.Phone._ID}, null, null, ContactsContract.CommonDataKinds.Phone._ID + " desc LIMIT 1");
+                if (pCur != null) {
+                    if (pCur.getCount() > 0 && pCur.moveToFirst()) {
+                        int value = pCur.getInt(0);
+                        if (lastContactsPhonesMaxId != -1 && value != lastContactsPhonesMaxId) {
+                            reload = true;
+                        }
+                        lastContactsPhonesMaxId = value;
+                    }
+                }
+            } catch (Exception e) {
+                FileLog.e("tmessages", e);
+            }
+            try {
+                pCur = cr.query(ContactsContract.CommonDataKinds.Phone.CONTENT_URI, new String[]{ContactsContract.CommonDataKinds.Phone._COUNT}, null, null, null);
+                if (pCur != null) {
+                    if (pCur.getCount() > 0 && pCur.moveToFirst()) {
+                        int value = pCur.getInt(0);
+                        if (lastContactsPhonesCount != -1 && value != lastContactsPhonesCount) {
+                            reload = true;
+                        }
+                        lastContactsPhonesCount = value;
+                    }
+                }
+            } catch (Exception e) {
+                FileLog.e("tmessages", e);
+            }
+            try {
+                pCur = cr.query(ContactsContract.Data.CONTENT_URI, new String[]{ContactsContract.Data._COUNT}, ContactsContract.Data.MIMETYPE + " = '" + ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE + "'", null, null);
+                if (pCur != null) {
+                    if (pCur.getCount() > 0 && pCur.moveToFirst()) {
+                        int value = pCur.getInt(0);
+                        if (lastContactsNamesCount != -1 && value != lastContactsNamesCount) {
+                            reload = true;
+                        }
+                        lastContactsNamesCount = value;
+                    }
+                }
+            } catch (Exception e) {
+                FileLog.e("tmessages", e);
+            }
+            try {
+                pCur = cr.query(ContactsContract.Data.CONTENT_URI, new String[]{ContactsContract.Data._ID}, ContactsContract.Data.MIMETYPE + " = '" + ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE + "'", null, ContactsContract.Data._ID + " desc LIMIT 1");
+                if (pCur != null) {
+                    if (pCur.getCount() > 0 && pCur.moveToFirst()) {
+                        int value = pCur.getInt(0);
+                        if (lastContactsNamesMaxId != -1 && value != lastContactsNamesMaxId) {
+                            reload = true;
+                        }
+                        lastContactsNamesMaxId = value;
+                    }
+                }
+            } catch (Exception e) {
+                FileLog.e("tmessages", e);
+            }
+        } catch (Exception e) {
+            FileLog.e("tmessages", e);
+        }
+        return reload;
+    }
+
     public void readContacts() {
         if (loadingContacts) {
             return;
@@ -414,6 +460,9 @@ public class ContactsController {
                 }
 
                 FileLog.e("tmessages", "start read contacts from phone");
+                if (!schedule) {
+                    checkContactsInternal();
+                }
                 final HashMap<Integer, Contact> contactsMap = readContactsFromPhoneBook();
                 final HashMap<String, Contact> contactsBookShort = new HashMap<String, Contact>();
                 int oldCount = contactHashMap.size();

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

@@ -95,7 +95,6 @@ public class MessagesController implements NotificationCenter.NotificationCenter
     private int sound;
     public boolean enableJoined = true;
     public int fontSize = Utilities.dp(16);
-    public long scheduleContactsReload = 0;
 
     public MessageObject currentPushMessage;
 
@@ -300,7 +299,6 @@ public class MessagesController implements NotificationCenter.NotificationCenter
 
         updatesStartWaitTime = 0;
         currentDeletingTaskTime = 0;
-        scheduleContactsReload = 0;
         currentDeletingTaskMids = null;
         gettingNewDeleteTask = false;
         currentDeletingTask = null;
@@ -763,11 +761,6 @@ public class MessagesController implements NotificationCenter.NotificationCenter
         checkDeletingTask();
 
         if (UserConfig.clientUserId != 0) {
-            if (scheduleContactsReload != 0 && currentTime > scheduleContactsReload) {
-                ContactsController.getInstance().performSyncPhoneBook(ContactsController.getInstance().getContactsCopy(ContactsController.getInstance().contactsBook), true, false, true);
-                scheduleContactsReload = 0;
-            }
-
             if (ApplicationLoader.lastPauseTime == 0) {
                 if (statusSettingState != 1 && (lastStatusUpdateTime == 0 || lastStatusUpdateTime <= System.currentTimeMillis() - 55000 || offlineSent)) {
                     statusSettingState = 1;
@@ -820,8 +813,6 @@ public class MessagesController implements NotificationCenter.NotificationCenter
                 FileLog.e("tmessages", "UPDATES WAIT TIMEOUT - CHECK QUEUE");
                 processUpdatesQueue(false);
             }
-        } else {
-            scheduleContactsReload = 0;
         }
         if (!printingUsers.isEmpty() || lastPrintingStringCount != printingUsers.size()) {
             boolean updated = false;

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

@@ -997,8 +997,6 @@ public class MessagesStorage {
             @Override
             public void run() {
                 try {
-                    database.executeFast("DELETE FROM user_contacts_v6 WHERE 1").stepThis().dispose();
-                    database.executeFast("DELETE FROM user_phones_v6 WHERE 1").stepThis().dispose();
                     database.beginTransaction();
                     SQLitePreparedStatement state = database.executeFast("REPLACE INTO user_contacts_v6 VALUES(?, ?, ?)");
                     SQLitePreparedStatement state2 = database.executeFast("REPLACE INTO user_phones_v6 VALUES(?, ?, ?, ?)");

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

@@ -47,9 +47,7 @@ import java.io.OutputStream;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
-import java.nio.channels.ReadableByteChannel;
 import java.security.KeyFactory;
 import java.security.MessageDigest;
 import java.security.PublicKey;

TMessagesProj/src/main/java/org/telegram/objects/MessageObject.java

@@ -340,16 +340,7 @@ public class MessageObject {
         } else if (messageOwner.media instanceof TLRPC.TL_messageMediaPhoto) {
             ArrayList<TLRPC.PhotoSize> sizes = messageOwner.media.photo.sizes;
             if (sizes.size() > 0) {
-                int width = (int)(Math.min(Utilities.displaySize.x, Utilities.displaySize.y) * 0.7f);
-                int height = width + Utilities.dp(100);
-                if (width > 800) {
-                    width = 800;
-                }
-                if (height > 800) {
-                    height = 800;
-                }
-
-                TLRPC.PhotoSize sizeFull = PhotoObject.getClosestPhotoSizeWithSize(sizes, width, height);
+                TLRPC.PhotoSize sizeFull = PhotoObject.getClosestPhotoSizeWithSize(sizes, 800, 800);
                 if (sizeFull != null) {
                     return getAttachFileName(sizeFull);
                 }

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

@@ -148,7 +148,7 @@ public class ContactsActivitySearchAdapter extends BaseFragmentAdapter {
 
     @Override
     public boolean hasStableIds() {
-        return false;
+        return true;
     }
 
     @Override

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

@@ -30,6 +30,7 @@ import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.android.gms.gcm.GoogleCloudMessaging;
 
+import org.telegram.messenger.ContactsController;
 import org.telegram.messenger.NotificationsService;
 import org.telegram.messenger.BuildVars;
 import org.telegram.messenger.ConnectionsManager;
@@ -197,6 +198,9 @@ public class ApplicationLoader extends Application {
     }
 
     public static void resetLastPauseTime() {
+        if (lastPauseTime != 0 && System.currentTimeMillis() - lastPauseTime > 5000) {
+            ContactsController.getInstance().checkContacts();
+        }
         lastPauseTime = 0;
         ConnectionsManager.getInstance().applicationMovedToForeground();
     }

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

@@ -20,6 +20,7 @@ import android.view.MotionEvent;
 import android.view.SoundEffectConstants;
 import android.view.View;
 
+import org.telegram.messenger.ConnectionsManager;
 import org.telegram.messenger.FileLoader;
 import org.telegram.messenger.MediaController;
 import org.telegram.messenger.MessagesController;
@@ -57,7 +58,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
     private String currentPhotoFilter;
     private ImageReceiver photoImage;
     private ProgressView progressView;
-    public boolean downloadPhotos = true;
+    public int downloadPhotos = 0;
     private boolean progressVisible = false;
 
     private int TAG;
@@ -350,12 +351,22 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
                     photoHeight = 800;
                 }
 
-                currentPhotoObject = PhotoObject.getClosestImageWithSize(messageObject.photoThumbs, photoWidth, photoHeight);
+                currentPhotoObject = PhotoObject.getClosestImageWithSize(messageObject.photoThumbs, 800, 800);
                 if (currentPhotoObject != null) {
                     float scale = (float) currentPhotoObject.photoOwner.w / (float) photoWidth;
 
                     int w = (int) (currentPhotoObject.photoOwner.w / scale);
                     int h = (int) (currentPhotoObject.photoOwner.h / scale);
+                    if (w == 0) {
+                        if (messageObject.type == 3) {
+                            w = infoWidth + infoOffset + Utilities.dp(16);
+                        } else {
+                            w = Utilities.dp(100);
+                        }
+                    }
+                    if (h == 0) {
+                        h = Utilities.dp(100);
+                    }
                     if (h > photoHeight) {
                         float scale2 = h;
                         h = photoHeight;
@@ -387,7 +398,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
                                 MediaController.getInstance().removeLoadingFileObserver(this);
                             }
                         }
-                        if (photoExist || downloadPhotos) {
+                        if (photoExist || downloadPhotos == 0 || downloadPhotos == 2 && ConnectionsManager.isConnectedToWiFi()) {
                             if (messageObject.imagePreview != null) {
                                 photoImage.setImage(currentPhotoObject.photoOwner.location, currentPhotoFilter, new BitmapDrawable(messageObject.imagePreview), currentPhotoObject.photoOwner.size);
                             } else {
@@ -458,7 +469,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
             if (!cacheFile.exists()) {
                 MediaController.getInstance().addLoadingFileObserver(fileName, this);
                 if (!FileLoader.getInstance().isLoadingFile(fileName)) {
-                    if (currentMessageObject.type != 1 || !downloadPhotos) {
+                    if (currentMessageObject.type != 1 || downloadPhotos == 1 || downloadPhotos == 2 && !ConnectionsManager.isConnectedToWiFi()) {
                         buttonState = 0;
                         progressVisible = false;
                     } else {
@@ -467,7 +478,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
                     }
                     progressView.setProgress(0);
                 } else {
-                    if (currentMessageObject.type != 1 || !downloadPhotos) {
+                    if (currentMessageObject.type != 1 || downloadPhotos == 1 || downloadPhotos == 2 && !ConnectionsManager.isConnectedToWiFi()) {
                         buttonState = 1;
                     } else {
                         buttonState = -1;

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

@@ -147,8 +147,8 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
     public boolean scrollToTopOnResume = false;
     private boolean scrollToTopUnReadOnResume = false;
     private boolean isCustomTheme = false;
-    private boolean downloadPhotos = true;
-    private boolean downloadAudios = true;
+    private int downloadPhotos = 0;
+    private int downloadAudios = 0;
     private ImageView topPlaneClose;
     private View pagedownButton;
     private TextView topPanelText;
@@ -442,14 +442,14 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
         sendByEnter = preferences.getBoolean("send_by_enter", false);
 
         if (currentChat != null) {
-            downloadPhotos = preferences.getBoolean("photo_download_chat", true);
+            downloadPhotos = preferences.getInt("photo_download_chat2", 0);
         } else {
-            downloadPhotos = preferences.getBoolean("photo_download_user", true);
+            downloadPhotos = preferences.getInt("photo_download_user2", 0);
         }
         if (currentChat != null) {
-            downloadAudios = preferences.getBoolean("audio_download_chat", true);
+            downloadAudios = preferences.getInt("audio_download_chat2", 0);
         } else {
-            downloadAudios = preferences.getBoolean("audio_download_user", true);
+            downloadAudios = preferences.getInt("audio_download_user2", 0);
         }
 
         return true;
@@ -3844,7 +3844,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa
                 ((ChatBaseCell)view).isChat = currentChat != null;
                 ((ChatBaseCell)view).setMessageObject(message);
                 ((ChatBaseCell)view).setCheckPressed(!disableSelection, disableSelection && selected);
-                if (view instanceof ChatAudioCell && downloadAudios) {
+                if (view instanceof ChatAudioCell && (downloadAudios == 0 || downloadAudios == 2 && ConnectionsManager.isConnectedToWiFi())) {
                     ((ChatAudioCell)view).downloadAudioIfNeed();
                 } else if (view instanceof ChatMediaCell) {
                     ((ChatMediaCell)view).downloadPhotos = downloadPhotos;

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

@@ -25,6 +25,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -196,7 +197,6 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
                                 } else {
                                     return;
                                 }
-
                             }
                         } else {
                             if (section == 0) {
@@ -294,6 +294,19 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
                     }
                 }
             });
+
+            listView.setOnScrollListener(new AbsListView.OnScrollListener() {
+                @Override
+                public void onScrollStateChanged(AbsListView absListView, int i) {
+                    if (i == SCROLL_STATE_TOUCH_SCROLL && searching && searchWas) {
+                        Utilities.hideKeyboard(searchView);
+                    }
+                }
+
+                @Override
+                public void onScroll(AbsListView absListView, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+                }
+            });
         } else {
             ViewGroup parent = (ViewGroup)fragmentView.getParent();
             if (parent != null) {
@@ -432,6 +445,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String s) {
+                Utilities.hideKeyboard(searchView);
                 return true;
             }
 
@@ -440,7 +454,6 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
                 if (searchListViewAdapter == null) {
                     return true;
                 }
-                searchListViewAdapter.searchDialogs(s);
                 if (s.length() != 0) {
                     searchWas = true;
                     if (listView != null) {
@@ -456,6 +469,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
                         emptyTextView.setText(LocaleController.getString("NoResult", R.string.NoResult));
                     }
                 }
+                searchListViewAdapter.searchDialogs(s);
                 return true;
             }
         });

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

@@ -21,6 +21,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
@@ -148,6 +149,19 @@ public class CountrySelectActivity extends ActionBarActivity {
             }
         });
 
+        listView.setOnScrollListener(new AbsListView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(AbsListView absListView, int i) {
+                if (i == SCROLL_STATE_TOUCH_SCROLL && searching && searchWas) {
+                    Utilities.hideKeyboard(searchView);
+                }
+            }
+
+            @Override
+            public void onScroll(AbsListView absListView, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+            }
+        });
+
         getWindow().setBackgroundDrawableResource(R.drawable.transparent);
     }
 
@@ -220,6 +234,7 @@ public class CountrySelectActivity extends ActionBarActivity {
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String s) {
+                Utilities.hideKeyboard(searchView);
                 return true;
             }
 

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

@@ -533,16 +533,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
                     }
                 }
             } else if (message.messageOwner.media instanceof TLRPC.TL_messageMediaPhoto) {
-                int width = (int)(Math.min(displaySize.x, displaySize.y) * 0.7f);
-                int height = width + Utilities.dp(100);
-                if (width > 800) {
-                    width = 800;
-                }
-                if (height > 800) {
-                    height = 800;
-                }
-
-                TLRPC.PhotoSize sizeFull = PhotoObject.getClosestPhotoSizeWithSize(message.messageOwner.media.photo.sizes, width, height);
+                TLRPC.PhotoSize sizeFull = PhotoObject.getClosestPhotoSizeWithSize(message.messageOwner.media.photo.sizes, 800, 800);
                 if (sizeFull != null) {
                     TLRPC.TL_inputFileLocation location = new TLRPC.TL_inputFileLocation();
                     location.local_id = sizeFull.location.local_id;
@@ -591,16 +582,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
             } else {
                 ArrayList<TLRPC.PhotoSize> sizes = obj.messageOwner.action.photo.sizes;
                 if (sizes.size() > 0) {
-                    int width = (int)(Math.min(displaySize.x, displaySize.y) * 0.7f);
-                    int height = width + Utilities.dp(100);
-                    if (width > 800) {
-                        width = 800;
-                    }
-                    if (height > 800) {
-                        height = 800;
-                    }
-
-                    TLRPC.PhotoSize sizeFull = PhotoObject.getClosestPhotoSizeWithSize(sizes, width, height);
+                    TLRPC.PhotoSize sizeFull = PhotoObject.getClosestPhotoSizeWithSize(sizes, 800, 800);
                     if (sizeFull != null) {
                         currentFileName = sizeFull.location.volume_id + "_" + sizeFull.location.local_id + ".jpg";
                     }
@@ -990,16 +972,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif
                     ArrayList<TLRPC.PhotoSize> sizes = message.messageOwner.media.photo.sizes;
                     iv.isVideo = false;
                     if (sizes.size() > 0) {
-                        int width = (int)(Math.min(displaySize.x, displaySize.y) * 0.7f);
-                        int height = width + Utilities.dp(100);
-                        if (width > 800) {
-                            width = 800;
-                        }
-                        if (height > 800) {
-                            height = 800;
-                        }
-
-                        TLRPC.PhotoSize sizeFull = PhotoObject.getClosestPhotoSizeWithSize(sizes, width, height);
+                        TLRPC.PhotoSize sizeFull = PhotoObject.getClosestPhotoSizeWithSize(sizes, 800, 800);
                         if (message.imagePreview != null) {
                             iv.setImage(sizeFull.location, null, message.imagePreview, sizeFull.size);
                         } else {

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

@@ -31,6 +31,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -279,6 +280,19 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
                     }
                 }
             });
+
+            listView.setOnScrollListener(new AbsListView.OnScrollListener() {
+                @Override
+                public void onScrollStateChanged(AbsListView absListView, int i) {
+                    if (i == SCROLL_STATE_TOUCH_SCROLL) {
+                        Utilities.hideKeyboard(userSelectEditText);
+                    }
+                }
+
+                @Override
+                public void onScroll(AbsListView absListView, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+                }
+            });
         } else {
             ViewGroup parent = (ViewGroup)fragmentView.getParent();
             if (parent != null) {

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

@@ -22,6 +22,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
@@ -178,6 +179,19 @@ public class LanguageSelectActivity extends BaseFragment {
                 }
             });
 
+            listView.setOnScrollListener(new AbsListView.OnScrollListener() {
+                @Override
+                public void onScrollStateChanged(AbsListView absListView, int i) {
+                    if (i == SCROLL_STATE_TOUCH_SCROLL && searching && searchWas) {
+                        Utilities.hideKeyboard(searchView);
+                    }
+                }
+
+                @Override
+                public void onScroll(AbsListView absListView, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+                }
+            });
+
             searching = false;
             searchWas = false;
         } else {
@@ -281,6 +295,7 @@ public class LanguageSelectActivity extends BaseFragment {
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String s) {
+                Utilities.hideKeyboard(searchView);
                 return true;
             }
 

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

@@ -274,7 +274,9 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
             messagesListView.setOnScrollListener(new AbsListView.OnScrollListener() {
                 @Override
                 public void onScrollStateChanged(AbsListView absListView, int i) {
-
+                    if (i == SCROLL_STATE_TOUCH_SCROLL && searching && searchWas) {
+                        Utilities.hideKeyboard(searchView);
+                    }
                 }
 
                 @Override
@@ -498,13 +500,13 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
             public void run() {
                 for (TLObject obj : result) {
                     if (obj instanceof TLRPC.User) {
-                        TLRPC.User user = (TLRPC.User)obj;
+                        TLRPC.User user = (TLRPC.User) obj;
                         MessagesController.getInstance().users.putIfAbsent(user.id, user);
                     } else if (obj instanceof TLRPC.Chat) {
-                        TLRPC.Chat chat = (TLRPC.Chat)obj;
+                        TLRPC.Chat chat = (TLRPC.Chat) obj;
                         MessagesController.getInstance().chats.putIfAbsent(chat.id, chat);
                     } else if (obj instanceof TLRPC.EncryptedChat) {
-                        TLRPC.EncryptedChat chat = (TLRPC.EncryptedChat)obj;
+                        TLRPC.EncryptedChat chat = (TLRPC.EncryptedChat) obj;
                         MessagesController.getInstance().encryptedChats.putIfAbsent(chat.id, chat);
                     }
                 }
@@ -593,6 +595,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String s) {
+                Utilities.hideKeyboard(searchView);
                 return true;
             }
 

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

@@ -11,7 +11,6 @@ package org.telegram.ui.Views;
 import android.util.SparseArray;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.BaseAdapter;
 
 import org.telegram.ui.Adapters.BaseFragmentAdapter;
 
@@ -223,5 +222,4 @@ public abstract class SectionedBaseAdapter extends BaseFragmentAdapter implement
         mSectionCount = getSectionCount();
         return mSectionCount;
     }
-
 }

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

@@ -267,6 +267,9 @@
     <string name="Disabled">Disabled</string>
     <string name="NotificationsService">Notifications Service</string>
     <string name="NotificationsServiceDisableInfo">If google play services are enough for you to receive notifications, you can disable Notifications Service. However we recommend you to leave it enabled to keep app running in background and receive instant notifications.</string>
+    <string name="SortBy">Sort By</string>
+    <string name="ImportContacts">Import Contacts</string>
+    <string name="WiFiOnly">via WiFi only</string>
 
     <!--media view-->
     <string name="NoMedia">لا توجد وسائط بعد</string>

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

@@ -267,6 +267,9 @@
     <string name="Disabled">Disabled</string>
     <string name="NotificationsService">Notifications Service</string>
     <string name="NotificationsServiceDisableInfo">If google play services are enough for you to receive notifications, you can disable Notifications Service. However we recommend you to leave it enabled to keep app running in background and receive instant notifications.</string>
+    <string name="SortBy">Sort By</string>
+    <string name="ImportContacts">Import Contacts</string>
+    <string name="WiFiOnly">via WiFi only</string>
 
     <!--media view-->
     <string name="NoMedia">Noch keine geteilten Medien vorhanden</string>

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

@@ -267,6 +267,9 @@
     <string name="Disabled">Disabled</string>
     <string name="NotificationsService">Notifications Service</string>
     <string name="NotificationsServiceDisableInfo">If google play services are enough for you to receive notifications, you can disable Notifications Service. However we recommend you to leave it enabled to keep app running in background and receive instant notifications.</string>
+    <string name="SortBy">Sort By</string>
+    <string name="ImportContacts">Import Contacts</string>
+    <string name="WiFiOnly">via WiFi only</string>
 
     <!--media view-->
     <string name="NoMedia">No hay fotos ni vídeos compartidos aún</string>

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

@@ -267,6 +267,9 @@
     <string name="Disabled">Disabled</string>
     <string name="NotificationsService">Notifications Service</string>
     <string name="NotificationsServiceDisableInfo">If google play services are enough for you to receive notifications, you can disable Notifications Service. However we recommend you to leave it enabled to keep app running in background and receive instant notifications.</string>
+    <string name="SortBy">Sort By</string>
+    <string name="ImportContacts">Import Contacts</string>
+    <string name="WiFiOnly">via WiFi only</string>
 
     <!--media view-->
     <string name="NoMedia">Nessun media condiviso</string>

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

@@ -267,6 +267,9 @@
     <string name="Disabled">Disabled</string>
     <string name="NotificationsService">Notifications Service</string>
     <string name="NotificationsServiceDisableInfo">If google play services are enough for you to receive notifications, you can disable Notifications Service. However we recommend you to leave it enabled to keep app running in background and receive instant notifications.</string>
+    <string name="SortBy">Sort By</string>
+    <string name="ImportContacts">Import Contacts</string>
+    <string name="WiFiOnly">via WiFi only</string>
 
     <!--media view-->
     <string name="NoMedia">Nog geen media gedeeld</string>

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

@@ -267,6 +267,11 @@
     <string name="Disabled">Disabled</string>
     <string name="NotificationsService">Notifications Service</string>
     <string name="NotificationsServiceDisableInfo">If google play services are enough for you to receive notifications, you can disable Notifications Service. However we recommend you to leave it enabled to keep app running in background and receive instant notifications.</string>
+    <string name="SortBy">Sort By</string>
+    <string name="ImportContacts">Import Contacts</string>
+    <string name="WiFiOnly">via WiFi only</string>
+    <string name="SortFirstName">First name</string>
+    <string name="SortLastName">Last name</string>
 
     <!--media view-->
     <string name="NoMedia">No shared media yet</string>