Broadcasts, updated gif lib, blur image\video preview

Note: untested, don’t upload to market

TMessagesProj/build.gradle

@@ -83,7 +83,7 @@ android {
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 19
-        versionCode 290
-        versionName "1.6.2"
+        versionCode 291
+        versionName "1.7.0"
     }
 }

TMessagesProj/jni/Android.mk

@@ -8,6 +8,7 @@ LOCAL_CFLAGS 	+= -Drestrict='' -D__EMX__ -DOPUS_BUILD -DFIXED_POINT -DUSE_ALLOCA
 LOCAL_CFLAGS 	+= -DANDROID_NDK -DDISABLE_IMPORTGL -fno-strict-aliasing -fprefetch-loop-arrays -DAVOID_TABLES -DANDROID_TILE_BASED_DECODE -DANDROID_ARMV6_IDCT
 LOCAL_CPPFLAGS 	:= -DBSD=1 -ffast-math -O2 -funroll-loops
 #LOCAL_LDLIBS 	:= -llog
+LOCAL_LDLIBS 	:= -ljnigraphics
 
 LOCAL_SRC_FILES     := \
 ./opus/src/opus.c \

TMessagesProj/jni/image.c

@@ -2,8 +2,101 @@
 #include <stdio.h>
 #include <setjmp.h>
 #include <libjpeg/jpeglib.h>
+#include <android/bitmap.h>
 #include "utils.h"
 
+static inline uint64_t get_colors (const uint8_t *p) {
+    return p[0] + (p[1] << 16) + ((uint64_t)p[2] << 32);
+}
+
+static void fastBlur(int imageWidth, int imageHeight, int imageStride, void *pixels) {
+    uint8_t *pix = (uint8_t *)pixels;
+    const int w = imageWidth;
+    const int h = imageHeight;
+    const int stride = imageStride;
+    const int radius = 3;
+    const int r1 = radius + 1;
+    const int div = radius * 2 + 1;
+    
+    if (radius > 15 || div >= w || div >= h) {
+        return;
+    }
+    
+    uint64_t rgb[imageStride * imageHeight];
+    
+    int x, y, i;
+    
+    int yw = 0;
+    const int we = w - r1;
+    for (y = 0; y < h; y++) {
+        uint64_t cur = get_colors (&pix[yw]);
+        uint64_t rgballsum = -radius * cur;
+        uint64_t rgbsum = cur * ((r1 * (r1 + 1)) >> 1);
+        
+        for (i = 1; i <= radius; i++) {
+            uint64_t cur = get_colors (&pix[yw + i * 4]);
+            rgbsum += cur * (r1 - i);
+            rgballsum += cur;
+        }
+        
+        x = 0;
+        
+        #define update(start, middle, end)  \
+                rgb[y * w + x] = (rgbsum >> 4) & 0x00FF00FF00FF00FFLL; \
+                rgballsum += get_colors (&pix[yw + (start) * 4]) - 2 * get_colors (&pix[yw + (middle) * 4]) + get_colors (&pix[yw + (end) * 4]); \
+                rgbsum += rgballsum;        \
+                x++;                        \
+
+        while (x < r1) {
+            update (0, x, x + r1);
+        }
+        while (x < we) {
+            update (x - r1, x, x + r1);
+        }
+        while (x < w) {
+            update (x - r1, x, w - 1);
+        }
+        
+        #undef update
+        
+        yw += stride;
+    }
+    
+    const int he = h - r1;
+    for (x = 0; x < w; x++) {
+        uint64_t rgballsum = -radius * rgb[x];
+        uint64_t rgbsum = rgb[x] * ((r1 * (r1 + 1)) >> 1);
+        for (i = 1; i <= radius; i++) {
+            rgbsum += rgb[i * w + x] * (r1 - i);
+            rgballsum += rgb[i * w + x];
+        }
+        
+        y = 0;
+        int yi = x * 4;
+        
+        #define update(start, middle, end)  \
+                int64_t res = rgbsum >> 4;   \
+                pix[yi] = res;              \
+                pix[yi + 1] = res >> 16;    \
+                pix[yi + 2] = res >> 32;    \
+                rgballsum += rgb[x + (start) * w] - 2 * rgb[x + (middle) * w] + rgb[x + (end) * w]; \
+                rgbsum += rgballsum;        \
+                y++;                        \
+                yi += stride;
+        
+        while (y < r1) {
+            update (0, y, y + r1);
+        }
+        while (y < he) {
+            update (y - r1, y, y + r1);
+        }
+        while (y < h) {
+            update (y - r1, y, h - 1);
+        }
+        #undef update
+    }
+}
+
 typedef struct my_error_mgr {
     struct jpeg_error_mgr pub;
     jmp_buf setjmp_buffer;
@@ -16,6 +109,15 @@ METHODDEF(void) my_error_exit(j_common_ptr cinfo) {
     longjmp(myerr->setjmp_buffer, 1);
 }
 
+JNIEXPORT void Java_org_telegram_messenger_Utilities_blurBitmap(JNIEnv *env, jclass class, jobject bitmap, int width, int height, int stride) {
+    void *pixels = 0;
+    if (AndroidBitmap_lockPixels(env, bitmap, &pixels) < 0) {
+        return;
+    }
+    fastBlur(width, height, stride, pixels);
+    AndroidBitmap_unlockPixels(env, bitmap);
+}
+
 JNIEXPORT void Java_org_telegram_messenger_Utilities_loadBitmap(JNIEnv *env, jclass class, jstring path, jintArray bitmap, int scale, int format, int width, int height) {
     
     int i;

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

@@ -367,6 +367,7 @@ public class MessagesStorage {
                         database.executeFast("DELETE FROM dialogs WHERE did = " + did).stepThis().dispose();
                         database.executeFast("DELETE FROM chat_settings WHERE uid = " + did).stepThis().dispose();
                     }
+                    database.executeFast("UPDATE dialogs SET unread_count = 0 WHERE did = " + did).stepThis().dispose();
                     database.executeFast("DELETE FROM media_counts WHERE uid = " + did).stepThis().dispose();
                     database.executeFast("DELETE FROM messages WHERE uid = " + did).stepThis().dispose();
                     database.executeFast("DELETE FROM media WHERE uid = " + did).stepThis().dispose();
@@ -1808,7 +1809,7 @@ public class MessagesStorage {
         }
     }
 
-    private void putMessagesInternal(final ArrayList<TLRPC.Message> messages, final boolean withTransaction) {
+    private void putMessagesInternal(final ArrayList<TLRPC.Message> messages, final boolean withTransaction, final boolean isBroadcast) {
         try {
             if (withTransaction) {
                 database.beginTransaction();
@@ -1949,10 +1950,21 @@ public class MessagesStorage {
             state.dispose();
             state2.dispose();
             state3.dispose();
-            state = database.executeFast("REPLACE INTO dialogs VALUES(?, ?, ifnull((SELECT unread_count FROM dialogs WHERE did = ?), 0) + ?, ?)");
+
+            state = database.executeFast("REPLACE INTO dialogs VALUES(?, ?, ?, ?)");
             for (HashMap.Entry<Long, TLRPC.Message> pair : messagesMap.entrySet()) {
-                state.requery();
                 Long key = pair.getKey();
+
+                int dialog_date = 0;
+                int old_unread_count = 0;
+                SQLiteCursor cursor = database.queryFinalized("SELECT date, unread_count FROM dialogs WHERE did = " + key);
+                if (cursor.next()) {
+                    dialog_date = cursor.intValue(0);
+                    old_unread_count = cursor.intValue(1);
+                }
+                cursor.dispose();
+
+                state.requery();
                 TLRPC.Message value = pair.getValue();
                 Integer unread_count = messagesCounts.get(key);
                 if (unread_count == null) {
@@ -1963,10 +1975,13 @@ public class MessagesStorage {
                     messageId = value.local_id;
                 }
                 state.bindLong(1, key);
-                state.bindInteger(2, value.date);
-                state.bindLong(3, key);
-                state.bindInteger(4, unread_count);
-                state.bindInteger(5, messageId);
+                if (!isBroadcast) {
+                    state.bindInteger(2, value.date);
+                } else {
+                    state.bindInteger(2, dialog_date != 0 ? dialog_date : value.date);
+                }
+                state.bindInteger(3, unread_count);
+                state.bindInteger(4, messageId);
                 state.step();
             }
             state.dispose();
@@ -2002,7 +2017,7 @@ public class MessagesStorage {
         }
     }
 
-    public void putMessages(final ArrayList<TLRPC.Message> messages, final boolean withTransaction, boolean useQueue) {
+    public void putMessages(final ArrayList<TLRPC.Message> messages, final boolean withTransaction, boolean useQueue, final boolean isBroadcast) {
         if (messages.size() == 0) {
             return;
         }
@@ -2010,11 +2025,11 @@ public class MessagesStorage {
             storageQueue.postRunnable(new Runnable() {
                 @Override
                 public void run() {
-                    putMessagesInternal(messages, withTransaction);
+                    putMessagesInternal(messages, withTransaction, isBroadcast);
                 }
             });
         } else {
-            putMessagesInternal(messages, withTransaction);
+            putMessagesInternal(messages, withTransaction, isBroadcast);
         }
     }
 
@@ -2425,9 +2440,15 @@ public class MessagesStorage {
                         }
                     }
                 } else {
-                    int encryptedId = (int)(dialog.id >> 32);
-                    if (!encryptedToLoad.contains(encryptedId)) {
-                        encryptedToLoad.add(encryptedId);
+                    int high_id = (int)(dialog.id >> 32);
+                    if (high_id > 0) {
+                        if (!encryptedToLoad.contains(high_id)) {
+                            encryptedToLoad.add(high_id);
+                        }
+                    } else {
+                        if (!chatsToLoad.contains(high_id)) {
+                            chatsToLoad.add(high_id);
+                        }
                     }
                 }
             }
@@ -2692,9 +2713,15 @@ public class MessagesStorage {
                                 }
                             }
                         } else {
-                            int encryptedId = (int)(dialog.id >> 32);
-                            if (!encryptedToLoad.contains(encryptedId)) {
-                                encryptedToLoad.add(encryptedId);
+                            int high_id = (int)(dialog.id >> 32);
+                            if (high_id > 0) {
+                                if (!encryptedToLoad.contains(high_id)) {
+                                    encryptedToLoad.add(high_id);
+                                }
+                            } else {
+                                if (!chatsToLoad.contains(high_id)) {
+                                    chatsToLoad.add(high_id);
+                                }
                             }
                         }
                     }

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

@@ -25,8 +25,8 @@ public class NativeLoader {
 
     private static final long sizes[] = new long[] {
             799376,     //armeabi
-            848548,     //armeabi-v7a
-            1246260,    //x86
+            852644,     //armeabi-v7a
+            1250356,    //x86
             0,          //mips
     };
 

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

@@ -400,7 +400,7 @@ public class NotificationsController {
             }
 
             if (photoPath != null) {
-                Bitmap img = FileLoader.getInstance().getImageFromMemory(photoPath, null, null, "50_50", false);
+                Bitmap img = FileLoader.getInstance().getImageFromMemory(photoPath, null, null, "50_50");
                 if (img != null) {
                     mBuilder.setLargeIcon(img);
                 }
@@ -536,7 +536,7 @@ public class NotificationsController {
 
             Boolean value = settingsCache.get(dialog_id);
             boolean isChat = (int)dialog_id < 0;
-            popup = preferences.getInt(isChat ? "popupGroup" : "popupAll", 0);
+            popup = (int)dialog_id == 0 ? 0 : preferences.getInt(isChat ? "popupGroup" : "popupAll", 0);
             if (value == null) {
                 int notify_override = preferences.getInt("notify2_" + dialog_id, 0);
                 value = !(notify_override == 2 || (!preferences.getBoolean("EnableAll", true) || isChat && !preferences.getBoolean("EnableGroup", true)) && notify_override == 0);

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

@@ -850,7 +850,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
     }
 
     public long performRpc(final TLObject rpc, final RPCRequest.RPCRequestDelegate completionBlock, final RPCRequest.RPCQuickAckDelegate quickAckBlock, final boolean requiresCompletion, final int requestClass, final int datacenterId, final boolean runQueue) {
-        if (!UserConfig.isClientActivated() && (requestClass & RPCRequest.RPCRequestClassWithoutLogin) == 0) {
+        if (rpc == null || !UserConfig.isClientActivated() && (requestClass & RPCRequest.RPCRequestClassWithoutLogin) == 0) {
             FileLog.e("tmessages", "can't do request without login " + rpc);
             return 0;
         }

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

@@ -248,10 +248,14 @@ public class FileLoadOperation {
 
                             float w_filter = 0;
                             float h_filter = 0;
+                            boolean blur = false;
                             if (filter != null) {
                                 String args[] = filter.split("_");
                                 w_filter = Float.parseFloat(args[0]) * AndroidUtilities.density;
                                 h_filter = Float.parseFloat(args[1]) * AndroidUtilities.density;
+                                if (args.length > 2) {
+                                    blur = true;
+                                }
                                 opts.inJustDecodeBounds = true;
 
                                 if (mediaIdFinal != null) {
@@ -270,7 +274,7 @@ public class FileLoadOperation {
                                 opts.inSampleSize = (int)scaleFactor;
                             }
 
-                            if (filter == null) {
+                            if (filter == null || blur) {
                                 opts.inPreferredConfig = Bitmap.Config.ARGB_8888;
                             } else {
                                 opts.inPreferredConfig = Bitmap.Config.RGB_565;
@@ -300,7 +304,9 @@ public class FileLoadOperation {
                                             image = scaledBitmap;
                                         }
                                     }
-
+                                    if (image != null && blur && bitmapH < 100 && bitmapW < 100) {
+                                        Utilities.blurBitmap(image, (int)bitmapW, (int)bitmapH, image.getRowBytes());
+                                    }
                                 }
                                 if (FileLoader.getInstance().runtimeHack != null) {
                                     FileLoader.getInstance().runtimeHack.trackFree(image.getRowBytes() * image.getHeight());
@@ -494,10 +500,14 @@ public class FileLoadOperation {
 
                     float w_filter = 0;
                     float h_filter;
+                    boolean blur = false;
                     if (filter != null) {
                         String args[] = filter.split("_");
                         w_filter = Float.parseFloat(args[0]) * AndroidUtilities.density;
                         h_filter = Float.parseFloat(args[1]) * AndroidUtilities.density;
+                        if (args.length > 2) {
+                            blur = true;
+                        }
 
                         opts.inJustDecodeBounds = true;
                         BitmapFactory.decodeFile(cacheFileFinal.getAbsolutePath(), opts);
@@ -511,7 +521,7 @@ public class FileLoadOperation {
                         opts.inSampleSize = (int) scaleFactor;
                     }
 
-                    if (filter == null) {
+                    if (filter == null || blur) {
                         opts.inPreferredConfig = Bitmap.Config.ARGB_8888;
                     } else {
                         opts.inPreferredConfig = Bitmap.Config.RGB_565;
@@ -540,7 +550,9 @@ public class FileLoadOperation {
                                     image = scaledBitmap;
                                 }
                             }
-
+                            if (image != null && blur && bitmapH < 100 && bitmapW < 100) {
+                                Utilities.blurBitmap(image, (int)bitmapW, (int)bitmapH, image.getRowBytes());
+                            }
                         }
                         if (image != null && FileLoader.getInstance().runtimeHack != null) {
                             FileLoader.getInstance().runtimeHack.trackFree(image.getRowBytes() * image.getHeight());

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

@@ -64,7 +64,7 @@ public class FileLoader {
     private long lastProgressUpdateTime = 0;
     private HashMap<String, Integer> BitmapUseCounts = new HashMap<String, Integer>();
 
-    int lastImageNum;
+    private int lastImageNum = 0;
 
     public static final int FileDidUpload = 10000;
     public static final int FileDidFailUpload = 10001;
@@ -717,15 +717,15 @@ public class FileLoader {
         });
     }
 
-    public Bitmap getImageFromMemory(TLRPC.FileLocation url, ImageReceiver imageView, String filter, boolean cancel) {
-        return getImageFromMemory(url, null, imageView, filter, cancel);
+    public Bitmap getImageFromMemory(TLRPC.FileLocation url, ImageReceiver imageView, String filter) {
+        return getImageFromMemory(url, null, imageView, filter);
     }
 
-    public Bitmap getImageFromMemory(String url, ImageReceiver imageView, String filter, boolean cancel) {
-        return getImageFromMemory(null, url, imageView, filter, cancel);
+    public Bitmap getImageFromMemory(String url, ImageReceiver imageView, String filter) {
+        return getImageFromMemory(null, url, imageView, filter);
     }
 
-    public Bitmap getImageFromMemory(TLRPC.FileLocation url, String httpUrl, ImageReceiver imageView, String filter, boolean cancel) {
+    public Bitmap getImageFromMemory(TLRPC.FileLocation url, String httpUrl, ImageReceiver imageView, String filter) {
         if (url == null && httpUrl == null) {
             return null;
         }
@@ -739,11 +739,7 @@ public class FileLoader {
             key += "@" + filter;
         }
 
-        Bitmap img = imageFromKey(key);
-        if (imageView != null && img != null && cancel) {
-            cancelLoadingForImageView(imageView);
-        }
-        return img;
+        return imageFromKey(key);
     }
 
     private void performReplace(String oldKey, String newKey) {

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

@@ -439,6 +439,7 @@ public class TLClassStore {
         classStore.put(TLRPC.TL_decryptedMessageMediaAudio_old.constructor, TLRPC.TL_decryptedMessageMediaAudio_old.class);
         classStore.put(TLRPC.TL_audio_old.constructor, TLRPC.TL_audio_old.class);
         classStore.put(TLRPC.TL_video_old.constructor, TLRPC.TL_video_old.class);
+        classStore.put(TLRPC.TL_messageActionCreatedBroadcastList.constructor, TLRPC.TL_messageActionCreatedBroadcastList.class);
     }
 
     static TLClassStore store = null;

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

@@ -8996,6 +8996,17 @@ public class TLRPC {
         }
     }
 
+    public static class TL_messageActionCreatedBroadcastList extends MessageAction {
+        public static int constructor = 0x55555557;
+
+        public void readParams(AbsSerializedData stream) {
+        }
+
+        public void serializeToStream(AbsSerializedData stream) {
+            stream.writeInt32(constructor);
+        }
+    }
+
     public static class TL_documentEncrypted extends TL_document {
         public static int constructor = 0x55555556;
 

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

@@ -24,6 +24,7 @@ public class UserConfig {
     public static String pushString = "";
     public static int lastSendMessageId = -210000;
     public static int lastLocalId = -210000;
+    public static int lastBroadcastId = -1;
     public static String contactsHash = "";
     public static String importHash = "";
     private final static Integer sync = 1;
@@ -56,6 +57,7 @@ public class UserConfig {
                 editor.putString("importHash", importHash);
                 editor.putBoolean("saveIncomingPhotos", saveIncomingPhotos);
                 editor.putInt("contactsVersion", contactsVersion);
+                editor.putInt("lastBroadcastId", lastBroadcastId);
                 editor.putBoolean("registeredForInternalPush", registeredForInternalPush);
                 if (currentUser != null) {
                     if (withFile) {
@@ -174,6 +176,7 @@ public class UserConfig {
                 importHash = preferences.getString("importHash", "");
                 saveIncomingPhotos = preferences.getBoolean("saveIncomingPhotos", false);
                 contactsVersion = preferences.getInt("contactsVersion", 0);
+                lastBroadcastId = preferences.getInt("lastBroadcastId", -1);
                 registeredForInternalPush = preferences.getBoolean("registeredForInternalPush", false);
                 String user = preferences.getString("user", null);
                 if (user != null) {
@@ -196,6 +199,7 @@ public class UserConfig {
         lastLocalId = -210000;
         lastSendMessageId = -210000;
         contactsVersion = 1;
+        lastBroadcastId = -1;
         saveIncomingPhotos = false;
         saveConfig(true);
     }

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

@@ -132,6 +132,7 @@ public class Utilities {
 
     public native static long doPQNative(long _what);
     public native static void loadBitmap(String path, int[] bitmap, int scale, int format, int width, int height);
+    public native static void blurBitmap(Object bitmap, int width, int height, int stride);
     private native static void aesIgeEncryption(ByteBuffer buffer, byte[] key, byte[] iv, boolean encrypt, int offset, int length);
 
     public static void aesIgeEncryption(ByteBuffer buffer, byte[] key, byte[] iv, boolean encrypt, boolean changeIv, int offset, int length) {
@@ -139,6 +140,9 @@ public class Utilities {
     }
 
     public static Integer parseInt(String value) {
+        if (value == null) {
+            return 0;
+        }
         Integer val = 0;
         try {
             Matcher matcher = pattern.matcher(value);
@@ -548,7 +552,7 @@ public class Utilities {
     }
 
     public static int getGroupAvatarForId(int id) {
-        return arrGroupsAvatars[getColorIndex(-id)];
+        return arrGroupsAvatars[getColorIndex(-Math.abs(id))];
     }
 
     public static String MD5(String md5) {

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

@@ -63,6 +63,10 @@ public class MessageObject {
     public ArrayList<TextLayoutBlock> textLayoutBlocks;
 
     public MessageObject(TLRPC.Message message, AbstractMap<Integer, TLRPC.User> users) {
+        this(message, users, 1);
+    }
+
+    public MessageObject(TLRPC.Message message, AbstractMap<Integer, TLRPC.User> users, int preview) {
         if (textPaint == null) {
             textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
             textPaint.setColor(0xff000000);
@@ -136,7 +140,7 @@ public class MessageObject {
                 } else if (message.action instanceof TLRPC.TL_messageActionChatEditPhoto) {
                     photoThumbs = new ArrayList<PhotoObject>();
                     for (TLRPC.PhotoSize size : message.action.photo.sizes) {
-                        photoThumbs.add(new PhotoObject(size));
+                        photoThumbs.add(new PhotoObject(size, preview));
                     }
                     if (isFromMe()) {
                         messageText = LocaleController.getString("ActionYouChangedPhoto", R.string.ActionYouChangedPhoto);
@@ -232,13 +236,15 @@ public class MessageObject {
                             }
                         }
                     }
+                } else if (message.action instanceof TLRPC.TL_messageActionCreatedBroadcastList) {
+                    messageText = LocaleController.formatString("YouCreatedBroadcastList", R.string.YouCreatedBroadcastList);
                 }
             }
         } else if (message.media != null && !(message.media instanceof TLRPC.TL_messageMediaEmpty)) {
             if (message.media instanceof TLRPC.TL_messageMediaPhoto) {
                 photoThumbs = new ArrayList<PhotoObject>();
                 for (TLRPC.PhotoSize size : message.media.photo.sizes) {
-                    PhotoObject obj = new PhotoObject(size);
+                    PhotoObject obj = new PhotoObject(size, preview);
                     photoThumbs.add(obj);
                     if (imagePreview == null && obj.image != null) {
                         imagePreview = obj.image;
@@ -247,7 +253,7 @@ public class MessageObject {
                 messageText = LocaleController.getString("AttachPhoto", R.string.AttachPhoto);
             } else if (message.media instanceof TLRPC.TL_messageMediaVideo) {
                 photoThumbs = new ArrayList<PhotoObject>();
-                PhotoObject obj = new PhotoObject(message.media.video.thumb);
+                PhotoObject obj = new PhotoObject(message.media.video.thumb, preview);
                 photoThumbs.add(obj);
                 if (imagePreview == null && obj.image != null) {
                     imagePreview = obj.image;
@@ -262,7 +268,7 @@ public class MessageObject {
             } else if (message.media instanceof TLRPC.TL_messageMediaDocument) {
                 if (!(message.media.document.thumb instanceof TLRPC.TL_photoSizeEmpty)) {
                     photoThumbs = new ArrayList<PhotoObject>();
-                    PhotoObject obj = new PhotoObject(message.media.document.thumb);
+                    PhotoObject obj = new PhotoObject(message.media.document.thumb, preview);
                     photoThumbs.add(obj);
                 }
                 messageText = LocaleController.getString("AttachDocument", R.string.AttachDocument);

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

@@ -13,6 +13,7 @@ import android.graphics.BitmapFactory;
 
 import org.telegram.messenger.TLRPC;
 import org.telegram.messenger.FileLoader;
+import org.telegram.messenger.Utilities;
 
 import java.util.ArrayList;
 
@@ -20,18 +21,23 @@ public class PhotoObject {
     public TLRPC.PhotoSize photoOwner;
     public Bitmap image;
 
-    public PhotoObject(TLRPC.PhotoSize photo) {
+    public PhotoObject(TLRPC.PhotoSize photo, int preview) {
         photoOwner = photo;
 
-        if (photo instanceof TLRPC.TL_photoCachedSize) {
+        if (preview != 0 && photo instanceof TLRPC.TL_photoCachedSize) {
             BitmapFactory.Options opts = new BitmapFactory.Options();
-            opts.inPreferredConfig = Bitmap.Config.RGB_565;
+            opts.inPreferredConfig = Bitmap.Config.ARGB_8888;
             opts.inDither = false;
             opts.outWidth = photo.w;
             opts.outHeight = photo.h;
             image = BitmapFactory.decodeByteArray(photoOwner.bytes, 0, photoOwner.bytes.length, opts);
-            if (image != null && FileLoader.getInstance().runtimeHack != null) {
-                FileLoader.getInstance().runtimeHack.trackFree(image.getRowBytes() * image.getHeight());
+            if (image != null) {
+                if (preview == 2) {
+                    Utilities.blurBitmap(image, image.getWidth(), image.getHeight(), image.getRowBytes());
+                }
+                if (FileLoader.getInstance().runtimeHack != null) {
+                    FileLoader.getInstance().runtimeHack.trackFree(image.getRowBytes() * image.getHeight());
+                }
             }
         }
     }

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

@@ -31,7 +31,7 @@ import org.telegram.objects.PhotoObject;
 import org.telegram.ui.PhotoViewer;
 import org.telegram.ui.Views.GifDrawable;
 import org.telegram.ui.Views.ImageReceiver;
-import org.telegram.ui.Views.ProgressView;
+import org.telegram.ui.Views.RoundProgressView;
 
 import java.io.File;
 import java.util.Locale;
@@ -45,7 +45,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
     private static Drawable placeholderInDrawable;
     private static Drawable placeholderOutDrawable;
     private static Drawable videoIconDrawable;
-    private static Drawable[][] buttonStatesDrawables = new Drawable[4][2];
+    private static Drawable[] buttonStatesDrawables = new Drawable[4];
     private static TextPaint infoPaint;
     private static MessageObject lastDownloadedGifMessage = null;
 
@@ -57,10 +57,11 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
     private String currentUrl;
     private String currentPhotoFilter;
     private ImageReceiver photoImage;
-    private ProgressView progressView;
+    private RoundProgressView progressView;
     public int downloadPhotos = 0;
     private boolean progressVisible = false;
     private boolean photoNotSet = false;
+    private boolean cancelLoading = false;
 
     private int TAG;
 
@@ -83,14 +84,10 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
         if (placeholderInDrawable == null) {
             placeholderInDrawable = getResources().getDrawable(R.drawable.photo_placeholder_in);
             placeholderOutDrawable = getResources().getDrawable(R.drawable.photo_placeholder_out);
-            buttonStatesDrawables[0][0] = getResources().getDrawable(R.drawable.photoload);
-            buttonStatesDrawables[0][1] = getResources().getDrawable(R.drawable.photoload_pressed);
-            buttonStatesDrawables[1][0] = getResources().getDrawable(R.drawable.photocancel);
-            buttonStatesDrawables[1][1] = getResources().getDrawable(R.drawable.photocancel_pressed);
-            buttonStatesDrawables[2][0] = getResources().getDrawable(R.drawable.photogif);
-            buttonStatesDrawables[2][1] = getResources().getDrawable(R.drawable.photogif_pressed);
-            buttonStatesDrawables[3][0] = getResources().getDrawable(R.drawable.playvideo);
-            buttonStatesDrawables[3][1] = getResources().getDrawable(R.drawable.playvideo_pressed);
+            buttonStatesDrawables[0] = getResources().getDrawable(R.drawable.photoload);
+            buttonStatesDrawables[1] = getResources().getDrawable(R.drawable.photocancel);
+            buttonStatesDrawables[2] = getResources().getDrawable(R.drawable.photogif);
+            buttonStatesDrawables[3] = getResources().getDrawable(R.drawable.playvideo);
             videoIconDrawable = getResources().getDrawable(R.drawable.ic_video);
 
             infoPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
@@ -102,8 +99,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
 
         photoImage = new ImageReceiver();
         photoImage.parentView = this;
-        progressView = new ProgressView();
-        progressView.setProgressColors(0x802a2a2a, 0xffffffff);
+        progressView = new RoundProgressView();
     }
 
     public void clearGifImage() {
@@ -225,6 +221,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
 
     private void didPressedButton() {
         if (buttonState == 0) {
+            cancelLoading = false;
             if (currentMessageObject.type == 1) {
                 if (currentMessageObject.imagePreview != null) {
                     photoImage.setImage(currentPhotoObject.photoOwner.location, currentPhotoFilter, new BitmapDrawable(currentMessageObject.imagePreview), currentPhotoObject.photoOwner.size);
@@ -246,6 +243,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
                     delegate.didPressedCancelSendButton(this);
                 }
             } else {
+                cancelLoading = true;
                 if (currentMessageObject.type == 1) {
                     FileLoader.getInstance().cancelLoadingForImageView(photoImage);
                 } else if (currentMessageObject.type == 8) {
@@ -304,6 +302,7 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
     public void setMessageObject(MessageObject messageObject) {
         if (currentMessageObject != messageObject || isPhotoDataChanged(messageObject) || isUserDataChanged()) {
             super.setMessageObject(messageObject);
+            cancelLoading = false;
 
             progressVisible = false;
             buttonState = -1;
@@ -395,6 +394,9 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
                     photoHeight = h;
                     backgroundWidth = w + AndroidUtilities.dp(12);
                     currentPhotoFilter = String.format(Locale.US, "%d_%d", (int) (w / AndroidUtilities.density), (int) (h / AndroidUtilities.density));
+                    if (messageObject.photoThumbs.size() > 1) {
+                        currentPhotoFilter += "_b";
+                    }
 
                     if (currentPhotoObject.image != null) {
                         photoImage.setImageBitmap(currentPhotoObject.image);
@@ -485,20 +487,16 @@ 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 == 1 || downloadPhotos == 2 && !ConnectionsManager.isConnectedToWiFi()) {
+                    if (cancelLoading || currentMessageObject.type != 1 || downloadPhotos == 1 || downloadPhotos == 2 && !ConnectionsManager.isConnectedToWiFi()) {
                         buttonState = 0;
                         progressVisible = false;
                     } else {
-                        buttonState = -1;
+                        buttonState = 1;
                         progressVisible = true;
                     }
                     progressView.setProgress(0);
                 } else {
-                    if (currentMessageObject.type != 1 || downloadPhotos == 1 || downloadPhotos == 2 && !ConnectionsManager.isConnectedToWiFi()) {
-                        buttonState = 1;
-                    } else {
-                        buttonState = -1;
-                    }
+                    buttonState = 1;
                     progressVisible = true;
                     Float progress = FileLoader.getInstance().fileProgresses.get(fileName);
                     if (progress != null) {
@@ -544,13 +542,10 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
         photoImage.imageW = photoWidth;
         photoImage.imageH = photoHeight;
 
-        progressView.width = timeX - photoImage.imageX - AndroidUtilities.dpf(23.0f);
-        progressView.height = AndroidUtilities.dp(3);
-        progressView.progressHeight = AndroidUtilities.dp(3);
-
         int size = AndroidUtilities.dp(44);
         buttonX = (int)(photoImage.imageX + (photoWidth - size) / 2.0f);
         buttonY = (int)(photoImage.imageY + (photoHeight - size) / 2.0f);
+        progressView.rect.set(buttonX + AndroidUtilities.dp(2), buttonY + AndroidUtilities.dp(2), buttonX + AndroidUtilities.dp(42), buttonY + AndroidUtilities.dp(42));
     }
 
     @Override
@@ -566,22 +561,16 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
             drawTime = photoImage.getVisible();
         }
 
-        if (progressVisible) {
-            setDrawableBounds(mediaBackgroundDrawable, photoImage.imageX + AndroidUtilities.dp(4), layoutHeight - AndroidUtilities.dpf(27.5f), progressView.width + AndroidUtilities.dp(12), AndroidUtilities.dpf(16.5f));
-            mediaBackgroundDrawable.draw(canvas);
-
-            canvas.save();
-            canvas.translate(photoImage.imageX + AndroidUtilities.dp(10), layoutHeight - AndroidUtilities.dpf(21.0f));
-            progressView.draw(canvas);
-            canvas.restore();
-        }
-
         if (buttonState >= 0 && buttonState < 4) {
-            Drawable currentButtonDrawable = buttonStatesDrawables[buttonState][buttonPressed];
+            Drawable currentButtonDrawable = buttonStatesDrawables[buttonState];
             setDrawableBounds(currentButtonDrawable, buttonX, buttonY);
             currentButtonDrawable.draw(canvas);
         }
 
+        if (progressVisible) {
+            progressView.draw(canvas);
+        }
+
         if (infoLayout != null && (buttonState == 1 || buttonState == 0 || buttonState == 3)) {
             setDrawableBounds(mediaBackgroundDrawable, photoImage.imageX + AndroidUtilities.dp(4), photoImage.imageY + AndroidUtilities.dp(4), infoWidth + AndroidUtilities.dp(8) + infoOffset, AndroidUtilities.dpf(16.5f));
             mediaBackgroundDrawable.draw(canvas);

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

@@ -46,6 +46,7 @@ public class DialogCell extends BaseCell {
     private static Drawable lockDrawable;
     private static Drawable countDrawable;
     private static Drawable groupDrawable;
+    private static Drawable broadcastDrawable;
 
     private TLRPC.TL_dialog currentDialog;
     private ImageReceiver avatarImage;
@@ -130,6 +131,10 @@ public class DialogCell extends BaseCell {
             groupDrawable = getResources().getDrawable(R.drawable.grouplist);
         }
 
+        if (broadcastDrawable == null) {
+            broadcastDrawable = getResources().getDrawable(R.drawable.broadcast);
+        }
+
         if (avatarImage == null) {
             avatarImage = new ImageReceiver();
             avatarImage.parentView = this;
@@ -227,9 +232,14 @@ public class DialogCell extends BaseCell {
                 user = MessagesController.getInstance().users.get(lower_id);
             }
         } else {
-            encryptedChat = MessagesController.getInstance().encryptedChats.get((int)(currentDialog.id >> 32));
-            if (encryptedChat != null) {
-                user = MessagesController.getInstance().users.get(encryptedChat.user_id);
+            int high_id = (int)(currentDialog.id >> 32);
+            if (high_id > 0) {
+                encryptedChat = MessagesController.getInstance().encryptedChats.get(high_id);
+                if (encryptedChat != null) {
+                    user = MessagesController.getInstance().users.get(encryptedChat.user_id);
+                }
+            } else {
+                chat = MessagesController.getInstance().chats.get(high_id);
             }
         }
 
@@ -274,6 +284,9 @@ public class DialogCell extends BaseCell {
         } else if (cellLayout.drawNameGroup) {
             setDrawableBounds(groupDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop);
             groupDrawable.draw(canvas);
+        } else if (cellLayout.drawNameBroadcast) {
+            setDrawableBounds(broadcastDrawable, cellLayout.nameLockLeft, cellLayout.nameLockTop);
+            broadcastDrawable.draw(canvas);
         }
 
         canvas.save();
@@ -328,6 +341,7 @@ public class DialogCell extends BaseCell {
         private StaticLayout nameLayout;
         private boolean drawNameLock;
         private boolean drawNameGroup;
+        private boolean drawNameBroadcast;
         private int nameLockLeft;
         private int nameLockTop;
 
@@ -372,9 +386,12 @@ public class DialogCell extends BaseCell {
             TextPaint currentMessagePaint = messagePaint;
             boolean checkMessage = true;
 
+            drawNameGroup = false;
+            drawNameBroadcast = false;
+            drawNameLock = false;
+
             if (encryptedChat != null) {
                 drawNameLock = true;
-                drawNameGroup = false;
                 nameLockTop = AndroidUtilities.dp(13);
                 if (!LocaleController.isRTL) {
                     nameLockLeft = AndroidUtilities.dp(77);
@@ -384,19 +401,21 @@ public class DialogCell extends BaseCell {
                     nameLeft = AndroidUtilities.dp(14);
                 }
             } else {
-                drawNameLock = false;
                 if (chat != null) {
-                    drawNameGroup = true;
+                    if (chat.id < 0) {
+                        drawNameBroadcast = true;
+                    } else {
+                        drawNameGroup = true;
+                    }
                     nameLockTop = AndroidUtilities.dp(14);
                     if (!LocaleController.isRTL) {
                         nameLockLeft = AndroidUtilities.dp(77);
-                        nameLeft = AndroidUtilities.dp(81) + groupDrawable.getIntrinsicWidth();
+                        nameLeft = AndroidUtilities.dp(81) + (drawNameGroup ? groupDrawable.getIntrinsicWidth() : broadcastDrawable.getIntrinsicWidth());
                     } else {
-                        nameLockLeft = width - AndroidUtilities.dp(77) - groupDrawable.getIntrinsicWidth();
+                        nameLockLeft = width - AndroidUtilities.dp(77) - (drawNameGroup ? groupDrawable.getIntrinsicWidth() : broadcastDrawable.getIntrinsicWidth());
                         nameLeft = AndroidUtilities.dp(14);
                     }
                 } else {
-                    drawNameGroup = false;
                     if (!LocaleController.isRTL) {
                         nameLeft = AndroidUtilities.dp(77);
                     } else {
@@ -461,7 +480,7 @@ public class DialogCell extends BaseCell {
                         messageString = message.messageText;
                         currentMessagePaint = messagePrintingPaint;
                     } else {
-                        if (chat != null) {
+                        if (chat != null && chat.id > 0) {
                             String name = "";
                             if (message.isFromMe()) {
                                 name = LocaleController.getString("FromYou", R.string.FromYou);
@@ -505,7 +524,7 @@ public class DialogCell extends BaseCell {
                     }
                 }
 
-                if (message.isFromMe()) {
+                if (message.isFromMe() && message.isOut()) {
                     if (message.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SENDING) {
                         drawCheck1 = false;
                         drawCheck2 = false;
@@ -579,6 +598,8 @@ public class DialogCell extends BaseCell {
                 nameWidth -= AndroidUtilities.dp(4) + lockDrawable.getIntrinsicWidth();
             } else if (drawNameGroup) {
                 nameWidth -= AndroidUtilities.dp(4) + groupDrawable.getIntrinsicWidth();
+            } else if (drawNameBroadcast) {
+                nameWidth -= AndroidUtilities.dp(4) + broadcastDrawable.getIntrinsicWidth();
             }
             if (drawClock) {
                 int w = clockDrawable.getIntrinsicWidth() + AndroidUtilities.dp(2);

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

@@ -212,7 +212,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 }
             }
             MessagesController.getInstance().loadChatInfo(currentChat.id);
-            dialog_id = -chatId;
+            if (chatId > 0) {
+                dialog_id = -chatId;
+            } else {
+                dialog_id = ((long)chatId) << 32;
+            }
         } else if (userId != 0) {
             currentUser = MessagesController.getInstance().users.get(userId);
             if (currentUser == null) {
@@ -528,6 +532,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
 
             if (currentEncryptedChat != null) {
                 actionBarLayer.setTitleIcon(R.drawable.ic_lock_white, AndroidUtilities.dp(4));
+            } else if (currentChat != null && currentChat.id < 0) {
+                actionBarLayer.setTitleIcon(R.drawable.broadcast2, AndroidUtilities.dp(4));
             }
 
             ActionBarMenu menu = actionBarLayer.createMenu();
@@ -1045,7 +1051,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
 
     private int getMessageType(MessageObject messageObject) {
         if (currentEncryptedChat == null) {
-            if (messageObject.messageOwner.id <= 0 && messageObject.isOut()) {
+            boolean isBroadcastError = (int)dialog_id == 0 && messageObject.messageOwner.id <= 0 && messageObject.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SEND_ERROR;
+            if ((int)dialog_id != 0 && messageObject.messageOwner.id <= 0 && messageObject.isOut() || isBroadcastError) {
                 if (messageObject.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SEND_ERROR) {
                     if (!(messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) {
                         return 0;
@@ -1771,7 +1778,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                     if (messArr.size() != count) {
                         if (isCache) {
                             cacheEndReaced = true;
-                            if (currentEncryptedChat != null) {
+                            if ((int)dialog_id == 0) {
                                 endReached = true;
                             }
                         } else {
@@ -2897,24 +2904,24 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
 
     private void forwardSelectedMessages(long did, boolean fromMyName) {
         if (forwaringMessage != null) {
-            if (forwaringMessage.messageOwner.id > 0) {
-                if (!fromMyName) {
+            if (!fromMyName) {
+                if (forwaringMessage.messageOwner.id > 0) {
                     MessagesController.getInstance().sendMessage(forwaringMessage, did);
-                } else {
-                    processForwardFromMe(forwaringMessage, did);
                 }
+            } else {
+                processForwardFromMe(forwaringMessage, did);
             }
             forwaringMessage = null;
         } else {
             ArrayList<Integer> ids = new ArrayList<Integer>(selectedMessagesIds.keySet());
             Collections.sort(ids);
             for (Integer id : ids) {
-                if (id > 0) {
-                    if (!fromMyName) {
+                if (!fromMyName) {
+                    if (id > 0) {
                         MessagesController.getInstance().sendMessage(selectedMessagesIds.get(id), did);
-                    } else {
-                        processForwardFromMe(selectedMessagesIds.get(id), did);
                     }
+                } else {
+                    processForwardFromMe(selectedMessagesIds.get(id), did);
                 }
             }
             selectedMessagesCanCopyIds.clear();
@@ -2925,7 +2932,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
     @Override
     public void didSelectDialog(MessagesActivity activity, long did, boolean param) {
         if (dialog_id != 0 && (forwaringMessage != null || !selectedMessagesIds.isEmpty())) {
-
+            if ((int)dialog_id == 0 && currentEncryptedChat == null) {
+                param = true;
+            }
             if (did != dialog_id) {
                 int lower_part = (int)did;
                 if (lower_part != 0) {

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

@@ -90,6 +90,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
     private TextView emptyTextView;
     private EditText userSelectEditText;
     private boolean ignoreChange = false;
+    private boolean isBroadcast = false;
 
     private HashMap<Integer, XImageSpan> selectedContacts =  new HashMap<Integer, XImageSpan>();
     private ArrayList<XImageSpan> allSpans = new ArrayList<XImageSpan>();
@@ -105,6 +106,15 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
 
     private final static int done_button = 1;
 
+    public GroupCreateActivity() {
+        super();
+    }
+
+    public GroupCreateActivity(Bundle args) {
+        super(args);
+        isBroadcast = args.getBoolean("broadcast", false);
+    }
+
     @Override
     public boolean onFragmentCreate() {
         NotificationCenter.getInstance().addObserver(this, MessagesController.contactsDidLoaded);
@@ -126,7 +136,11 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
         if (fragmentView == null) {
             actionBarLayer.setDisplayHomeAsUpEnabled(true, R.drawable.ic_ab_back);
             actionBarLayer.setBackOverlay(R.layout.updating_state_layout);
-            actionBarLayer.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup));
+            if (isBroadcast) {
+                actionBarLayer.setTitle(LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList));
+            } else {
+                actionBarLayer.setTitle(LocaleController.getString("NewGroup", R.string.NewGroup));
+            }
             actionBarLayer.setSubtitle(LocaleController.formatString("MembersCount", R.string.MembersCount, selectedContacts.size(), 200));
 
             actionBarLayer.setActionBarMenuOnItemClick(new ActionBarLayer.ActionBarMenuOnItemClick() {
@@ -140,6 +154,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
                             result.addAll(selectedContacts.keySet());
                             Bundle args = new Bundle();
                             args.putIntegerArrayList("result", result);
+                            args.putBoolean("broadcast", isBroadcast);
                             presentFragment(new GroupCreateFinalActivity(args));
                         }
                     }

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

@@ -458,7 +458,12 @@ public class LaunchActivity extends ActionBarActivity implements NotificationCen
                     args.putInt("chat_id", -lower_part);
                 }
             } else {
-                args.putInt("enc_id", (int)(dialog_id >> 32));
+                int high_id = (int)(dialog_id >> 32);
+                if (high_id > 0) {
+                    args.putInt("enc_id", high_id);
+                } else {
+                    args.putInt("chat_id", high_id);
+                }
             }
             ChatActivity fragment = new ChatActivity(args);
             presentFragment(fragment, true);

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

@@ -74,6 +74,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
     private final static int messages_list_menu_new_secret_chat = 3;
     private final static int messages_list_menu_contacts = 4;
     private final static int messages_list_menu_settings = 5;
+    private final static int messages_list_menu_new_broadcast = 6;
 
     public static interface MessagesActivityDelegate {
         public abstract void didSelectDialog(MessagesActivity fragment, long dialog_id, boolean param);
@@ -175,6 +176,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
                 ActionBarMenuItem item = menu.addItem(0, R.drawable.ic_ab_other);
                 item.addSubItem(messages_list_menu_new_chat, LocaleController.getString("NewGroup", R.string.NewGroup), 0);
                 item.addSubItem(messages_list_menu_new_secret_chat, LocaleController.getString("NewSecretChat", R.string.NewSecretChat), 0);
+                item.addSubItem(messages_list_menu_new_broadcast, LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList), 0);
                 item.addSubItem(messages_list_menu_contacts, LocaleController.getString("Contacts", R.string.Contacts), 0);
                 item.addSubItem(messages_list_menu_settings, LocaleController.getString("Settings", R.string.Settings), 0);
             }
@@ -206,6 +208,10 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
                         if (onlySelect) {
                             finishFragment();
                         }
+                    } else if (id == messages_list_menu_new_broadcast) {
+                        Bundle args = new Bundle();
+                        args.putBoolean("broadcast", true);
+                        presentFragment(new GroupCreateActivity(args));
                     }
                 }
             });
@@ -289,7 +295,12 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
                                 args.putInt("chat_id", -lower_part);
                             }
                         } else {
-                            args.putInt("enc_id", (int)(dialog_id >> 32));
+                            int high_id = (int)(dialog_id >> 32);
+                            if (high_id > 0) {
+                                args.putInt("enc_id", high_id);
+                            } else {
+                                args.putInt("chat_id", high_id);
+                            }
                         }
                         presentFragment(new ChatActivity(args));
                     }
@@ -497,13 +508,21 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter
                     builder.setMessage(LocaleController.formatStringSimple(selectAlertString, chat.title));
                 }
             } else {
-                int chat_id = (int)(dialog_id >> 32);
-                TLRPC.EncryptedChat chat = MessagesController.getInstance().encryptedChats.get(chat_id);
-                TLRPC.User user = MessagesController.getInstance().users.get(chat.user_id);
-                if (user == null) {
-                    return;
+                int high_id = (int)(dialog_id >> 32);
+                if (high_id > 0) {
+                    TLRPC.EncryptedChat chat = MessagesController.getInstance().encryptedChats.get(high_id);
+                    TLRPC.User user = MessagesController.getInstance().users.get(chat.user_id);
+                    if (user == null) {
+                        return;
+                    }
+                    builder.setMessage(LocaleController.formatStringSimple(selectAlertString, Utilities.formatName(user.first_name, user.last_name)));
+                } else {
+                    TLRPC.Chat chat = MessagesController.getInstance().chats.get(high_id);
+                    if (chat == null) {
+                        return;
+                    }
+                    builder.setMessage(LocaleController.formatStringSimple(selectAlertString, chat.title));
                 }
-                builder.setMessage(LocaleController.formatStringSimple(selectAlertString, Utilities.formatName(user.first_name, user.last_name)));
             }
             CheckBox checkBox = null;
             /*if (delegate instanceof ChatActivity) {

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

@@ -874,9 +874,6 @@ public class PopupNotificationActivity extends Activity implements NotificationC
             chatActivityEnterView.setFieldFocused(false);
         }
         ConnectionsManager.getInstance().setAppPaused(true, false);
-        if (wakeLock.isHeld()) {
-            wakeLock.release();
-        }
     }
 
     @Override

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

@@ -568,6 +568,9 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
                                 } catch (Exception e) {
                                     FileLog.e("tmessages", e);
                                 }
+                                ArrayList<TLRPC.User> users = new ArrayList<TLRPC.User>();
+                                users.add(res.user);
+                                MessagesStorage.getInstance().putUsersAndChats(users, null, true, true);
                                 MessagesController.getInstance().users.put(res.user.id, res.user);
                                 Bundle args = new Bundle();
                                 args.putInt("user_id", res.user.id);

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

@@ -406,7 +406,8 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
     }
 
     public void updateServerNotificationsSettings(boolean group) {
-        SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
+        //disable global settings sync
+        /*SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
         TLRPC.TL_account_updateNotifySettings req = new TLRPC.TL_account_updateNotifySettings();
         req.settings = new TLRPC.TL_inputPeerNotifySettings();
         req.settings.sound = "default";
@@ -425,7 +426,7 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
             public void run(TLObject response, TLRPC.TL_error error) {
 
             }
-        });
+        });*/
     }
 
     @Override

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

@@ -467,18 +467,15 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C
         List<Track> tracks = movie.getTracks();
         movie.setTracks(new LinkedList<Track>());
 
-        double startTime = videoTimelineView.getLeftProgress() * videoPlayer.getDuration() / 1000.0;
-        double endTime = videoTimelineView.getRightProgress() * videoPlayer.getDuration() / 1000.0;
+        double startTime = 0;
+        double endTime = 0;
 
-        boolean timeCorrected = false;
         for (Track track : tracks) {
             if (track.getSyncSamples() != null && track.getSyncSamples().length > 0) {
-                if (timeCorrected) {
-                    throw new RuntimeException("The startTime has already been corrected by another track with SyncSample. Not Supported.");
-                }
-                startTime = correctTimeToSyncSample(track, startTime, false);
-                endTime = correctTimeToSyncSample(track, endTime, true);
-                timeCorrected = true;
+                double duration = (double)track.getDuration() / (double)track.getTrackMetaData().getTimescale();
+                startTime = correctTimeToSyncSample(track, videoTimelineView.getLeftProgress() * duration, false);
+                endTime = videoTimelineView.getRightProgress() * duration;
+                break;
             }
         }
 
@@ -486,7 +483,7 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C
             long currentSample = 0;
             double currentTime = 0;
             double lastTime = 0;
-            long startSample = -1;
+            long startSample = 0;
             long endSample = -1;
 
             for (int i = 0; i < track.getSampleDurations().length; i++) {
@@ -503,9 +500,7 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C
             }
             movie.addTrack(new CroppedTrack(track, startSample, endSample));
         }
-        long start1 = System.currentTimeMillis();
         Container out = new DefaultMp4Builder().build(movie);
-        long start2 = System.currentTimeMillis();
 
         String fileName = Integer.MIN_VALUE + "_" + UserConfig.lastLocalId + ".mp4";
         UserConfig.lastLocalId--;
@@ -524,6 +519,11 @@ public class VideoEditorActivity extends BaseFragment implements SurfaceHolder.C
         }
     }
 
+//    private void startEncodeVideo() {
+//        MediaExtractor mediaExtractor = new MediaExtractor();
+//        mediaExtractor.s
+//    }
+
     private static double correctTimeToSyncSample(Track track, double cutHere, boolean next) {
         double[] timeOfSyncSamples = new double[track.getSyncSamples().length];
         long currentSample = 0;

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

@@ -46,7 +46,7 @@ public class GifDrawable extends Drawable implements Animatable, MediaController
     private static native void renderFrame(int[] pixels, int gifFileInPtr, int[] metaData);
     private static native int openFile(int[] metaData, String filePath);
     private static native void free(int gifFileInPtr);
-    private static native boolean reset(int gifFileInPtr);
+    private static native void reset(int gifFileInPtr);
     private static native void setSpeedFactor(int gifFileInPtr, float factor);
     private static native String getComment(int gifFileInPtr);
     private static native int getLoopCount(int gifFileInPtr);

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

@@ -75,17 +75,20 @@ public class ImageReceiver {
         if (filter != null) {
             key += "@" + filter;
         }
-        Bitmap img;
+        Bitmap img = null;
         if (currentPath != null) {
             if (currentPath.equals(key)) {
-                return;
+                if (currentImage != null) {
+                    return;
+                } else {
+                    img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter);
+                }
             } else {
-                img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter, true);
+                img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter);
                 recycleBitmap(img);
             }
-        } else {
-            img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter, true);
         }
+        img = FileLoader.getInstance().getImageFromMemory(path, httpUrl, this, filter);
         currentPath = key;
         last_path = path;
         last_httpUrl = httpUrl;

TMessagesProj/src/main/java/org/telegram/ui/Views/RoundProgressView.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.Views;
+
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+
+import org.telegram.android.AndroidUtilities;
+
+public class RoundProgressView {
+    private Paint paint;
+
+    public float currentProgress = 0;
+    public RectF rect = new RectF();
+
+    public RoundProgressView() {
+        paint = new Paint();
+        paint.setColor(0xffffffff);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(AndroidUtilities.dp(1));
+        paint.setAntiAlias(true);
+    }
+
+    public void setProgress(float progress) {
+        currentProgress = progress;
+        if (currentProgress < 0) {
+            currentProgress = 0;
+        } else if (currentProgress > 1) {
+            currentProgress = 1;
+        }
+    }
+
+    public void draw(Canvas canvas) {
+        canvas.drawArc(rect, -90, 360 * currentProgress, false, paint);
+    }
+}

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

@@ -57,6 +57,14 @@
     <string name="HiddenName">الاسم مخفي</string>
     <string name="SelectChat">اختر محادثة</string>
 
+    <!--broadcasts-->
+    <string name="BroadcastList">Broadcast List</string>
+    <string name="NewBroadcastList">New Broadcast List</string>
+    <string name="EnterListName">Enter list name</string>
+    <string name="YouCreatedBroadcastList">You created a broadcast list</string>
+    <string name="AddRecipient">Add Recipient</string>
+    <string name="KickFromBroadcast">Remove from broadcast list</string>
+
     <!--documents view-->
     <string name="SelectFile">اختر ملف</string>
     <string name="FreeOfTotal">متاح %1$s من %2$s</string>

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

@@ -57,6 +57,14 @@
     <string name="HiddenName">Versteckter Name</string>
     <string name="SelectChat">Chat auswählen</string>
 
+    <!--broadcasts-->
+    <string name="BroadcastList">Broadcast List</string>
+    <string name="NewBroadcastList">New Broadcast List</string>
+    <string name="EnterListName">Enter list name</string>
+    <string name="YouCreatedBroadcastList">You created a broadcast list</string>
+    <string name="AddRecipient">Add Recipient</string>
+    <string name="KickFromBroadcast">Remove from broadcast list</string>
+
     <!--documents view-->
     <string name="SelectFile">Datei auswählen</string>
     <string name="FreeOfTotal">Freier Speicher: %1$s von %2$s</string>

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

@@ -57,6 +57,14 @@
     <string name="HiddenName">Nombre oculto</string>
     <string name="SelectChat">Selecciona el chat</string>
 
+    <!--broadcasts-->
+    <string name="BroadcastList">Broadcast List</string>
+    <string name="NewBroadcastList">New Broadcast List</string>
+    <string name="EnterListName">Enter list name</string>
+    <string name="YouCreatedBroadcastList">You created a broadcast list</string>
+    <string name="AddRecipient">Add Recipient</string>
+    <string name="KickFromBroadcast">Remove from broadcast list</string>
+
     <!--documents view-->
     <string name="SelectFile">Seleccionar archivo</string>
     <string name="FreeOfTotal">%1$s de %2$s libres</string>

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

@@ -57,6 +57,14 @@
     <string name="HiddenName">Nome nascosto</string>
     <string name="SelectChat">Seleziona chat</string>
 
+    <!--broadcasts-->
+    <string name="BroadcastList">Broadcast List</string>
+    <string name="NewBroadcastList">New Broadcast List</string>
+    <string name="EnterListName">Enter list name</string>
+    <string name="YouCreatedBroadcastList">You created a broadcast list</string>
+    <string name="AddRecipient">Add Recipient</string>
+    <string name="KickFromBroadcast">Remove from broadcast list</string>
+
     <!--documents view-->
     <string name="SelectFile">Seleziona file</string>
     <string name="FreeOfTotal">Liberi %1$s di %2$s</string>

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

@@ -57,6 +57,14 @@
     <string name="HiddenName">Verborgen naam</string>
     <string name="SelectChat">Kies een gesprek</string>
 
+    <!--broadcasts-->
+    <string name="BroadcastList">Broadcast List</string>
+    <string name="NewBroadcastList">New Broadcast List</string>
+    <string name="EnterListName">Enter list name</string>
+    <string name="YouCreatedBroadcastList">You created a broadcast list</string>
+    <string name="AddRecipient">Add Recipient</string>
+    <string name="KickFromBroadcast">Remove from broadcast list</string>
+
     <!--documents view-->
     <string name="SelectFile">Kies een bestand</string>
     <string name="FreeOfTotal">Vrij: %1$s van %2$s</string>

TMessagesProj/src/main/res/values-pt-rBR/strings.xml

@@ -57,6 +57,14 @@
     <string name="HiddenName">Nome oculto</string>
     <string name="SelectChat">Selecione uma Conversa</string>
 
+    <!--broadcasts-->
+    <string name="BroadcastList">Broadcast List</string>
+    <string name="NewBroadcastList">New Broadcast List</string>
+    <string name="EnterListName">Enter list name</string>
+    <string name="YouCreatedBroadcastList">You created a broadcast list</string>
+    <string name="AddRecipient">Add Recipient</string>
+    <string name="KickFromBroadcast">Remove from broadcast list</string>
+
     <!--documents view-->
     <string name="SelectFile">Selecione um Arquivo</string>
     <string name="FreeOfTotal">Disponível %1$s de %2$s</string>

TMessagesProj/src/main/res/values-pt-rPT/strings.xml

@@ -57,6 +57,14 @@
     <string name="HiddenName">Nome oculto</string>
     <string name="SelectChat">Selecionar chat</string>
 
+    <!--broadcasts-->
+    <string name="BroadcastList">Broadcast List</string>
+    <string name="NewBroadcastList">New Broadcast List</string>
+    <string name="EnterListName">Enter list name</string>
+    <string name="YouCreatedBroadcastList">You created a broadcast list</string>
+    <string name="AddRecipient">Add Recipient</string>
+    <string name="KickFromBroadcast">Remove from broadcast list</string>
+
     <!--documents view-->
     <string name="SelectFile">Selecionar ficheiro</string>
     <string name="FreeOfTotal">%1$s de %2$s livres</string>

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

@@ -57,6 +57,14 @@
     <string name="HiddenName">Hidden Name</string>
     <string name="SelectChat">Select Chat</string>
 
+    <!--broadcasts-->
+    <string name="BroadcastList">Broadcast List</string>
+    <string name="NewBroadcastList">New Broadcast List</string>
+    <string name="EnterListName">Enter list name</string>
+    <string name="YouCreatedBroadcastList">You created a broadcast list</string>
+    <string name="AddRecipient">Add Recipient</string>
+    <string name="KickFromBroadcast">Remove from broadcast list</string>
+
     <!--documents view-->
     <string name="SelectFile">Select File</string>
     <string name="FreeOfTotal">Free %1$s of %2$s</string>
@@ -150,7 +158,7 @@
     <string name="NotificationGroupKickYou">%1$s removed you from the group %2$s</string>
     <string name="NotificationGroupLeftMember">%1$s has left the group %2$s</string>
     <string name="NotificationContactJoined">%1$s joined Telegram!</string>
-    <string name="NotificationUnrecognizedDevice">%1$s,\nWe detected a login into your account from a new device on %2$s\n\nDevice: %3$s\nLocation: %4$s\n\nIf this wasn’t you, you can go to Settings – Terminate all sessions.\n\nThanks,\nThe Telegram Team</string>
+    <string name="NotificationUnrecognizedDevice">%1$s,\nWe detected a login into your account from a new device on %2$s\n\nDevice: %3$s\nLocation: %4$s\n\nIf this wasn\'t you, you can go to Settings - Terminate all sessions.\n\nSincerely,\nThe Telegram Team</string>
     <string name="NotificationContactNewPhoto">%1$s updated profile photo</string>
 
     <!--contacts view-->
@@ -263,19 +271,19 @@
     <string name="Enabled">Enabled</string>
     <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="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>
     <string name="LedColor">LED Color</string>
-    <string name="PopupNotification">Popup Notification</string>
+    <string name="PopupNotification">Popup Notifications</string>
     <string name="NoPopup">No popup</string>
     <string name="OnlyWhenScreenOn">Only when screen "on"</string>
     <string name="OnlyWhenScreenOff">Only when screen "off"</string>
     <string name="AlwaysShowPopup">Always show popup</string>
-    <string name="BadgeNumber">Badge Number</string>
+    <string name="BadgeNumber">Badge Counter</string>
 
     <!--media view-->
     <string name="NoMedia">No shared media yet</string>
@@ -362,8 +370,8 @@
     <string name="InvalidLastName">Invalid last name</string>
     <string name="Loading">Loading...</string>
     <string name="NoPlayerInstalled">You don\'t have a video player, please install one to continue</string>
-    <string name="NoMailInstalled">Please send an email to sms@telegram.org and explain your problem.</string>
-    <string name="NoHandleAppInstalled">You don\'t have any application that can handle with mime type \'%1$s\', please install one to continue</string>
+    <string name="NoMailInstalled">Please send an email to sms@telegram.org and tell us about your problem.</string>
+    <string name="NoHandleAppInstalled">You don\'t have applications that can handle the file type \'%1$s\', please install one to continue</string>
     <string name="InviteUser">This user does not have Telegram yet, send an invitation?</string>
     <string name="AreYouSure">Are you sure?</string>
     <string name="AddContactQ">Add contact?</string>
@@ -371,15 +379,15 @@
     <string name="ForwardMessagesTo">Forward messages to %1$s?</string>
     <string name="DeleteChatQuestion">Delete this chat?</string>
     <string name="SendMessagesTo">Send messages to %1$s?</string>
-    <string name="AreYouSureLogout">Are you sure you want to logout?</string>
+    <string name="AreYouSureLogout">Are you sure you want to log out?</string>
     <string name="AreYouSureSessions">Are you sure you want to terminate all other sessions?</string>
-    <string name="AreYouSureDeleteAndExit">Are you sure you want to delete and leave group?</string>
+    <string name="AreYouSureDeleteAndExit">Are you sure you want to delete and leave the group?</string>
     <string name="AreYouSureDeleteThisChat">Are you sure you want to delete this chat?</string>
-    <string name="AreYouSureShareMyContactInfo">Are you sure that you want to share your contact info?</string>
+    <string name="AreYouSureShareMyContactInfo">Are you sure you want to share your contact info?</string>
     <string name="AreYouSureBlockContact">Are you sure you want to block this contact?</string>
     <string name="AreYouSureUnblockContact">Are you sure you want to unblock this contact?</string>
     <string name="AreYouSureDeleteContact">Are you sure you want to delete this contact?</string>
-    <string name="AreYouSureSecretChat">Are you sure you want to start secret chat?</string>
+    <string name="AreYouSureSecretChat">Are you sure you want to start a secret chat?</string>
     <string name="ForwardFromMyName">forward from my name</string>
 
     <!--Intro view-->