diff --git a/TMessagesProj/config/debug/AndroidManifest.xml b/TMessagesProj/config/debug/AndroidManifest.xml
index 7836674f..dacb8608 100644
--- a/TMessagesProj/config/debug/AndroidManifest.xml
+++ b/TMessagesProj/config/debug/AndroidManifest.xml
@@ -9,14 +9,14 @@
-
-
+
+
-
-
+
+
-
+
@@ -37,7 +37,7 @@
-
+
diff --git a/TMessagesProj/config/foss/AndroidManifest.xml b/TMessagesProj/config/foss/AndroidManifest.xml
index df2d1e24..59b2f53b 100644
--- a/TMessagesProj/config/foss/AndroidManifest.xml
+++ b/TMessagesProj/config/foss/AndroidManifest.xml
@@ -9,7 +9,7 @@
android:label="@string/AppName"
android:theme="@style/Theme.TMessages.Start"
android:name=".ApplicationLoader"
- android:hardwareAccelerated="true"
+ android:hardwareAccelerated="@bool/useHardwareAcceleration"
android:largeHeap="true">
diff --git a/TMessagesProj/config/release/AndroidManifest.xml b/TMessagesProj/config/release/AndroidManifest.xml
index 17c2c245..31c5f085 100644
--- a/TMessagesProj/config/release/AndroidManifest.xml
+++ b/TMessagesProj/config/release/AndroidManifest.xml
@@ -9,14 +9,14 @@
-
-
+
+
-
-
+
+
-
+
@@ -37,7 +37,7 @@
-
+
diff --git a/TMessagesProj/jni/Android.mk b/TMessagesProj/jni/Android.mk
index 88b4e639..ae2c6323 100755
--- a/TMessagesProj/jni/Android.mk
+++ b/TMessagesProj/jni/Android.mk
@@ -104,7 +104,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_PRELINK_MODULE := false
LOCAL_STATIC_LIBRARIES := webp sqlite
-LOCAL_MODULE := tmessages.5
+LOCAL_MODULE := tmessages.6
LOCAL_CFLAGS := -w -std=gnu99 -O2 -DNULL=0 -DSOCKLEN_T=socklen_t -DLOCALE_NOT_USED -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
LOCAL_CFLAGS += -Drestrict='' -D__EMX__ -DOPUS_BUILD -DFIXED_POINT -DUSE_ALLOCA -DHAVE_LRINT -DHAVE_LRINTF -fno-math-errno
LOCAL_CFLAGS += -DANDROID_NDK -DDISABLE_IMPORTGL -fno-strict-aliasing -fprefetch-loop-arrays -DAVOID_TABLES -DANDROID_TILE_BASED_DECODE -DANDROID_ARMV6_IDCT -ffast-math
diff --git a/TMessagesProj/jni/image.c b/TMessagesProj/jni/image.c
index 1532095b..06c5e9f3 100644
--- a/TMessagesProj/jni/image.c
+++ b/TMessagesProj/jni/image.c
@@ -21,6 +21,9 @@ jmethodID jclass_Bitmap_createBitmap;
jclass jclass_Config;
jfieldID jclass_Config_ARGB_8888;
+const uint32_t PGPhotoEnhanceHistogramBins = 256;
+const uint32_t PGPhotoEnhanceSegments = 4;
+
jclass createGlobarRef(JNIEnv *env, jclass class) {
if (class) {
return (*env)->NewGlobalRef(env, class);
@@ -312,6 +315,110 @@ JNIEXPORT void Java_org_telegram_messenger_Utilities_blurBitmap(JNIEnv *env, jcl
AndroidBitmap_unlockPixels(env, bitmap);
}
+JNIEXPORT void Java_org_telegram_messenger_Utilities_calcCDT(JNIEnv *env, jclass class, jobject hsvBuffer, int width, int height, jobject buffer) {
+ float imageWidth = width;
+ float imageHeight = height;
+ float _clipLimit = 1.25f;
+
+ uint32_t totalSegments = PGPhotoEnhanceSegments * PGPhotoEnhanceSegments;
+ uint32_t tileArea = (uint32_t)(floorf(imageWidth / PGPhotoEnhanceSegments) * floorf(imageHeight / PGPhotoEnhanceSegments));
+ uint32_t clipLimit = (uint32_t)max(1, _clipLimit * tileArea / (float) PGPhotoEnhanceHistogramBins);
+ float scale = 255.0f / (float) tileArea;
+
+
+ unsigned char *bytes = (*env)->GetDirectBufferAddress(env, hsvBuffer);
+
+ uint32_t **hist = calloc(totalSegments, sizeof(uint32_t *));
+ uint32_t **cdfs = calloc(totalSegments, sizeof(uint32_t *));
+ uint32_t *cdfsMin = calloc(totalSegments, sizeof(uint32_t));
+ uint32_t *cdfsMax = calloc(totalSegments, sizeof(uint32_t));
+
+ for (uint32_t a = 0; a < totalSegments; a++) {
+ hist[a] = calloc(PGPhotoEnhanceHistogramBins, sizeof(uint32_t));
+ cdfs[a] = calloc(PGPhotoEnhanceHistogramBins, sizeof(uint32_t));
+ }
+
+ float xMul = PGPhotoEnhanceSegments / imageWidth;
+ float yMul = PGPhotoEnhanceSegments / imageHeight;
+
+ for (uint32_t y = 0; y < imageHeight; y++) {
+ uint32_t yOffset = y * width * 4;
+ for (uint32_t x = 0; x < imageWidth; x++) {
+ uint32_t index = x * 4 + yOffset;
+
+ uint32_t tx = (uint32_t)(x * xMul);
+ uint32_t ty = (uint32_t)(y * yMul);
+ uint32_t t = ty * PGPhotoEnhanceSegments + tx;
+
+ hist[t][bytes[index + 2]]++;
+ }
+ }
+
+ for (uint32_t i = 0; i < totalSegments; i++) {
+ if (clipLimit > 0) {
+ uint32_t clipped = 0;
+ for (uint32_t j = 0; j < PGPhotoEnhanceHistogramBins; ++j) {
+ if (hist[i][j] > clipLimit) {
+ clipped += hist[i][j] - clipLimit;
+ hist[i][j] = clipLimit;
+ }
+ }
+
+ uint32_t redistBatch = clipped / PGPhotoEnhanceHistogramBins;
+ uint32_t residual = clipped - redistBatch * PGPhotoEnhanceHistogramBins;
+
+ for (uint32_t j = 0; j < PGPhotoEnhanceHistogramBins; ++j) {
+ hist[i][j] += redistBatch;
+ }
+
+ for (uint32_t j = 0; j < residual; ++j) {
+ hist[i][j]++;
+ }
+ }
+ memcpy(cdfs[i], hist[i], PGPhotoEnhanceHistogramBins * sizeof(uint32_t));
+
+ uint32_t hMin = PGPhotoEnhanceHistogramBins - 1;
+ for (uint32_t j = 0; j < hMin; ++j) {
+ if (cdfs[j] != 0) {
+ hMin = j;
+ }
+ }
+
+ uint32_t cdf = 0;
+ for (uint32_t j = hMin; j < PGPhotoEnhanceHistogramBins; ++j) {
+ cdf += cdfs[i][j];
+ cdfs[i][j] = (uint8_t) min(255, cdf * scale);
+ }
+
+ cdfsMin[i] = cdfs[i][hMin];
+ cdfsMax[i] = cdfs[i][PGPhotoEnhanceHistogramBins - 1];
+ }
+
+ uint32_t resultSize = 4 * PGPhotoEnhanceHistogramBins * totalSegments;
+ uint32_t resultBytesPerRow = 4 * PGPhotoEnhanceHistogramBins;
+
+ unsigned char *result = (*env)->GetDirectBufferAddress(env, buffer);
+ for (uint32_t tile = 0; tile < totalSegments; tile++) {
+ uint32_t yOffset = tile * resultBytesPerRow;
+ for (uint32_t i = 0; i < PGPhotoEnhanceHistogramBins; i++) {
+ uint32_t index = i * 4 + yOffset;
+ result[index] = (uint8_t)cdfs[tile][i];
+ result[index + 1] = (uint8_t)cdfsMin[tile];
+ result[index + 2] = (uint8_t)cdfsMax[tile];
+ result[index + 3] = 255;
+ }
+ }
+
+ for (uint32_t a = 0; a < totalSegments; a++) {
+ free(hist[a]);
+ free(cdfs[a]);
+ }
+ free(hist);
+ free(cdfs);
+ free(cdfsMax);
+ free(cdfsMin);
+}
+
JNIEXPORT void Java_org_telegram_messenger_Utilities_loadBitmap(JNIEnv *env, jclass class, jstring path, jobject bitmap, int scale, int width, int height, int stride) {
AndroidBitmapInfo info;
diff --git a/TMessagesProj/libs/armeabi-v7a/libtmessages.5.so b/TMessagesProj/libs/armeabi-v7a/libtmessages.6.so
old mode 100755
new mode 100644
similarity index 84%
rename from TMessagesProj/libs/armeabi-v7a/libtmessages.5.so
rename to TMessagesProj/libs/armeabi-v7a/libtmessages.6.so
index 132154ab..41f66ec8
Binary files a/TMessagesProj/libs/armeabi-v7a/libtmessages.5.so and b/TMessagesProj/libs/armeabi-v7a/libtmessages.6.so differ
diff --git a/TMessagesProj/libs/armeabi/libtmessages.5.so b/TMessagesProj/libs/armeabi/libtmessages.6.so
old mode 100755
new mode 100644
similarity index 76%
rename from TMessagesProj/libs/armeabi/libtmessages.5.so
rename to TMessagesProj/libs/armeabi/libtmessages.6.so
index 3e08cd8f..aa46c089
Binary files a/TMessagesProj/libs/armeabi/libtmessages.5.so and b/TMessagesProj/libs/armeabi/libtmessages.6.so differ
diff --git a/TMessagesProj/libs/x86/libtmessages.5.so b/TMessagesProj/libs/x86/libtmessages.6.so
old mode 100755
new mode 100644
similarity index 72%
rename from TMessagesProj/libs/x86/libtmessages.5.so
rename to TMessagesProj/libs/x86/libtmessages.6.so
index 326a064f..e455cf5a
Binary files a/TMessagesProj/libs/x86/libtmessages.5.so and b/TMessagesProj/libs/x86/libtmessages.6.so differ
diff --git a/TMessagesProj/src/main/AndroidManifest.xml b/TMessagesProj/src/main/AndroidManifest.xml
index 5ca90c91..dd3c5fc2 100644
--- a/TMessagesProj/src/main/AndroidManifest.xml
+++ b/TMessagesProj/src/main/AndroidManifest.xml
@@ -43,7 +43,7 @@
diff --git a/TMessagesProj/src/main/java/jawnae/pyronet/ByteStream.java b/TMessagesProj/src/main/java/jawnae/pyronet/ByteStream.java
index 39966ac1..878a92ac 100755
--- a/TMessagesProj/src/main/java/jawnae/pyronet/ByteStream.java
+++ b/TMessagesProj/src/main/java/jawnae/pyronet/ByteStream.java
@@ -28,7 +28,7 @@ public class ByteStream {
private final ArrayList queue;
public ByteStream() {
- this.queue = new ArrayList();
+ this.queue = new ArrayList<>();
}
public void append(ByteBufferDesc buf) {
diff --git a/TMessagesProj/src/main/java/org/telegram/PhoneFormat/PhoneFormat.java b/TMessagesProj/src/main/java/org/telegram/PhoneFormat/PhoneFormat.java
index a6dbff0a..63081ef8 100644
--- a/TMessagesProj/src/main/java/org/telegram/PhoneFormat/PhoneFormat.java
+++ b/TMessagesProj/src/main/java/org/telegram/PhoneFormat/PhoneFormat.java
@@ -25,6 +25,7 @@
package org.telegram.PhoneFormat;
import org.telegram.messenger.ApplicationLoader;
+import org.telegram.messenger.FileLog;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -97,9 +98,11 @@ public class PhoneFormat {
}
public void init(String countryCode) {
+ InputStream stream = null;
+ ByteArrayOutputStream bos = null;
try {
- InputStream stream = ApplicationLoader.applicationContext.getAssets().open("PhoneFormats.dat");
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ stream = ApplicationLoader.applicationContext.getAssets().open("PhoneFormats.dat");
+ bos = new ByteArrayOutputStream();
byte[] buf = new byte[1024];
int len;
while ((len = stream.read(buf, 0, 1024)) != -1) {
@@ -111,6 +114,21 @@ public class PhoneFormat {
} catch (Exception e) {
e.printStackTrace();
return;
+ } finally {
+ try {
+ if (bos != null) {
+ bos.close();
+ }
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
+ try {
+ if (stream != null) {
+ stream.close();
+ }
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
}
if (countryCode != null && countryCode.length() != 0) {
@@ -119,10 +137,10 @@ public class PhoneFormat {
Locale loc = Locale.getDefault();
defaultCountry = loc.getCountry().toLowerCase();
}
- callingCodeOffsets = new HashMap(255);
- callingCodeCountries = new HashMap>(255);
- callingCodeData = new HashMap(10);
- countryCallingCode = new HashMap(255);
+ callingCodeOffsets = new HashMap<>(255);
+ callingCodeCountries = new HashMap<>(255);
+ callingCodeData = new HashMap<>(10);
+ countryCallingCode = new HashMap<>(255);
parseDataHeader();
initialzed = true;
@@ -293,7 +311,7 @@ public class PhoneFormat {
offset += 2;
- ArrayList strs = new ArrayList(5);
+ ArrayList strs = new ArrayList<>(5);
String str;
while ((str = valueString(offset)).length() != 0) {
strs.add(str);
@@ -302,14 +320,14 @@ public class PhoneFormat {
res.trunkPrefixes = strs;
offset++;
- strs = new ArrayList(5);
+ strs = new ArrayList<>(5);
while ((str = valueString(offset)).length() != 0) {
strs.add(str);
offset += str.length() + 1;
}
res.intlPrefixes = strs;
- ArrayList ruleSets = new ArrayList(setCnt);
+ ArrayList ruleSets = new ArrayList<>(setCnt);
offset = start + block1Len;
for (int s = 0; s < setCnt; s++) {
RuleSet ruleSet = new RuleSet();
@@ -317,7 +335,7 @@ public class PhoneFormat {
offset += 2;
int ruleCnt = value16(offset);
offset += 2;
- ArrayList rules = new ArrayList(ruleCnt);
+ ArrayList rules = new ArrayList<>(ruleCnt);
for (int r = 0; r < ruleCnt; r++) {
PhoneRule rule = new PhoneRule();
rule.minVal = value32(offset);
@@ -380,7 +398,7 @@ public class PhoneFormat {
callingCodeOffsets.put(callingCode, offset);
ArrayList countries = callingCodeCountries.get(callingCode);
if (countries == null) {
- countries = new ArrayList();
+ countries = new ArrayList<>();
callingCodeCountries.put(callingCode, countries);
}
countries.add(country);
diff --git a/TMessagesProj/src/main/java/org/telegram/android/AndroidUtilities.java b/TMessagesProj/src/main/java/org/telegram/android/AndroidUtilities.java
index 4455445f..fe19cfc7 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/AndroidUtilities.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/AndroidUtilities.java
@@ -9,20 +9,30 @@
package org.telegram.android;
import android.app.Activity;
+import android.app.AlarmManager;
import android.app.AlertDialog;
+import android.app.PendingIntent;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
+import android.graphics.Color;
import android.graphics.Point;
+import android.graphics.PorterDuff;
import android.graphics.Rect;
import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
import android.os.Build;
import android.os.Environment;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
+import android.util.DisplayMetrics;
+import android.util.Log;
import android.util.StateSet;
import android.view.Display;
import android.view.Surface;
@@ -33,20 +43,34 @@ import android.widget.AbsListView;
import android.widget.EdgeEffect;
import android.widget.EditText;
import android.widget.ListView;
+import android.widget.ProgressBar;
import android.widget.TextView;
+import android.widget.Toast;
+import org.telegram.messenger.ApplicationLoader;
+import org.telegram.messenger.ConnectionsManager;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.R;
import org.telegram.messenger.TLRPC;
-import org.telegram.messenger.ApplicationLoader;
+import org.telegram.messenger.UserConfig;
+import org.telegram.ui.ActionBar.ActionBar;
+import org.telegram.ui.Components.ForegroundDetector;
import org.telegram.ui.Components.NumberPicker;
import org.telegram.ui.Components.TypefaceSpan;
+import org.telegram.ui.LaunchActivity;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.PrintWriter;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.nio.channels.FileChannel;
import java.util.ArrayList;
import java.util.Hashtable;
+import java.util.List;
public class AndroidUtilities {
@@ -59,15 +83,26 @@ public class AndroidUtilities {
public static float density = 1;
public static Point displaySize = new Point();
public static Integer photoSize = null;
+ public static DisplayMetrics displayMetrics = new DisplayMetrics();
private static Boolean isTablet = null;
+ public static final String THEME_PREFS = "theme";
+ private static final String TAG = "AndroidUtilities";
+ public static final int defColor = 0xff58BCD5;//0xff43C3DB;//0xff2f8cc9;58BCD5//0xff55abd2
+ public static int themeColor = getIntColor("themeColor");
+
+ public static boolean needRestart = false;
+
+ //public static boolean hideScreenshot = false;
+ //public static boolean hideMobile = false;
+
static {
density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density;
checkDisplaySize();
}
public static void lockOrientation(Activity activity) {
- if (activity == null || prevOrientation != -10) {
+ if (activity == null || prevOrientation != -10 || Build.VERSION.SDK_INT < 9) {
return;
}
try {
@@ -115,7 +150,7 @@ public class AndroidUtilities {
}
public static void unlockOrientation(Activity activity) {
- if (activity == null) {
+ if (activity == null || Build.VERSION.SDK_INT < 9) {
return;
}
try {
@@ -228,12 +263,13 @@ public class AndroidUtilities {
if (manager != null) {
Display display = manager.getDefaultDisplay();
if (display != null) {
+ display.getMetrics(displayMetrics);
if(android.os.Build.VERSION.SDK_INT < 13) {
displaySize.set(display.getWidth(), display.getHeight());
} else {
display.getSize(displaySize);
}
- FileLog.e("tmessages", "display size = " + displaySize.x + " " + displaySize.y);
+ FileLog.e("tmessages", "display size = " + displaySize.x + " " + displaySize.y + " " + displayMetrics.xdpi + "x" + displayMetrics.ydpi);
}
}
} catch (Exception e) {
@@ -241,6 +277,10 @@ public class AndroidUtilities {
}
}
+ public static float getPixelsInCM(float cm, boolean isX) {
+ return (cm / 2.54f) * (isX ? displayMetrics.xdpi : displayMetrics.ydpi);
+ }
+
public static long makeBroadcastId(int id) {
return 0x0000000100000000L | ((long)id & 0x00000000FFFFFFFFL);
}
@@ -421,6 +461,19 @@ public class AndroidUtilities {
}
}
+ public static void setProgressBarAnimationDuration(ProgressBar progressBar, int duration) {
+ if (progressBar == null) {
+ return;
+ }
+ try {
+ Field mCursorDrawableRes = ProgressBar.class.getDeclaredField("mDuration");
+ mCursorDrawableRes.setAccessible(true);
+ mCursorDrawableRes.setInt(progressBar, duration);
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
+ }
+
public static int getViewInset(View view) {
if (view == null || Build.VERSION.SDK_INT < 21) {
return 0;
@@ -530,4 +583,364 @@ public class AndroidUtilities {
}
return stringBuilder;
}
+
+ public static boolean needShowPasscode(boolean reset) {
+ boolean wasInBackground;
+ if (Build.VERSION.SDK_INT >= 14) {
+ wasInBackground = ForegroundDetector.getInstance().isWasInBackground(reset);
+ if (reset) {
+ ForegroundDetector.getInstance().resetBackgroundVar();
+ }
+ } else {
+ wasInBackground = UserConfig.lastPauseTime != 0;
+ }
+ return UserConfig.passcodeHash.length() > 0 && wasInBackground &&
+ (UserConfig.appLocked || UserConfig.autoLockIn != 0 && UserConfig.lastPauseTime != 0 && !UserConfig.appLocked && (UserConfig.lastPauseTime + UserConfig.autoLockIn) <= ConnectionsManager.getInstance().getCurrentTime());
+ }
+
+ /*public static void turnOffHardwareAcceleration(Window window) {
+ if (window == null || Build.MODEL == null || Build.VERSION.SDK_INT < 11) {
+ return;
+ }
+ if (Build.MODEL.contains("GT-S5301") ||
+ Build.MODEL.contains("GT-S5303") ||
+ Build.MODEL.contains("GT-B5330") ||
+ Build.MODEL.contains("GT-S5302") ||
+ Build.MODEL.contains("GT-S6012B") ||
+ Build.MODEL.contains("MegaFon_SP-AI")) {
+ window.clearFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
+ }
+ }*/
+ //NEW
+ public static int getIntColor(String key){
+ SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(THEME_PREFS, Activity.MODE_PRIVATE);
+ return themePrefs.getInt(key, defColor);
+ }
+
+ public static int getIntDef(String key, int def){
+ SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(THEME_PREFS, Activity.MODE_PRIVATE);
+ return themePrefs.getInt(key, def);
+ }
+
+ public static int getIntAlphaColor(String key, float factor){
+ SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(THEME_PREFS, Activity.MODE_PRIVATE);
+ int color = themePrefs.getInt(key, defColor);
+ int alpha = Math.round(Color.alpha(color) * factor);
+ int red = Color.red(color);
+ int green = Color.green(color);
+ int blue = Color.blue(color);
+ return Color.argb(alpha, red, green, blue);
+ }
+
+ public static int getIntDarkerColor(String key, int factor){
+ SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(THEME_PREFS, Activity.MODE_PRIVATE);
+ int color = themePrefs.getInt(key, defColor);
+ return setDarkColor(color, factor);
+ }
+
+ public static int setDarkColor(int color, int factor){
+ int red = Color.red(color) - factor;
+ int green = Color.green(color) - factor;
+ int blue = Color.blue(color) - factor;
+ if(factor < 0){
+ red = (red > 0xff) ? 0xff : red;
+ green = (green > 0xff) ? 0xff : green;
+ blue = (blue > 0xff) ? 0xff : blue;
+ if(red == 0xff && green == 0xff && blue == 0xff){
+ red = factor;
+ green = factor;
+ blue = factor;
+ }
+ }
+ if(factor > 0){
+ red = (red < 0) ? 0 : red;
+ green = (green < 0) ? 0 : green;
+ blue = (blue < 0) ? 0 : blue;
+ if(red == 0 && green == 0 && blue == 0){
+ red = factor;
+ green = factor;
+ blue = factor;
+ }
+ }
+ return Color.argb(0xff, red, green, blue);
+ }
+
+ public static void setIntColor(String key, int value){
+ SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(THEME_PREFS, Activity.MODE_PRIVATE);
+ SharedPreferences.Editor e = themePrefs.edit();
+ e.putInt(key, value);
+ e.commit();
+ }
+
+ public static void setBoolPref(Context context, String key, Boolean b){
+ SharedPreferences sharedPref = context.getSharedPreferences(THEME_PREFS, 0);
+ SharedPreferences.Editor e = sharedPref.edit();
+ e.putBoolean(key, b);
+ e.commit();
+ }
+
+ public static void setStringPref(Context context, String key, String s){
+ SharedPreferences sharedPref = context.getSharedPreferences(THEME_PREFS, 0);
+ SharedPreferences.Editor e = sharedPref.edit();
+ e.putString(key, s);
+ e.commit();
+ }
+
+ public static boolean getBoolPref(Context context,String key){
+ boolean s = false;
+ if (context.getSharedPreferences(THEME_PREFS, 0).getBoolean(key, false)) s=true;
+ return s;
+ }
+
+ public static boolean getBoolMain(String key){
+ boolean s = false;
+ if (ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE).getBoolean(key, false)) s=true;
+ return s;
+ }
+
+ public static int getIntPref(Context context,String key){
+ int i=0;
+ if(key.contains("picker")){
+ int intColor = context.getSharedPreferences(THEME_PREFS, 0).getInt(key, Color.WHITE );
+ i=intColor;
+ }
+ return i;
+ }
+/*
+ public static int getIntColorDef(Context context, String key, int def){
+ int i=def;
+ if(context.getSharedPreferences(THEME_PREFS, 0).getBoolean(key, false)){
+ i = context.getSharedPreferences(THEME_PREFS, 0).getInt(key.replace("_check", "_picker"), def);
+ }
+ return i;
+ }*/
+
+ public static void setTVTextColor(Context ctx, TextView tv, String key, int def){
+ if(tv==null)return;
+ if(getBoolPref(ctx, key))
+ def = getIntPref(ctx, key.replace("_check", "_picker"));
+ tv.setTextColor(def);
+ }
+
+ public static int getSizePref(Context context,String key, int def){
+ if(key.contains("picker"))return context.getSharedPreferences(THEME_PREFS, 0).getInt(key, def);
+ return def;
+ }
+
+ public static void paintActionBarHeader(Activity a, ActionBar ab, String hdCheck, String gdMode){
+ if(ab==null)return;
+ ab.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#54759E")));
+ if(getBoolPref(a, hdCheck)){
+ int i = getIntPref(a, hdCheck.replace("_check", "_picker"));
+ Drawable d = new ColorDrawable(i);
+ try{
+ ab.setBackgroundDrawable(d);
+ d = paintGradient(a,i,gdMode.replace("mode","color_picker"),gdMode);
+ if(d!=null)ab.setBackgroundDrawable(d);
+ } catch (Exception e) {
+ Log.e(TAG, e.toString());
+ }
+ }
+ }
+
+ public static Drawable paintGradient(Context c, int mainColor, String gColor, String g){
+ GradientDrawable gd = null;
+ int[] a ={mainColor,getIntPref(c,gColor)};
+ int gType = Integer.parseInt(c.getSharedPreferences(THEME_PREFS, 0).getString(g, "0"));
+ if(gType==2) gd = new GradientDrawable(GradientDrawable.Orientation.LEFT_RIGHT,a);
+ if(gType==1) gd = new GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM ,a);
+ return gd;
+ }
+
+ public static Drawable paintDrawable(Context c, int resId, int resIdW, String color){
+ Drawable d = c.getResources().getDrawable(resId);
+ if(color.contains("_check")){
+ if(getBoolPref(c, color)){
+ d = c.getResources().getDrawable(resIdW);
+ d.setColorFilter(getIntPref(c, color.replace("_check", "_picker")), PorterDuff.Mode.MULTIPLY);
+ }
+ }
+ return d;
+ }
+
+ public static void restartApp(){
+ Intent mRestartApp = new Intent(ApplicationLoader.applicationContext, LaunchActivity.class);
+ int mPendingIntentId = 123456;
+ PendingIntent mPendingIntent = PendingIntent.getActivity(ApplicationLoader.applicationContext, mPendingIntentId, mRestartApp, PendingIntent.FLAG_CANCEL_CURRENT);
+ AlarmManager mgr = (AlarmManager)ApplicationLoader.applicationContext.getSystemService(Context.ALARM_SERVICE);
+ mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent);
+ System.exit(0);
+ }
+
+ public static void savePreferencesToSD(Context context, String prefName, String tName, boolean toast){
+ String folder = "/Telegram/Themes";
+ File dataF = new File (findPrefFolder(context),prefName);
+ if(checkSDStatus() > 1){
+ File f = new File (Environment.getExternalStorageDirectory(), folder);
+ f.mkdirs();
+ File sdF = new File(f, tName);
+ String s = getError(copyFile(dataF,sdF,true));
+ if (s.equalsIgnoreCase("4")) {
+ if(toast && sdF.getName()!="")Toast.makeText(context,context.getString(R.string.SavedTo,sdF.getName(),folder),Toast.LENGTH_SHORT ).show();
+ }else if (s.contains("0")) {
+ s = context.getString(R.string.SaveErrorMsg0);
+ Toast.makeText(context,"ERROR: "+ s ,Toast.LENGTH_LONG ).show();
+ }else{
+ Toast.makeText(context,"ERROR: "+s,Toast.LENGTH_LONG ).show();
+ Toast.makeText(context,dataF.getAbsolutePath(),Toast.LENGTH_LONG ).show();
+ }
+ }else{
+ Toast.makeText(context,"ERROR: " + context.getString(R.string.NoMediaMessage) , Toast.LENGTH_LONG ).show();
+ }
+ }
+
+ public static void copyWallpaperToSD(Context context, String tName, boolean toast){
+ String folder = "/Telegram/Themes";
+ String nFile = "wallpaper.jpg";
+ if(checkSDStatus()>0){
+ File f1 = context.getFilesDir();
+ f1 = new File (f1.getAbsolutePath(), nFile);
+ File f2 = new File (Environment.getExternalStorageDirectory(), folder);
+ f2.mkdirs();
+ f2 = new File(f2, tName+"_"+nFile);
+ if(f1.length()>1){
+ String s = getError(copyFile(f1,f2,true));
+ if(s.contains("4")){
+ if(toast && f2.getName()!="" && folder !="")Toast.makeText(context,context.getString(R.string.SavedTo,f2.getName(),folder),Toast.LENGTH_SHORT ).show();
+ if(f2.getName()=="" || folder =="") Toast.makeText(context,"ERROR: "+s,Toast.LENGTH_SHORT ).show();
+
+ }else{
+ Toast.makeText(context,"ERROR: "+s+"\n"+f1.getAbsolutePath(),Toast.LENGTH_LONG ).show();
+ }
+ }
+ }
+ }
+
+ static String findPrefFolder(Context context){
+ File f = context.getFilesDir();
+ String appDir = f.getAbsolutePath();
+ File SPDir = new File (appDir.substring(0,appDir.lastIndexOf('/')+1)+ "shared_prefs/");
+ if(!SPDir.exists()) {// && SPDir.isDirectory()) {
+ String pck = context.getPackageName();
+ SPDir=new File ("/dbdata/databases/"+pck+"/shared_prefs/");
+ }
+ //Log.i("TAG", SPDir.getAbsolutePath());
+ return SPDir.getAbsolutePath();
+ }
+
+ static int checkSDStatus(){
+ int b=0;
+ String s = Environment.getExternalStorageState();
+ if (s.equals(Environment.MEDIA_MOUNTED))b=2;
+ else if (s.equals(Environment.MEDIA_MOUNTED_READ_ONLY))b=1;
+ return b;
+ }
+
+ static String getError(int i){
+ String s="-1";
+ if(i==0)s="0: SOURCE FILE DOESN'T EXIST";
+ if(i==1)s="1: DESTINATION FILE DOESN'T EXIST";
+ if(i==2)s="2: NULL SOURCE & DESTINATION FILES";
+ if(i==3)s="3: NULL SOURCE FILE";
+ if(i==4)s="4";
+ return s;
+ }
+
+ //0: source file doesn't exist
+ //1: dest file doesn't exist
+ //2: source & dest = NULL
+ //3: source = NULL
+ //4: dest = NULL
+ static int copyFile(File sourceFile, File destFile, boolean save) {
+ int i=-1;
+ try{
+ if (!sourceFile.exists()) {
+ return i+1;
+ }
+ if (!destFile.exists()) {
+ if(save)i=i+2;
+ destFile.createNewFile();
+ }
+ FileChannel source = null;
+ FileChannel destination = null;
+ FileInputStream fileInputStream = new FileInputStream(sourceFile);
+ source = fileInputStream.getChannel();
+ FileOutputStream fileOutputStream = new FileOutputStream(destFile);
+ destination = fileOutputStream.getChannel();
+ if (destination != null && source != null) {
+ destination.transferFrom(source, 0, source.size());
+ i=2;
+ }
+ if (source != null) {
+ source.close();
+ i=3;
+ }
+ if (destination != null) {
+ destination.close();
+ i=4;
+ }
+ fileInputStream.close();
+ fileOutputStream.close();
+ }catch (Exception e)
+ {
+ System.err.println("Error saving preferences: " + e.getMessage());
+ Log.e(e.getMessage() , e.toString());
+ }
+ return i;
+ }
+
+ public static int loadPrefFromSD(Context context, String prefPath){
+ File dataF = new File (findPrefFolder(context), THEME_PREFS + ".xml");
+ File prefFile = new File (prefPath);
+ String s = getError(copyFile(prefFile, dataF, false));
+ if (s.contains("0")) {
+ Toast.makeText(context,"ERROR: "+ context.getString(R.string.restoreErrorMsg, prefFile.getAbsolutePath()) , Toast.LENGTH_LONG ).show();
+ }
+ return Integer.parseInt(s);
+ }
+
+ public static int loadWallpaperFromSDPath(Context context, String wPath){
+ String nFile = "wallpaper.jpg";
+ File f1 = context.getFilesDir();
+ f1= new File (f1.getAbsolutePath(), nFile);
+ //Log.i("f1", f1.getAbsolutePath());
+ File wFile = new File (wPath);
+ //Log.i("wPath", wPath);
+ //Log.i("wFile", wFile.getAbsolutePath());
+ String s = "-1";
+ if (wFile.exists()){
+ s = getError(copyFile(wFile,f1,false));
+ if (s.contains("0")) {
+ Toast.makeText(context,"ERROR: "+ context.getString(R.string.restoreErrorMsg,wFile.getAbsolutePath()) ,Toast.LENGTH_LONG ).show();
+ }else{
+ Toast.makeText(context,"ERROR: "+s+"\n"+wFile.getAbsolutePath(),Toast.LENGTH_LONG ).show();
+ }
+ }
+ return Integer.parseInt(s);
+ }
+/*
+ static void modifyXMLfile(File preffile,String sname){
+ try {
+ File file = preffile;
+ //Log.e("modifyXMLfile",preffile.getAbsolutePath());
+ //Log.e("modifyXMLfile",preffile.exists()+"");
+ List lines = new ArrayList();
+ // first, read the file and store the changes
+ BufferedReader in = new BufferedReader(new FileReader(file));
+ String line = in.readLine();
+ while (line != null) {
+ if (!line.contains(sname))lines.add(line);
+ //Log.e("modifyXMLfile",line);
+ line = in.readLine();
+ }
+ in.close();
+ // now, write the file again with the changes
+ PrintWriter out = new PrintWriter(file);
+ for (String l : lines)
+ out.println(l);
+ out.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }*/
}
diff --git a/TMessagesProj/src/main/java/org/telegram/android/ContactsController.java b/TMessagesProj/src/main/java/org/telegram/android/ContactsController.java
index 75cb7bcb..4894e628 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/ContactsController.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/ContactsController.java
@@ -54,6 +54,7 @@ public class ContactsController {
private ArrayList delayedContactsUpdate = new ArrayList<>();
private String inviteText;
private boolean updatingInviteText = false;
+ private HashMap sectionsToReplace = new HashMap<>();
private int loadingDeleteInfo = 0;
private int deleteAccountTTL;
@@ -114,6 +115,28 @@ public class ContactsController {
if (preferences.getBoolean("needGetStatuses", false)) {
reloadContactsStatuses();
}
+
+ sectionsToReplace.put("À", "A");
+ sectionsToReplace.put("Á", "A");
+ sectionsToReplace.put("Ä", "A");
+ sectionsToReplace.put("Ù", "U");
+ sectionsToReplace.put("Ú", "U");
+ sectionsToReplace.put("Ü", "U");
+ sectionsToReplace.put("Ì", "I");
+ sectionsToReplace.put("Í", "I");
+ sectionsToReplace.put("Ï", "I");
+ sectionsToReplace.put("È", "E");
+ sectionsToReplace.put("É", "E");
+ sectionsToReplace.put("Ê", "E");
+ sectionsToReplace.put("Ë", "E");
+ sectionsToReplace.put("Ò", "O");
+ sectionsToReplace.put("Ó", "O");
+ sectionsToReplace.put("Ö", "O");
+ sectionsToReplace.put("Ç", "C");
+ sectionsToReplace.put("Ñ", "N");
+ sectionsToReplace.put("Ÿ", "Y");
+ sectionsToReplace.put("Ý", "Y");
+ sectionsToReplace.put("Ţ", "Y");
}
public void cleanup() {
@@ -514,10 +537,10 @@ public class ContactsController {
checkContactsInternal();
}
final HashMap contactsMap = readContactsFromPhoneBook();
- final HashMap contactsBookShort = new HashMap();
+ final HashMap contactsBookShort = new HashMap<>();
int oldCount = contactHashMap.size();
- ArrayList toImport = new ArrayList();
+ ArrayList toImport = new ArrayList<>();
if (!contactHashMap.isEmpty()) {
for (HashMap.Entry pair : contactsMap.entrySet()) {
Integer id = pair.getKey();
@@ -619,10 +642,10 @@ public class ContactsController {
}
}
- final ArrayList toDelete = new ArrayList();
+ final ArrayList toDelete = new ArrayList<>();
if (contactHashMap != null && !contactHashMap.isEmpty()) {
try {
- final HashMap contactsPhonesShort = new HashMap();
+ final HashMap contactsPhonesShort = new HashMap<>();
for (TLRPC.TL_contact value : contacts) {
TLRPC.User user = MessagesController.getInstance().getUser(value.user_id);
@@ -692,7 +715,7 @@ public class ContactsController {
}
final int count = (int)Math.ceil(toImport.size() / 500.0f);
for (int a = 0; a < count; a++) {
- ArrayList finalToImport = new ArrayList();
+ ArrayList finalToImport = new ArrayList<>();
finalToImport.addAll(toImport.subList(a * 500, Math.min((a + 1) * 500, toImport.size())));
TLRPC.TL_contacts_importContacts req = new TLRPC.TL_contacts_importContacts();
req.contacts = finalToImport;
@@ -713,7 +736,7 @@ public class ContactsController {
// }
}
MessagesStorage.getInstance().putUsersAndChats(res.users, null, true, true);
- ArrayList cArr = new ArrayList();
+ ArrayList cArr = new ArrayList<>();
for (TLRPC.TL_importedContact c : res.imported) {
TLRPC.TL_contact contact = new TLRPC.TL_contact();
contact.user_id = c.user_id;
@@ -848,7 +871,7 @@ public class ContactsController {
public void run() {
MessagesController.getInstance().putUsers(usersArr, from == 1);
- final HashMap usersDict = new HashMap();
+ final HashMap usersDict = new HashMap<>();
final boolean isEmpty = contactsArr.isEmpty();
@@ -933,9 +956,9 @@ public class ContactsController {
}
});
- final SparseArray contactsDictionary = new SparseArray();
- final HashMap> sectionsDict = new HashMap>();
- final ArrayList sortedSectionsArray = new ArrayList();
+ final SparseArray contactsDictionary = new SparseArray<>();
+ final HashMap> sectionsDict = new HashMap<>();
+ final ArrayList sortedSectionsArray = new ArrayList<>();
HashMap contactsByPhonesDict = null;
if (!contactsBookLoaded) {
@@ -958,13 +981,17 @@ public class ContactsController {
if (key == null || key.length() == 0) {
key = user.last_name;
}
+ if (key.length() > 1) {
+ key = key.substring(0, 1);
+ }
if (key.length() == 0) {
key = "#";
} else {
key = key.toUpperCase();
}
- if (key.length() > 1) {
- key = key.substring(0, 1);
+ String replace = sectionsToReplace.get(key);
+ if (replace != null) {
+ key = replace;
}
ArrayList arr = sectionsDict.get(key);
if (arr == null) {
@@ -1067,7 +1094,7 @@ public class ContactsController {
}
private void updateUnregisteredContacts(final ArrayList contactsArr) {
- final HashMap contactsPhonesShort = new HashMap();
+ final HashMap contactsPhonesShort = new HashMap<>();
for (TLRPC.TL_contact value : contactsArr) {
TLRPC.User user = MessagesController.getInstance().getUser(value.user_id);
@@ -1077,7 +1104,7 @@ public class ContactsController {
contactsPhonesShort.put(user.phone, value);
}
- final ArrayList sortedPhoneBookContacts = new ArrayList();
+ final ArrayList sortedPhoneBookContacts = new ArrayList<>();
for (HashMap.Entry pair : contactsBook.entrySet()) {
Contact value = pair.getValue();
int id = pair.getKey();
@@ -1135,8 +1162,8 @@ public class ContactsController {
}
StringBuilder ids = new StringBuilder();
- final HashMap> sectionsDict = new HashMap>();
- final ArrayList sortedSectionsArray = new ArrayList();
+ final HashMap> sectionsDict = new HashMap<>();
+ final ArrayList sortedSectionsArray = new ArrayList<>();
for (TLRPC.TL_contact value : contacts) {
TLRPC.User user = MessagesController.getInstance().getUser(value.user_id);
@@ -1148,17 +1175,21 @@ public class ContactsController {
if (key == null || key.length() == 0) {
key = user.last_name;
}
+ if (key.length() > 1) {
+ key = key.substring(0, 1);
+ }
if (key.length() == 0) {
key = "#";
} else {
key = key.toUpperCase();
}
- if (key.length() > 1) {
- key = key.substring(0, 1);
+ String replace = sectionsToReplace.get(key);
+ if (replace != null) {
+ key = replace;
}
ArrayList arr = sectionsDict.get(key);
if (arr == null) {
- arr = new ArrayList();
+ arr = new ArrayList<>();
sectionsDict.put(key, arr);
sortedSectionsArray.add(key);
}
@@ -1193,7 +1224,7 @@ public class ContactsController {
try {
Uri rawContactUri = ContactsContract.RawContacts.CONTENT_URI.buildUpon().appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_NAME, currentAccount.name).appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_TYPE, currentAccount.type).build();
Cursor c1 = ApplicationLoader.applicationContext.getContentResolver().query(rawContactUri, new String[]{BaseColumns._ID, ContactsContract.RawContacts.SYNC2}, null, null, null);
- HashMap bookContacts = new HashMap();
+ HashMap bookContacts = new HashMap<>();
if (c1 != null) {
while (c1.moveToNext()) {
bookContacts.put(c1.getInt(1), c1.getLong(0));
@@ -1213,7 +1244,7 @@ public class ContactsController {
}
private void performWriteContactsToPhoneBook() {
- final ArrayList contactsArray = new ArrayList();
+ final ArrayList contactsArray = new ArrayList<>();
contactsArray.addAll(contacts);
Utilities.photoBookQueue.postRunnable(new Runnable() {
@Override
@@ -1225,8 +1256,8 @@ public class ContactsController {
private void applyContactsUpdates(ArrayList ids, ConcurrentHashMap userDict, ArrayList newC, ArrayList contactsTD) {
if (newC == null || contactsTD == null) {
- newC = new ArrayList();
- contactsTD = new ArrayList();
+ newC = new ArrayList<>();
+ contactsTD = new ArrayList<>();
for (Integer uid : ids) {
if (uid > 0) {
TLRPC.TL_contact contact = new TLRPC.TL_contact();
@@ -1351,8 +1382,8 @@ public class ContactsController {
}
public void processContactsUpdates(ArrayList ids, ConcurrentHashMap userDict) {
- final ArrayList newContacts = new ArrayList();
- final ArrayList contactsToDelete = new ArrayList();
+ final ArrayList newContacts = new ArrayList<>();
+ final ArrayList contactsToDelete = new ArrayList<>();
for (Integer uid : ids) {
if (uid > 0) {
TLRPC.TL_contact contact = new TLRPC.TL_contact();
@@ -1406,7 +1437,7 @@ public class ContactsController {
}
}
- ArrayList query = new ArrayList();
+ ArrayList query = new ArrayList<>();
ContentProviderOperation.Builder builder = ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI);
builder.withValue(ContactsContract.RawContacts.ACCOUNT_NAME, currentAccount.name);
@@ -1471,7 +1502,7 @@ public class ContactsController {
}
TLRPC.TL_contacts_importContacts req = new TLRPC.TL_contacts_importContacts();
- ArrayList contactsParams = new ArrayList();
+ ArrayList contactsParams = new ArrayList<>();
TLRPC.TL_inputPhoneContact c = new TLRPC.TL_inputPhoneContact();
c.phone = user.phone;
if (!c.phone.startsWith("+")) {
@@ -1510,7 +1541,7 @@ public class ContactsController {
});
TLRPC.TL_contact newContact = new TLRPC.TL_contact();
newContact.user_id = u.id;
- ArrayList arrayList = new ArrayList();
+ ArrayList arrayList = new ArrayList<>();
arrayList.add(newContact);
MessagesStorage.getInstance().putContacts(arrayList, false);
@@ -1552,7 +1583,7 @@ public class ContactsController {
return;
}
TLRPC.TL_contacts_deleteContacts req = new TLRPC.TL_contacts_deleteContacts();
- final ArrayList uids = new ArrayList();
+ final ArrayList uids = new ArrayList<>();
for (TLRPC.User user : users) {
TLRPC.InputUser inputUser = MessagesController.getInputUser(user);
if (inputUser == null) {
@@ -1631,7 +1662,7 @@ public class ContactsController {
editor.remove("needGetStatuses").commit();
TLRPC.Vector vector = (TLRPC.Vector) response;
if (!vector.objects.isEmpty()) {
- ArrayList dbUsersStatus = new ArrayList();
+ ArrayList dbUsersStatus = new ArrayList<>();
for (Object object : vector.objects) {
TLRPC.User toDbUser = new TLRPC.User();
TLRPC.TL_contactStatus status = (TLRPC.TL_contactStatus) object;
diff --git a/TMessagesProj/src/main/java/org/telegram/android/ImageLoader.java b/TMessagesProj/src/main/java/org/telegram/android/ImageLoader.java
index 1e9a454a..2cca9e96 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/ImageLoader.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/ImageLoader.java
@@ -344,7 +344,7 @@ public class ImageLoader {
});
}
});
- AndroidUtilities.runOnUIThread(new Runnable() {
+ imageLoadQueue.postRunnable(new Runnable() {
@Override
public void run() {
runHttpTasks(true);
@@ -354,7 +354,7 @@ public class ImageLoader {
@Override
protected void onCancelled() {
- AndroidUtilities.runOnUIThread(new Runnable() {
+ imageLoadQueue.postRunnable(new Runnable() {
@Override
public void run() {
runHttpTasks(true);
@@ -449,6 +449,11 @@ public class ImageLoader {
originalBitmap = scaledBitmap;
FileOutputStream stream = new FileOutputStream(thumbFile);
originalBitmap.compress(Bitmap.CompressFormat.JPEG, 60, stream);
+ try {
+ stream.close();
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
final BitmapDrawable bitmapDrawable = new BitmapDrawable(originalBitmap);
AndroidUtilities.runOnUIThread(new Runnable() {
@Override
@@ -615,7 +620,9 @@ public class ImageLoader {
if (mediaId != null) {
MediaStore.Images.Thumbnails.getThumbnail(ApplicationLoader.applicationContext.getContentResolver(), mediaId, MediaStore.Images.Thumbnails.MINI_KIND, opts);
} else {
- BitmapFactory.decodeFile(cacheImage.finalFilePath.getAbsolutePath(), opts);
+ FileInputStream is = new FileInputStream(cacheFileFinal);
+ image = BitmapFactory.decodeStream(is, null, opts);
+ is.close();
}
float photoW = opts.outWidth;
@@ -633,7 +640,7 @@ public class ImageLoader {
}
}
- if (cacheImage.filter == null || blur) {
+ if (cacheImage.filter == null || blur || cacheImage.httpUrl != null) {
opts.inPreferredConfig = Bitmap.Config.ARGB_8888;
} else {
opts.inPreferredConfig = Bitmap.Config.RGB_565;
@@ -1057,6 +1064,12 @@ public class ImageLoader {
FileLog.e("tmessages", e);
}
}
+ try {
+ new File(cachePath, ".nomedia").createNewFile();
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
+
mediaDirs.put(FileLoader.MEDIA_DIR_CACHE, cachePath);
FileLog.e("tmessages", "cache path = " + cachePath);
@@ -1678,42 +1691,47 @@ public class ImageLoader {
runHttpFileLoadTasks(null, 0);
}
- private void runHttpFileLoadTasks(HttpFileTask oldTask, int reason) {
- if (oldTask != null) {
- currentHttpFileLoadTasksCount--;
- }
- if (oldTask != null) {
- if (reason == 1) {
- if (oldTask.canRetry) {
- final HttpFileTask newTask = new HttpFileTask(oldTask.url, oldTask.tempFile, oldTask.ext);
- Runnable runnable = new Runnable() {
- @Override
- public void run() {
- httpFileLoadTasks.add(newTask);
- runHttpFileLoadTasks(null, 0);
- }
- };
- retryHttpsTasks.put(oldTask.url, runnable);
- AndroidUtilities.runOnUIThread(runnable, 1000);
- } else {
- NotificationCenter.getInstance().postNotificationName(NotificationCenter.httpFileDidFailedLoad, oldTask.url);
+ private void runHttpFileLoadTasks(final HttpFileTask oldTask, final int reason) {
+ AndroidUtilities.runOnUIThread(new Runnable() {
+ @Override
+ public void run() {
+ if (oldTask != null) {
+ currentHttpFileLoadTasksCount--;
+ }
+ if (oldTask != null) {
+ if (reason == 1) {
+ if (oldTask.canRetry) {
+ final HttpFileTask newTask = new HttpFileTask(oldTask.url, oldTask.tempFile, oldTask.ext);
+ Runnable runnable = new Runnable() {
+ @Override
+ public void run() {
+ httpFileLoadTasks.add(newTask);
+ runHttpFileLoadTasks(null, 0);
+ }
+ };
+ retryHttpsTasks.put(oldTask.url, runnable);
+ AndroidUtilities.runOnUIThread(runnable, 1000);
+ } else {
+ NotificationCenter.getInstance().postNotificationName(NotificationCenter.httpFileDidFailedLoad, oldTask.url);
+ }
+ } else if (reason == 2) {
+ httpFileLoadTasksByKeys.remove(oldTask.url);
+ File file = new File(FileLoader.getInstance().getDirectory(FileLoader.MEDIA_DIR_CACHE), Utilities.MD5(oldTask.url) + "." + oldTask.ext);
+ String result = oldTask.tempFile.renameTo(file) ? file.toString() : oldTask.tempFile.toString();
+ NotificationCenter.getInstance().postNotificationName(NotificationCenter.httpFileDidLoaded, oldTask.url, result);
+ }
+ }
+ while (currentHttpFileLoadTasksCount < 2 && !httpFileLoadTasks.isEmpty()) {
+ HttpFileTask task = httpFileLoadTasks.poll();
+ if (android.os.Build.VERSION.SDK_INT >= 11) {
+ task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, null, null, null);
+ } else {
+ task.execute(null, null, null);
+ }
+ currentHttpFileLoadTasksCount++;
}
- } else if (reason == 2) {
- httpFileLoadTasksByKeys.remove(oldTask.url);
- File file = new File(FileLoader.getInstance().getDirectory(FileLoader.MEDIA_DIR_CACHE), Utilities.MD5(oldTask.url) + "." + oldTask.ext);
- String result = oldTask.tempFile.renameTo(file) ? file.toString() : oldTask.tempFile.toString();
- NotificationCenter.getInstance().postNotificationName(NotificationCenter.httpFileDidLoaded, oldTask.url, result);
}
- }
- while (currentHttpFileLoadTasksCount < 2 && !httpFileLoadTasks.isEmpty()) {
- HttpFileTask task = httpFileLoadTasks.poll();
- if (android.os.Build.VERSION.SDK_INT >= 11) {
- task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, null, null, null);
- } else {
- task.execute(null, null, null);
- }
- currentHttpFileLoadTasksCount++;
- }
+ });
}
public static Bitmap loadBitmap(String path, Uri uri, float maxWidth, float maxHeight, boolean useMaxScale) {
diff --git a/TMessagesProj/src/main/java/org/telegram/android/ImageReceiver.java b/TMessagesProj/src/main/java/org/telegram/android/ImageReceiver.java
index 9c467f72..6ecff83d 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/ImageReceiver.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/ImageReceiver.java
@@ -69,6 +69,8 @@ public class ImageReceiver implements NotificationCenter.NotificationCenterDeleg
private int alpha = 255;
private boolean isPressed;
private boolean disableRecycle;
+ private int orientation;
+ private boolean centerRotation;
private ImageReceiverDelegate delegate;
public ImageReceiver() {
@@ -209,6 +211,15 @@ public class ImageReceiver implements NotificationCenter.NotificationCenterDeleg
return isPressed;
}
+ public void setOrientation(int angle, boolean center) {
+ orientation = angle;
+ centerRotation = center;
+ }
+
+ public int getOrientation() {
+ return orientation;
+ }
+
public void setImageBitmap(Bitmap bitmap) {
setImageBitmap(bitmap != null ? new BitmapDrawable(null, bitmap) : null);
}
@@ -280,8 +291,17 @@ public class ImageReceiver implements NotificationCenter.NotificationCenterDeleg
canvas.drawRoundRect(roundRect, roundRadius, roundRadius, roundPaint);
}
} else {
- int bitmapW = bitmapDrawable.getIntrinsicWidth();
- int bitmapH = bitmapDrawable.getIntrinsicHeight();
+ int bitmapW;
+ int bitmapH;
+ int originalW = bitmapDrawable.getIntrinsicWidth();
+ int originalH = bitmapDrawable.getIntrinsicHeight();
+ if (orientation == 90 || orientation == 270) {
+ bitmapW = bitmapDrawable.getIntrinsicHeight();
+ bitmapH = bitmapDrawable.getIntrinsicWidth();
+ } else {
+ bitmapW = bitmapDrawable.getIntrinsicWidth();
+ bitmapH = bitmapDrawable.getIntrinsicHeight();
+ }
float scaleW = bitmapW / (float) imageW;
float scaleH = bitmapH / (float) imageH;
@@ -312,14 +332,32 @@ public class ImageReceiver implements NotificationCenter.NotificationCenterDeleg
canvas.save();
canvas.clipRect(imageX, imageY, imageX + imageW, imageY + imageH);
+ if (orientation != 0) {
+ if (centerRotation) {
+ canvas.rotate(orientation, imageW / 2, imageH / 2);
+ } else {
+ canvas.rotate(orientation, 0, 0);
+ }
+ }
+
if (bitmapW / scaleH > imageW) {
bitmapW /= scaleH;
+ originalW /= scaleH;
drawRegion.set(imageX - (bitmapW - imageW) / 2, imageY, imageX + (bitmapW + imageW) / 2, imageY + imageH);
} else {
bitmapH /= scaleW;
+ originalH /= scaleW;
drawRegion.set(imageX, imageY - (bitmapH - imageH) / 2, imageX + imageW, imageY + (bitmapH + imageH) / 2);
}
- bitmapDrawable.setBounds(drawRegion);
+ if (orientation == 90 || orientation == 270) {
+ int width = (drawRegion.right - drawRegion.left) / 2;
+ int height = (drawRegion.bottom - drawRegion.top) / 2;
+ int centerX = (drawRegion.right + drawRegion.left) / 2;
+ int centerY = (drawRegion.top + drawRegion.bottom) / 2;
+ bitmapDrawable.setBounds(centerX - height, centerY - width, centerX + height, centerY + width);
+ } else {
+ bitmapDrawable.setBounds(drawRegion);
+ }
if (isVisible) {
try {
bitmapDrawable.setAlpha(alpha);
@@ -339,8 +377,24 @@ public class ImageReceiver implements NotificationCenter.NotificationCenterDeleg
canvas.restore();
} else {
+ canvas.save();
+ if (orientation != 0) {
+ if (centerRotation) {
+ canvas.rotate(orientation, imageW / 2, imageH / 2);
+ } else {
+ canvas.rotate(orientation, 0, 0);
+ }
+ }
drawRegion.set(imageX, imageY, imageX + imageW, imageY + imageH);
- bitmapDrawable.setBounds(drawRegion);
+ if (orientation == 90 || orientation == 270) {
+ int width = (drawRegion.right - drawRegion.left) / 2;
+ int height = (drawRegion.bottom - drawRegion.top) / 2;
+ int centerX = (drawRegion.right + drawRegion.left) / 2;
+ int centerY = (drawRegion.top + drawRegion.bottom) / 2;
+ bitmapDrawable.setBounds(centerX - height, centerY - width, centerX + height, centerY + width);
+ } else {
+ bitmapDrawable.setBounds(drawRegion);
+ }
if (isVisible) {
try {
bitmapDrawable.setAlpha(alpha);
@@ -357,6 +411,7 @@ public class ImageReceiver implements NotificationCenter.NotificationCenterDeleg
FileLog.e("tmessages", e);
}
}
+ canvas.restore();
}
}
}
@@ -391,6 +446,16 @@ public class ImageReceiver implements NotificationCenter.NotificationCenterDeleg
return null;
}
+ public int getBitmapWidth() {
+ Bitmap bitmap = getBitmap();
+ return orientation == 0 || orientation == 180 ? bitmap.getWidth() : bitmap.getHeight();
+ }
+
+ public int getBitmapHeight() {
+ Bitmap bitmap = getBitmap();
+ return orientation == 0 || orientation == 180 ? bitmap.getHeight() : bitmap.getWidth();
+ }
+
public void setVisible(boolean value, boolean invalidate) {
if (isVisible == value) {
return;
diff --git a/TMessagesProj/src/main/java/org/telegram/android/LocaleController.java b/TMessagesProj/src/main/java/org/telegram/android/LocaleController.java
index db7b228b..1d2094bc 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/LocaleController.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/LocaleController.java
@@ -54,6 +54,7 @@ public class LocaleController {
public static FastDateFormat formatterWeek;
public static FastDateFormat formatterMonth;
public static FastDateFormat formatterYear;
+ public static FastDateFormat formatterMonthYear;
public static FastDateFormat formatterYearMax;
public static FastDateFormat chatDate;
public static FastDateFormat chatFullDate;
@@ -135,7 +136,7 @@ public class LocaleController {
addRules(new String[]{"bem", "brx", "da", "de", "el", "en", "eo", "es", "et", "fi", "fo", "gl", "he", "iw", "it", "nb",
"nl", "nn", "no", "sv", "af", "bg", "bn", "ca", "eu", "fur", "fy", "gu", "ha", "is", "ku",
"lb", "ml", "mr", "nah", "ne", "om", "or", "pa", "pap", "ps", "so", "sq", "sw", "ta", "te",
- "tk", "ur", "zu", "mn", "gsw", "chr", "rm", "pt"}, new PluralRules_One());
+ "tk", "ur", "zu", "mn", "gsw", "chr", "rm", "pt", "an", "ast"}, new PluralRules_One());
addRules(new String[]{"cs", "sk"}, new PluralRules_Czech());
addRules(new String[]{"ff", "fr", "kab"}, new PluralRules_French());
addRules(new String[]{"hr", "ru", "sr", "uk", "be", "bs", "sh"}, new PluralRules_Balkan());
@@ -443,10 +444,12 @@ public class LocaleController {
}
private HashMap getLocaleFileStrings(File file) {
+ FileInputStream stream = null;
try {
HashMap stringMap = new HashMap<>();
XmlPullParser parser = Xml.newPullParser();
- parser.setInput(new FileInputStream(file), "UTF-8");
+ stream = new FileInputStream(file);
+ parser.setInput(stream, "UTF-8");
int eventType = parser.getEventType();
String name = null;
String value = null;
@@ -483,6 +486,15 @@ public class LocaleController {
return stringMap;
} catch (Exception e) {
FileLog.e("tmessages", e);
+ } finally {
+ try {
+ if (stream != null) {
+ stream.close();
+ stream = null;
+ }
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
}
return null;
}
@@ -544,6 +556,9 @@ public class LocaleController {
currentLocale = newLocale;
currentLocaleInfo = localeInfo;
currentPluralRules = allRules.get(currentLocale.getLanguage());
+ if (currentPluralRules == null) {
+ currentPluralRules = allRules.get("en");
+ }
changingConfiguration = true;
Locale.setDefault(currentLocale);
android.content.res.Configuration config = new android.content.res.Configuration();
@@ -571,6 +586,9 @@ public class LocaleController {
if (value == null) {
value = ApplicationLoader.applicationContext.getString(res);
}
+ if (value == null) {
+ value = "LOC_ERR:" + key;
+ }
return value;
}
@@ -638,6 +656,9 @@ public class LocaleController {
}
currentLocale = newLocale;
currentPluralRules = allRules.get(currentLocale.getLanguage());
+ if (currentPluralRules == null) {
+ currentPluralRules = allRules.get("en");
+ }
}
}
}
@@ -695,6 +716,20 @@ public class LocaleController {
}
}
+ private FastDateFormat createFormatter(Locale locale, String format, String defaultFormat) {
+ if (format == null || format.length() == 0) {
+ format = defaultFormat;
+ }
+ FastDateFormat formatter = null;
+ try {
+ formatter = FastDateFormat.getInstance(format, locale);
+ } catch (Exception e) {
+ format = defaultFormat;
+ formatter = FastDateFormat.getInstance(format, locale);
+ }
+ return formatter;
+ }
+
public void recreateFormatters() {
Locale locale = currentLocale;
if (locale == null) {
@@ -706,59 +741,15 @@ public class LocaleController {
}
isRTL = lang.toLowerCase().equals("ar");
nameDisplayOrder = lang.toLowerCase().equals("ko") ? 2 : 1;
- String formatString = getStringInternal("formatterMonth", R.string.formatterMonth);
- if (formatString == null || formatString.length() == 0) {
- formatString = "dd MMM";
- }
- formatterMonth = FastDateFormat.getInstance(formatString, locale);
- formatString = getStringInternal("formatterYear", R.string.formatterYear);
- if (formatString == null || formatString.length() == 0) {
- formatString = "dd.MM.yy";
- }
- formatterYear = FastDateFormat.getInstance(formatString, locale);
-
- formatString = getStringInternal("formatterYearMax", R.string.formatterYearMax);
- if (formatString == null || formatString.length() == 0) {
- formatString = "dd.MM.yyyy";
- }
- formatterYearMax = FastDateFormat.getInstance(formatString, locale);
-
- formatString = getStringInternal("chatDate", R.string.chatDate);
- if (formatString == null || formatString.length() == 0) {
- formatString = "d MMMM";
- }
- chatDate = FastDateFormat.getInstance(formatString, locale);
-
- formatString = getStringInternal("chatFullDate", R.string.chatFullDate);
- if (formatString == null || formatString.length() == 0) {
- formatString = "d MMMM yyyy";
- }
- chatFullDate = FastDateFormat.getInstance(formatString, locale);
-
- formatString = getStringInternal("formatterWeek", R.string.formatterWeek);
- if (formatString == null || formatString.length() == 0) {
- formatString = "EEE";
- }
- formatterWeek = FastDateFormat.getInstance(formatString, locale);
-
- if (is24HourFormat) {
- formatString = getStringInternal("formatterDay24H", R.string.formatterDay24H);
- } else {
- formatString = getStringInternal("formatterDay12H", R.string.formatterDay12H);
- }
- if (formatString == null || formatString.length() == 0) {
- if (is24HourFormat) {
- formatString = "HH:mm";
- } else {
- formatString = "h:mm a";
- }
- }
- if (lang.toLowerCase().equals("ar") || lang.toLowerCase().equals("ko")) {
- formatterDay = FastDateFormat.getInstance(formatString, locale);
- } else {
- formatterDay = FastDateFormat.getInstance(formatString, Locale.US);
- }
+ formatterMonth = createFormatter(locale, getStringInternal("formatterMonth", R.string.formatterMonth), "dd MMM");
+ formatterYear = createFormatter(locale, getStringInternal("formatterYear", R.string.formatterYear), "dd.MM.yy");
+ formatterYearMax = createFormatter(locale, getStringInternal("formatterYearMax", R.string.formatterYearMax), "dd.MM.yyyy");
+ chatDate = createFormatter(locale, getStringInternal("chatDate", R.string.chatDate), "d MMMM");
+ chatFullDate = createFormatter(locale, getStringInternal("chatFullDate", R.string.chatFullDate), "d MMMM yyyy");
+ formatterWeek = createFormatter(locale, getStringInternal("formatterWeek", R.string.formatterWeek), "EEE");
+ formatterMonthYear = createFormatter(locale, getStringInternal("formatterMonthYear", R.string.formatterMonthYear), "MMMM yyyy");
+ formatterDay = createFormatter(lang.toLowerCase().equals("ar") || lang.toLowerCase().equals("ko") ? locale : Locale.US, is24HourFormat ? getStringInternal("formatterDay24H", R.string.formatterDay24H) : getStringInternal("formatterDay12H", R.string.formatterDay12H), is24HourFormat ? "HH:mm" : "h:mm a");
}
public static String stringForMessageListDate(long date) {
diff --git a/TMessagesProj/src/main/java/org/telegram/android/MediaController.java b/TMessagesProj/src/main/java/org/telegram/android/MediaController.java
index efa53b09..0207db4e 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/MediaController.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/MediaController.java
@@ -165,6 +165,8 @@ public class MediaController implements NotificationCenter.NotificationCenterDel
public int size;
public int type;
public int date;
+ public String thumbPath;
+ public String imagePath;
}
public final static String MIME_TYPE = "video/avc";
@@ -1696,10 +1698,10 @@ public class MediaController implements NotificationCenter.NotificationCenterDel
FileLog.e("tmessages", e);
result = false;
} finally {
- if(source != null) {
+ if (source != null) {
source.close();
}
- if(destination != null) {
+ if (destination != null) {
destination.close();
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/android/MessageObject.java b/TMessagesProj/src/main/java/org/telegram/android/MessageObject.java
index 1c6c0dd4..afc8fee5 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/MessageObject.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/MessageObject.java
@@ -42,6 +42,7 @@ public class MessageObject {
public int type;
public int contentType;
public String dateKey;
+ public String monthKey;
public boolean deleted = false;
public float audioProgress;
public int audioProgressSec;
@@ -71,6 +72,12 @@ public class MessageObject {
textPaint.linkColor = 0xff316f9f;
}
+ int color = AndroidUtilities.getIntDef("chatRTextColor", 0xff000000);
+ textPaint.setColor(color);
+ if(color != 0xff000000){
+ textPaint.linkColor = AndroidUtilities.getIntDarkerColor("chatRTextColor", -0x50);
+ }
+
textPaint.setTextSize(AndroidUtilities.dp(MessagesController.getInstance().fontSize));
messageOwner = message;
@@ -199,7 +206,7 @@ public class MessageObject {
}
}
} else if (message.action instanceof TLRPC.TL_messageActionLoginUnknownLocation) {
- String date = LocaleController.formatString("formatDateAtTime", R.string.formatDateAtTime, LocaleController.formatterYear.format(((long)message.date) * 1000), LocaleController.formatterDay.format(((long)message.date) * 1000));
+ String date = LocaleController.formatString("formatDateAtTime", R.string.formatDateAtTime, LocaleController.formatterYear.format(((long) message.date) * 1000), LocaleController.formatterDay.format(((long) message.date) * 1000));
TLRPC.User to_user = UserConfig.getCurrentUser();
if (to_user == null) {
if (users != null) {
@@ -346,11 +353,14 @@ public class MessageObject {
}
Calendar rightNow = new GregorianCalendar();
- rightNow.setTimeInMillis((long)(messageOwner.date) * 1000);
+ rightNow.setTimeInMillis((long) (messageOwner.date) * 1000);
int dateDay = rightNow.get(Calendar.DAY_OF_YEAR);
int dateYear = rightNow.get(Calendar.YEAR);
int dateMonth = rightNow.get(Calendar.MONTH);
dateKey = String.format("%d_%02d_%02d", dateYear, dateMonth, dateDay);
+ if (contentType == 1 || contentType == 2) {
+ monthKey = String.format("%d_%02d", dateYear, dateMonth);
+ }
if (generateLayout) {
generateLayout();
@@ -556,7 +566,7 @@ public class MessageObject {
textHeight = textLayout.getHeight();
int linesCount = textLayout.getLineCount();
- int blocksCount = (int)Math.ceil((float)linesCount / LINES_PER_BLOCK);
+ int blocksCount = (int) Math.ceil((float) linesCount / LINES_PER_BLOCK);
int linesOffset = 0;
float prevOffset = 0;
@@ -581,7 +591,7 @@ public class MessageObject {
block.textLayout = new StaticLayout(str, textPaint, maxWidth, Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
block.textYOffset = textLayout.getLineTop(linesOffset);
if (a != 0) {
- blockHeight = Math.min(blockHeight, (int)(block.textYOffset - prevOffset));
+ blockHeight = Math.min(blockHeight, (int) (block.textYOffset - prevOffset));
}
prevOffset = block.textYOffset;
/*if (a != blocksCount - 1) {
@@ -613,7 +623,7 @@ public class MessageObject {
FileLog.e("tmessages", e);
}
- int linesMaxWidth = (int)Math.ceil(lastLine);
+ int linesMaxWidth = (int) Math.ceil(lastLine);
int lastLineWidthWithLeft;
int linesMaxWidthWithLeft;
boolean hasNonRTL = false;
@@ -622,7 +632,7 @@ public class MessageObject {
lastLineWidth = linesMaxWidth;
}
- linesMaxWidthWithLeft = lastLineWidthWithLeft = (int)Math.ceil(lastLine + lastLeft);
+ linesMaxWidthWithLeft = lastLineWidthWithLeft = (int) Math.ceil(lastLine + lastLeft);
if (lastLeft == 0) {
hasNonRTL = true;
}
@@ -655,8 +665,8 @@ public class MessageObject {
}
textRealMaxWidth = Math.max(textRealMaxWidth, lineWidth);
textRealMaxWidthWithLeft = Math.max(textRealMaxWidthWithLeft, lineWidth + lineLeft);
- linesMaxWidth = Math.max(linesMaxWidth, (int)Math.ceil(lineWidth));
- linesMaxWidthWithLeft = Math.max(linesMaxWidthWithLeft, (int)Math.ceil(lineWidth + lineLeft));
+ linesMaxWidth = Math.max(linesMaxWidth, (int) Math.ceil(lineWidth));
+ linesMaxWidthWithLeft = Math.max(linesMaxWidthWithLeft, (int) Math.ceil(lineWidth + lineLeft));
}
if (hasNonRTL) {
textRealMaxWidth = textRealMaxWidthWithLeft;
@@ -667,7 +677,7 @@ public class MessageObject {
} else if (a == blocksCount - 1) {
lastLineWidth = linesMaxWidth;
}
- textWidth = Math.max(textWidth, (int)Math.ceil(textRealMaxWidth));
+ textWidth = Math.max(textWidth, (int) Math.ceil(textRealMaxWidth));
} else {
textWidth = Math.max(textWidth, Math.min(maxWidth, linesMaxWidth));
}
@@ -696,7 +706,7 @@ public class MessageObject {
}
public void setIsRead() {
- messageOwner.flags &=~ TLRPC.MESSAGE_FLAG_UNREAD;
+ messageOwner.flags &= ~TLRPC.MESSAGE_FLAG_UNREAD;
}
public boolean isSecretPhoto() {
@@ -714,7 +724,7 @@ public class MessageObject {
if (unread) {
message.flags |= TLRPC.MESSAGE_FLAG_UNREAD;
} else {
- message.flags &=~ TLRPC.MESSAGE_FLAG_UNREAD;
+ message.flags &= ~TLRPC.MESSAGE_FLAG_UNREAD;
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/android/MessagesController.java b/TMessagesProj/src/main/java/org/telegram/android/MessagesController.java
index 71bd216e..a7c97325 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/MessagesController.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/MessagesController.java
@@ -9,10 +9,12 @@
package org.telegram.android;
import android.app.Activity;
+import android.app.AlertDialog;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.os.Build;
import android.text.Html;
+import android.util.Base64;
import android.util.SparseArray;
import org.telegram.messenger.ConnectionsManager;
@@ -20,11 +22,14 @@ import org.telegram.messenger.FileLoader;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.R;
import org.telegram.messenger.RPCRequest;
+import org.telegram.messenger.SerializedData;
+import org.telegram.messenger.TLClassStore;
import org.telegram.messenger.TLObject;
import org.telegram.messenger.TLRPC;
import org.telegram.messenger.UserConfig;
import org.telegram.messenger.Utilities;
import org.telegram.messenger.ApplicationLoader;
+import org.telegram.ui.ActionBar.BaseFragment;
import java.util.ArrayList;
import java.util.Collections;
@@ -86,6 +91,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter
public int fontSize = AndroidUtilities.dp(16);
public int maxGroupCount = 200;
public int maxBroadcastCount = 100;
+ public int groupBigSize;
+ private ArrayList disabledFeatures = new ArrayList<>();
private class UserActionUpdates extends TLRPC.Updates {
@@ -102,6 +109,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter
public static final int UPDATE_MASK_READ_DIALOG_MESSAGE = 256;
public static final int UPDATE_MASK_SELECT_DIALOG = 512;
public static final int UPDATE_MASK_PHONE = 1024;
+ public static final int UPDATE_MASK_NEW_MESSAGE = 2048;
+ public static final int UPDATE_MASK_SEND_STATE = 4096;
public static final int UPDATE_MASK_ALL = UPDATE_MASK_AVATAR | UPDATE_MASK_STATUS | UPDATE_MASK_NAME | UPDATE_MASK_CHAT_AVATAR | UPDATE_MASK_CHAT_NAME | UPDATE_MASK_CHAT_MEMBERS | UPDATE_MASK_USER_PRINT | UPDATE_MASK_USER_PHONE | UPDATE_MASK_READ_DIALOG_MESSAGE | UPDATE_MASK_PHONE;
public static class PrintingUser {
@@ -138,7 +147,26 @@ public class MessagesController implements NotificationCenter.NotificationCenter
preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
maxGroupCount = preferences.getInt("maxGroupCount", 200);
maxBroadcastCount = preferences.getInt("maxBroadcastCount", 100);
+ groupBigSize = preferences.getInt("groupBigSize", 10);
fontSize = preferences.getInt("fons_size", AndroidUtilities.isTablet() ? 18 : 16);
+ String disabledFeaturesString = preferences.getString("disabledFeatures", null);
+ if (disabledFeaturesString != null && disabledFeaturesString.length() != 0) {
+ try {
+ byte[] bytes = Base64.decode(disabledFeaturesString, Base64.DEFAULT);
+ if (bytes != null) {
+ SerializedData data = new SerializedData(bytes);
+ int count = data.readInt32();
+ for (int a = 0; a < count; a++) {
+ TLRPC.TL_disabledFeature feature = (TLRPC.TL_disabledFeature) TLClassStore.Instance().TLdeserialize(data, data.readInt32());
+ if (feature != null && feature.feature != null && feature.description != null) {
+ disabledFeatures.add(feature);
+ }
+ }
+ }
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
+ }
}
public void updateConfig(final TLRPC.TL_config config) {
@@ -147,15 +175,52 @@ public class MessagesController implements NotificationCenter.NotificationCenter
public void run() {
maxBroadcastCount = config.broadcast_size_max;
maxGroupCount = config.chat_size_max;
+ groupBigSize = config.chat_big_size;
+ disabledFeatures = config.disabled_features;
+
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit();
editor.putInt("maxGroupCount", maxGroupCount);
editor.putInt("maxBroadcastCount", maxBroadcastCount);
+ editor.putInt("groupBigSize", groupBigSize);
+ try {
+ SerializedData data = new SerializedData();
+ data.writeInt32(disabledFeatures.size());
+ for (TLRPC.TL_disabledFeature disabledFeature : disabledFeatures) {
+ disabledFeature.serializeToStream(data);
+ }
+ String string = Base64.encodeToString(data.toByteArray(), Base64.DEFAULT);
+ if (string != null && string.length() != 0) {
+ editor.putString("disabledFeatures", string);
+ }
+ } catch (Exception e) {
+ editor.remove("disabledFeatures");
+ FileLog.e("tmessages", e);
+ }
editor.commit();
}
});
}
+ public static boolean isFeatureEnabled(String feature, BaseFragment fragment) {
+ if (feature == null || feature.length() == 0 || getInstance().disabledFeatures.isEmpty() || fragment == null) {
+ return true;
+ }
+ for (TLRPC.TL_disabledFeature disabledFeature : getInstance().disabledFeatures) {
+ if (disabledFeature.feature.equals(feature)) {
+ if (fragment.getParentActivity() != null) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(fragment.getParentActivity());
+ builder.setTitle("Oops!");
+ builder.setPositiveButton(R.string.OK, null);
+ builder.setMessage(disabledFeature.description);
+ fragment.showAlertDialog(builder);
+ }
+ return false;
+ }
+ }
+ return true;
+ }
+
public void addSupportUser() {
TLRPC.TL_userForeign user = new TLRPC.TL_userForeign();
user.phone = "333";
@@ -863,6 +928,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
AndroidUtilities.runOnUIThread(new Runnable() {
@Override
public void run() {
+ NotificationCenter.getInstance().postNotificationName(NotificationCenter.mainUserInfoChanged);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, MessagesController.UPDATE_MASK_ALL);
UserConfig.saveConfig(true);
}
@@ -944,10 +1010,6 @@ public class MessagesController implements NotificationCenter.NotificationCenter
}
public void deleteDialog(final long did, int offset, final boolean onlyHistory) {
- if (offset == 0) {
- MessagesStorage.getInstance().deleteDialog(did, onlyHistory);
- }
-
int lower_part = (int)did;
int high_id = (int)(did >> 32);
@@ -963,7 +1025,10 @@ public class MessagesController implements NotificationCenter.NotificationCenter
dialog.unread_count = 0;
}
dialogMessage.remove(dialog.top_message);
+ dialog.top_message = 0;
}
+ NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
+ NotificationCenter.getInstance().postNotificationName(NotificationCenter.removeAllMessagesFromDialog, did);
MessagesStorage.getInstance().getStorageQueue().postRunnable(new Runnable() {
@Override
public void run() {
@@ -978,8 +1043,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter
});
}
});
- NotificationCenter.getInstance().postNotificationName(NotificationCenter.removeAllMessagesFromDialog, did);
- NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
+
+ MessagesStorage.getInstance().deleteDialog(did, onlyHistory);
}
if (high_id == 1) {
@@ -1437,8 +1502,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter
currentDialog.unread_count = entry.getValue();
}
}
- NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
+ NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate);
}
});
}
@@ -1533,8 +1598,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter
dialogsServerOnly.add(d);
}
}
- NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
+ NotificationsController.getInstance().processDialogsUpdateRead(dialogsToUpdate);
}
});
}
@@ -1554,8 +1619,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter
if (resetEnd) {
dialogsEndReached = false;
}
- loadDialogs(offset, serverOffset, count, false);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
+ loadDialogs(offset, serverOffset, count, false);
}
});
return;
@@ -1713,6 +1778,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter
req.peer.chat_id = -lower_part;
} else {
TLRPC.User user = getUser(lower_part);
+ if (user == null) {
+ return;
+ }
if (user instanceof TLRPC.TL_userForeign || user instanceof TLRPC.TL_userRequest) {
req.peer = new TLRPC.TL_inputPeerForeign();
req.peer.user_id = user.id;
@@ -1865,8 +1933,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter
arr.add(newMsg);
MessagesStorage.getInstance().putMessages(arr, false, true, false, 0);
updateInterfaceWithMessages(newMsg.dialog_id, objArr);
- NotificationCenter.getInstance().postNotificationName(NotificationCenter.chatDidCreated, chat.id);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
+ NotificationCenter.getInstance().postNotificationName(NotificationCenter.chatDidCreated, chat.id);
return 0;
} else {
@@ -1903,8 +1971,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter
messagesObj.add(new MessageObject(res.message, users, true));
TLRPC.Chat chat = res.chats.get(0);
updateInterfaceWithMessages(-chat.id, messagesObj);
- NotificationCenter.getInstance().postNotificationName(NotificationCenter.chatDidCreated, chat.id);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
+ NotificationCenter.getInstance().postNotificationName(NotificationCenter.chatDidCreated, chat.id);
if (uploadedAvatar != null) {
changeChatAvatar(chat.id, uploadedAvatar);
}
@@ -1950,8 +2018,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter
messagesObj.add(new MessageObject(res.message, users, true));
TLRPC.Chat chat = res.chats.get(0);
updateInterfaceWithMessages(-chat.id, messagesObj);
- NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, UPDATE_MASK_CHAT_MEMBERS);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
+ NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, UPDATE_MASK_CHAT_MEMBERS);
if (info != null) {
for (TLRPC.TL_chatParticipant p : info.participants) {
@@ -2032,8 +2100,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter
messagesObj.add(new MessageObject(res.message, users, true));
TLRPC.Chat chat = res.chats.get(0);
updateInterfaceWithMessages(-chat.id, messagesObj);
- NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, UPDATE_MASK_CHAT_MEMBERS);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
+ NotificationCenter.getInstance().postNotificationName(NotificationCenter.updateInterfaces, UPDATE_MASK_CHAT_MEMBERS);
}
boolean changed = false;
if (info != null) {
@@ -2851,10 +2919,10 @@ public class MessagesController implements NotificationCenter.NotificationCenter
}
public boolean isDialogMuted(long dialog_id) {
- TLRPC.TL_dialog dialog = dialogs_dict.get(dialog_id);
+ /*TLRPC.TL_dialog dialog = dialogs_dict.get(dialog_id);
if (dialog != null) {
return isNotifySettingsMuted(dialog.notify_settings);
- } else {
+ } else {*/
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
int mute_type = preferences.getInt("notify2_" + dialog_id, 0);
if (mute_type == 2) {
@@ -2865,7 +2933,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
return true;
}
}
- }
+ //}
return false;
}
@@ -3577,4 +3645,6 @@ public class MessagesController implements NotificationCenter.NotificationCenter
}
}
}
+
+
}
diff --git a/TMessagesProj/src/main/java/org/telegram/android/MessagesStorage.java b/TMessagesProj/src/main/java/org/telegram/android/MessagesStorage.java
index 87f0e198..160447de 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/MessagesStorage.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/MessagesStorage.java
@@ -838,6 +838,59 @@ public class MessagesStorage {
//database.executeFast("DELETE FROM secret_holes WHERE uid = " + high_id).stepThis().dispose();
}
}
+
+ if ((int) did == 0) {
+ SQLiteCursor cursor = database.queryFinalized(String.format(Locale.US, "SELECT data FROM messages WHERE uid = " + did));
+ ArrayList filesToDelete = new ArrayList<>();
+ try {
+ while (cursor.next()) {
+ ByteBufferDesc data = buffersStorage.getFreeBuffer(cursor.byteArrayLength(0));
+ if (data != null && cursor.byteBufferValue(0, data.buffer) != 0) {
+ TLRPC.Message message = (TLRPC.Message) TLClassStore.Instance().TLdeserialize(data, data.readInt32());
+ if (message == null || message.media == null) {
+ continue;
+ }
+ if (message.media instanceof TLRPC.TL_messageMediaAudio) {
+ File file = FileLoader.getPathToAttach(message.media.audio);
+ if (file != null && file.toString().length() > 0) {
+ filesToDelete.add(file);
+ }
+ } else if (message.media instanceof TLRPC.TL_messageMediaPhoto) {
+ for (TLRPC.PhotoSize photoSize : message.media.photo.sizes) {
+ File file = FileLoader.getPathToAttach(photoSize);
+ if (file != null && file.toString().length() > 0) {
+ filesToDelete.add(file);
+ }
+ }
+ } else if (message.media instanceof TLRPC.TL_messageMediaVideo) {
+ File file = FileLoader.getPathToAttach(message.media.video);
+ if (file != null && file.toString().length() > 0) {
+ filesToDelete.add(file);
+ }
+ file = FileLoader.getPathToAttach(message.media.video.thumb);
+ if (file != null && file.toString().length() > 0) {
+ filesToDelete.add(file);
+ }
+ } else if (message.media instanceof TLRPC.TL_messageMediaDocument) {
+ File file = FileLoader.getPathToAttach(message.media.document);
+ if (file != null && file.toString().length() > 0) {
+ filesToDelete.add(file);
+ }
+ file = FileLoader.getPathToAttach(message.media.document.thumb);
+ if (file != null && file.toString().length() > 0) {
+ filesToDelete.add(file);
+ }
+ }
+ }
+ buffersStorage.reuseFreeBuffer(data);
+ }
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
+ cursor.dispose();
+ FileLoader.getInstance().deleteFiles(filesToDelete);
+ }
+
database.executeFast("UPDATE dialogs SET unread_count = 0 WHERE did = " + did).stepThis().dispose();
database.executeFast("DELETE FROM messages WHERE uid = " + did).stepThis().dispose();
database.executeFast("DELETE FROM media_counts_v2 WHERE uid = " + did).stepThis().dispose();
@@ -3178,6 +3231,7 @@ public class MessagesStorage {
NotificationCenter.getInstance().postNotificationName(NotificationCenter.messagesDeleted, mids);
}
});
+ MessagesStorage.getInstance().updateDialogsWithReadedMessagesInternal(mids);
MessagesStorage.getInstance().markMessagesAsDeletedInternal(mids);
MessagesStorage.getInstance().updateDialogsWithDeletedMessagesInternal(mids);
}
@@ -3189,9 +3243,6 @@ public class MessagesStorage {
}
private void markMessagesAsDeletedInternal(final ArrayList messages) {
- if (Thread.currentThread().getId() != storageQueue.getId()) {
- throw new RuntimeException("wrong db thread");
- }
try {
String ids = TextUtils.join(",", messages);
SQLiteCursor cursor = database.queryFinalized(String.format(Locale.US, "SELECT uid, data FROM messages WHERE mid IN(%s)", ids));
@@ -3287,7 +3338,7 @@ public class MessagesStorage {
ArrayList usersToLoad = new ArrayList<>();
ArrayList chatsToLoad = new ArrayList<>();
ArrayList encryptedToLoad = new ArrayList<>();
- cursor = database.queryFinalized(String.format(Locale.US, "SELECT d.did, d.last_mid, d.unread_count, d.date, m.data, m.read_state, m.mid, m.send_state FROM dialogs as d LEFT JOIN messages as m ON d.last_mid = m.mid WHERE d.did IN(%s)", ids));
+ cursor = database.queryFinalized(String.format(Locale.US, "SELECT d.did, d.last_mid, d.unread_count, d.date, m.data, m.read_state, m.mid, m.send_state, m.date FROM dialogs as d LEFT JOIN messages as m ON d.last_mid = m.mid WHERE d.did IN(%s)", ids));
while (cursor.next()) {
TLRPC.TL_dialog dialog = new TLRPC.TL_dialog();
dialog.id = cursor.longValue(0);
@@ -3302,6 +3353,10 @@ public class MessagesStorage {
MessageObject.setIsUnread(message, cursor.intValue(5) != 1);
message.id = cursor.intValue(6);
message.send_state = cursor.intValue(7);
+ int date = cursor.intValue(8);
+ if (date != 0) {
+ dialog.last_message_date = date;
+ }
dialogs.messages.add(message);
if (!usersToLoad.contains(message.from_id)) {
@@ -3471,7 +3526,7 @@ public class MessagesStorage {
usersToLoad.add(UserConfig.getClientUserId());
ArrayList chatsToLoad = new ArrayList<>();
ArrayList encryptedToLoad = new ArrayList<>();
- SQLiteCursor cursor = database.queryFinalized(String.format(Locale.US, "SELECT d.did, d.last_mid, d.unread_count, d.date, m.data, m.read_state, m.mid, m.send_state, s.flags FROM dialogs as d LEFT JOIN messages as m ON d.last_mid = m.mid LEFT JOIN dialog_settings as s ON d.did = s.did ORDER BY d.date DESC LIMIT %d,%d", offset, count));
+ SQLiteCursor cursor = database.queryFinalized(String.format(Locale.US, "SELECT d.did, d.last_mid, d.unread_count, d.date, m.data, m.read_state, m.mid, m.send_state, s.flags, m.date FROM dialogs as d LEFT JOIN messages as m ON d.last_mid = m.mid LEFT JOIN dialog_settings as s ON d.did = s.did ORDER BY d.date DESC LIMIT %d,%d", offset, count));
while (cursor.next()) {
TLRPC.TL_dialog dialog = new TLRPC.TL_dialog();
dialog.id = cursor.longValue(0);
@@ -3495,6 +3550,10 @@ public class MessagesStorage {
if (message != null) {
MessageObject.setIsUnread(message, cursor.intValue(5) != 1);
message.id = cursor.intValue(6);
+ int date = cursor.intValue(9);
+ if (date != 0) {
+ dialog.last_message_date = date;
+ }
message.send_state = cursor.intValue(7);
dialogs.messages.add(message);
diff --git a/TMessagesProj/src/main/java/org/telegram/android/NativeLoader.java b/TMessagesProj/src/main/java/org/telegram/android/NativeLoader.java
index eecbbb17..17e55ea2 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/NativeLoader.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/NativeLoader.java
@@ -23,7 +23,7 @@ import java.util.zip.ZipFile;
public class NativeLoader {
- private final static int LIB_VERSION = 5;
+ private final static int LIB_VERSION = 6;
private final static String LIB_NAME = "tmessages." + LIB_VERSION;
private final static String LIB_SO_NAME = "lib" + LIB_NAME + ".so";
private final static String LOCALE_LIB_SO_NAME = "lib" + LIB_NAME + "loc.so";
diff --git a/TMessagesProj/src/main/java/org/telegram/android/NotificationCenter.java b/TMessagesProj/src/main/java/org/telegram/android/NotificationCenter.java
index 6e045c32..5ae1cae0 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/NotificationCenter.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/NotificationCenter.java
@@ -48,6 +48,9 @@ public class NotificationCenter {
public static final int updateMessageMedia = totalEvents++;
public static final int recentImagesDidLoaded = totalEvents++;
public static final int replaceMessagesObjects = totalEvents++;
+ public static final int didSetPasscode = totalEvents++;
+ public static final int screenStateChanged = totalEvents++;
+ public static final int appSwitchedToForeground = totalEvents++;
public static final int httpFileDidLoaded = totalEvents++;
public static final int httpFileDidFailedLoad = totalEvents++;
diff --git a/TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java b/TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java
index c0cc5d4f..cef1faa8 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java
@@ -11,6 +11,7 @@ package org.telegram.android;
import android.app.Activity;
import android.app.AlarmManager;
import android.app.PendingIntent;
+import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -29,6 +30,7 @@ import android.support.v4.app.RemoteInput;
import org.json.JSONArray;
import org.json.JSONObject;
import org.telegram.messenger.ConnectionsManager;
+import org.telegram.messenger.DispatchQueue;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.R;
import org.telegram.messenger.RPCRequest;
@@ -48,6 +50,7 @@ public class NotificationsController {
public static final String EXTRA_VOICE_REPLY = "extra_voice_reply";
+ private DispatchQueue notificationsQueue = new DispatchQueue("notificationsQueue");
private ArrayList pushMessages = new ArrayList<>();
private HashMap pushMessagesDict = new HashMap<>();
private NotificationManagerCompat notificationManager = null;
@@ -130,7 +133,9 @@ public class NotificationsController {
}
String msg = null;
- if ((int)dialog_id != 0) {
+ if ((int)dialog_id == 0 || AndroidUtilities.needShowPasscode(false) || UserConfig.isWaitingForPasscodeEnter) {
+ msg = LocaleController.getString("YouHaveNewMessage", R.string.YouHaveNewMessage);
+ } else {
if (chat_id == 0 && user_id != 0) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Context.MODE_PRIVATE);
if (preferences.getBoolean("EnablePreviewAll", true)) {
@@ -237,8 +242,6 @@ public class NotificationsController {
msg = LocaleController.formatString("NotificationMessageGroupNoText", R.string.NotificationMessageGroupNoText, ContactsController.formatName(user.first_name, user.last_name), chat.title);
}
}
- } else {
- msg = LocaleController.getString("YouHaveNewMessage", R.string.YouHaveNewMessage);
}
return msg;
}
@@ -250,7 +253,7 @@ public class NotificationsController {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
int minutes = preferences.getInt("repeat_messages", 60);
if (minutes > 0 && personal_count > 0) {
- alarm.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + minutes * 60 * 1000, pintent);
+ alarm.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + minutes * 60 * 1000, pintent);
} else {
alarm.cancel(pintent);
}
@@ -266,9 +269,9 @@ public class NotificationsController {
PendingIntent pintent = PendingIntent.getService(ApplicationLoader.applicationContext, 0, new Intent(ApplicationLoader.applicationContext, NotificationDelay.class), 0);
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
if (onlineReason) {
- alarm.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + 3 * 1000, pintent);
+ alarm.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 3 * 1000, pintent);
} else {
- alarm.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + 500, pintent);
+ alarm.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, pintent);
}
} catch (Exception e) {
FileLog.e("tmessages", e);
@@ -416,6 +419,9 @@ public class NotificationsController {
intent.putExtra("userId", user_id);
}
}
+ if (AndroidUtilities.needShowPasscode(false) || UserConfig.isWaitingForPasscodeEnter) {
+ photoPath = null;
+ } else {
if (pushDialogs.size() == 1) {
if (chat != null) {
if (chat.photo != null && chat.photo.photo_small != null && chat.photo.photo_small.volume_id != 0 && chat.photo.photo_small.local_id != 0) {
@@ -427,6 +433,7 @@ public class NotificationsController {
}
}
}
+ }
} else {
if (pushDialogs.size() == 1) {
intent.putExtra("encId", (int) (dialog_id >> 32));
@@ -436,7 +443,7 @@ public class NotificationsController {
String name = null;
boolean replace = true;
- if ((int)dialog_id == 0 || pushDialogs.size() > 1) {
+ if ((int)dialog_id == 0 || pushDialogs.size() > 1 || AndroidUtilities.needShowPasscode(false) || UserConfig.isWaitingForPasscodeEnter) {
name = LocaleController.getString("AppName", R.string.AppName);
replace = false;
} else {
@@ -451,7 +458,7 @@ public class NotificationsController {
if (pushDialogs.size() == 1) {
detailText = LocaleController.formatPluralString("NewMessages", total_unread_count);
} else {
- detailText = LocaleController.formatString("NotificationMessagesPeopleDisplayOrder", R.string.NotificationMessagesPeopleDisplayOrder, LocaleController.formatPluralString("NewMessages", total_unread_count), LocaleController.formatPluralString("FromContacts", pushDialogs.size()));
+ detailText = LocaleController.formatString("NotificationMessagesPeopleDisplayOrder", R.string.NotificationMessagesPeopleDisplayOrder, LocaleController.formatPluralString("NewMessages", total_unread_count), LocaleController.formatPluralString("FromChats", pushDialogs.size()));
}
NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(ApplicationLoader.applicationContext)
@@ -462,7 +469,8 @@ public class NotificationsController {
.setContentIntent(contentIntent)
.setGroup("messages")
.setGroupSummary(true)
- .setColor(0xff2ca5e0);
+ //.setColor(0xff2ca5e0);
+ .setColor(AndroidUtilities.getIntColor("themeColor"));
if (priority == 0) {
mBuilder.setPriority(NotificationCompat.PRIORITY_DEFAULT);
@@ -834,7 +842,7 @@ public class NotificationsController {
notifyCheck = isLast;
}
- if (!popupMessages.isEmpty() && oldCount != popupMessages.size()) {
+ if (!popupMessages.isEmpty() && oldCount != popupMessages.size() && !AndroidUtilities.needShowPasscode(false) && !UserConfig.isWaitingForPasscodeEnter) {
if (ApplicationLoader.mainInterfacePaused || !ApplicationLoader.isScreenOn) {
MessageObject messageObject = messageObjects.get(0);
if (popup == 3 || popup == 1 && ApplicationLoader.isScreenOn || popup == 2 && !ApplicationLoader.isScreenOn) {
@@ -988,7 +996,18 @@ public class NotificationsController {
setBadge(ApplicationLoader.applicationContext, enabled ? total_unread_count : 0);
}
- private void setBadge(Context context, int count) {
+ private void setBadge(final Context context, final int count) {
+ notificationsQueue.postRunnable(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ ContentValues cv = new ContentValues();
+ cv.put("tag", "org.telegram.messenger/org.telegram.ui.LaunchActivity");
+ cv.put("count", count);
+ context.getContentResolver().insert(Uri.parse("content://com.teslacoilsw.notifier/unread_count"), cv);
+ } catch (Throwable e) {
+ //ignore
+ }
try {
String launcherClassName = getLauncherClassName(context);
if (launcherClassName == null) {
@@ -1003,6 +1022,8 @@ public class NotificationsController {
FileLog.e("tmessages", e);
}
}
+ });
+ }
public static String getLauncherClassName(Context context) {
try {
diff --git a/TMessagesProj/src/main/java/org/telegram/android/ScreenReceiver.java b/TMessagesProj/src/main/java/org/telegram/android/ScreenReceiver.java
index e6b6c757..d7824f18 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/ScreenReceiver.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/ScreenReceiver.java
@@ -28,5 +28,6 @@ public class ScreenReceiver extends BroadcastReceiver {
ConnectionsManager.getInstance().setAppPaused(false, true);
ApplicationLoader.isScreenOn = true;
}
+ NotificationCenter.getInstance().postNotificationName(NotificationCenter.screenStateChanged);
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/android/SecretChatHelper.java b/TMessagesProj/src/main/java/org/telegram/android/SecretChatHelper.java
index 6a114024..e9d672fc 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/SecretChatHelper.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/SecretChatHelper.java
@@ -1072,8 +1072,8 @@ public class SecretChatHelper {
}
});
MessagesStorage.getInstance().deleteDialog(did, true);
- NotificationCenter.getInstance().postNotificationName(NotificationCenter.removeAllMessagesFromDialog, did);
NotificationCenter.getInstance().postNotificationName(NotificationCenter.dialogsNeedReload);
+ NotificationCenter.getInstance().postNotificationName(NotificationCenter.removeAllMessagesFromDialog, did);
}
});
return null;
@@ -1616,7 +1616,7 @@ public class SecretChatHelper {
}
public void startSecretChat(final Context context, final TLRPC.User user) {
- if (user == null) {
+ if (user == null || context == null) {
return;
}
startingSecretChat = true;
@@ -1777,6 +1777,10 @@ public class SecretChatHelper {
}
}
});
- progressDialog.show();
+ try {
+ progressDialog.show();
+ } catch (Exception e) {
+ //don't promt
+ }
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/android/SendMessagesHelper.java b/TMessagesProj/src/main/java/org/telegram/android/SendMessagesHelper.java
index b7dc050d..4cb3e851 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/SendMessagesHelper.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/SendMessagesHelper.java
@@ -481,6 +481,10 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
sendMessage(null, null, null, null, null, null, user, null, null, null, peer, false, null);
}
+ public void sendMessage(ArrayList messages) {
+
+ }
+
public void sendMessage(MessageObject message) {
sendMessage(null, null, null, null, null, message, null, null, null, null, message.getDialogId(), true, message.messageOwner.attachPath);
}
@@ -1610,6 +1614,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
try {
Bitmap bitmap = ImageLoader.loadBitmap(f.getAbsolutePath(), null, 90, 90, true);
if (bitmap != null) {
+ fileName.file_name = "animation.gif";
document.thumb = ImageLoader.scaleAndSaveImage(bitmap, 90, 90, 55, isEncrypted);
}
} catch (Exception e) {
@@ -1744,7 +1749,7 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
document.id = 0;
document.date = ConnectionsManager.getInstance().getCurrentTime();
TLRPC.TL_documentAttributeFilename fileName = new TLRPC.TL_documentAttributeFilename();
- fileName.file_name = md5;
+ fileName.file_name = "animation.gif";
document.attributes.add(fileName);
document.size = searchImage.size;
document.dc_id = 0;
@@ -1940,112 +1945,116 @@ public class SendMessagesHelper implements NotificationCenter.NotificationCenter
new Thread(new Runnable() {
@Override
public void run() {
+
boolean isEncrypted = (int)dialog_id == 0;
- String path = videoPath;
- String originalPath = videoPath;
- File temp = new File(originalPath);
- originalPath += temp.length() + "_" + temp.lastModified();
- if (videoEditedInfo != null) {
- originalPath += duration + "_" + videoEditedInfo.startTime + "_" + videoEditedInfo.endTime;
- }
- TLRPC.TL_video video = null;
- if (!isEncrypted) {
- video = (TLRPC.TL_video) MessagesStorage.getInstance().getSentFile(originalPath, !isEncrypted ? 2 : 5);
- }
- if (video == null) {
- Bitmap thumb = ThumbnailUtils.createVideoThumbnail(videoPath, MediaStore.Video.Thumbnails.MINI_KIND);
- TLRPC.PhotoSize size = ImageLoader.scaleAndSaveImage(thumb, 90, 90, 55, isEncrypted);
- video = new TLRPC.TL_video();
- video.thumb = size;
- if (video.thumb == null) {
- video.thumb = new TLRPC.TL_photoSizeEmpty();
- video.thumb.type = "s";
- } else {
- video.thumb.type = "s";
- }
- video.caption = "";
- video.mime_type = "video/mp4";
- video.id = 0;
- UserConfig.saveConfig(false);
-
+ if (videoEditedInfo != null || videoPath.endsWith("mp4")) {
+ String path = videoPath;
+ String originalPath = videoPath;
+ File temp = new File(originalPath);
+ originalPath += temp.length() + "_" + temp.lastModified();
if (videoEditedInfo != null) {
- video.duration = (int)(duration / 1000);
- if (videoEditedInfo.rotationValue == 90 || videoEditedInfo.rotationValue == 270) {
- video.w = height;
- video.h = width;
+ originalPath += duration + "_" + videoEditedInfo.startTime + "_" + videoEditedInfo.endTime;
+ }
+ TLRPC.TL_video video = null;
+ if (!isEncrypted) {
+ video = (TLRPC.TL_video) MessagesStorage.getInstance().getSentFile(originalPath, !isEncrypted ? 2 : 5);
+ }
+ if (video == null) {
+ Bitmap thumb = ThumbnailUtils.createVideoThumbnail(videoPath, MediaStore.Video.Thumbnails.MINI_KIND);
+ TLRPC.PhotoSize size = ImageLoader.scaleAndSaveImage(thumb, 90, 90, 55, isEncrypted);
+ video = new TLRPC.TL_video();
+ video.thumb = size;
+ if (video.thumb == null) {
+ video.thumb = new TLRPC.TL_photoSizeEmpty();
+ video.thumb.type = "s";
} else {
- video.w = width;
- video.h = height;
+ video.thumb.type = "s";
}
- video.size = (int)estimatedSize;
- video.videoEditedInfo = videoEditedInfo;
- String fileName = Integer.MIN_VALUE + "_" + UserConfig.lastLocalId + ".mp4";
- UserConfig.lastLocalId--;
- File cacheFile = new File(FileLoader.getInstance().getDirectory(FileLoader.MEDIA_DIR_CACHE), fileName);
+ video.caption = "";
+ video.mime_type = "video/mp4";
+ video.id = 0;
UserConfig.saveConfig(false);
- path = cacheFile.getAbsolutePath();
- } else {
- if (temp != null && temp.exists()) {
- video.size = (int) temp.length();
- }
- boolean infoObtained = false;
- if (Build.VERSION.SDK_INT >= 14) {
- MediaMetadataRetriever mediaMetadataRetriever = null;
- try {
- mediaMetadataRetriever = new MediaMetadataRetriever();
- mediaMetadataRetriever.setDataSource(videoPath);
- String width = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH);
- if (width != null) {
- video.w = Integer.parseInt(width);
- }
- String height = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT);
- if (height != null) {
- video.h = Integer.parseInt(height);
- }
- String duration = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION);
- if (duration != null) {
- video.duration = (int) Math.ceil(Long.parseLong(duration) / 1000.0f);
- }
- infoObtained = true;
- } catch (Exception e) {
- FileLog.e("tmessages", e);
- } finally {
+
+ if (videoEditedInfo != null) {
+ video.duration = (int) (duration / 1000);
+ if (videoEditedInfo.rotationValue == 90 || videoEditedInfo.rotationValue == 270) {
+ video.w = height;
+ video.h = width;
+ } else {
+ video.w = width;
+ video.h = height;
+ }
+ video.size = (int) estimatedSize;
+ video.videoEditedInfo = videoEditedInfo;
+ String fileName = Integer.MIN_VALUE + "_" + UserConfig.lastLocalId + ".mp4";
+ UserConfig.lastLocalId--;
+ File cacheFile = new File(FileLoader.getInstance().getDirectory(FileLoader.MEDIA_DIR_CACHE), fileName);
+ UserConfig.saveConfig(false);
+ path = cacheFile.getAbsolutePath();
+ } else {
+ if (temp != null && temp.exists()) {
+ video.size = (int) temp.length();
+ }
+ boolean infoObtained = false;
+ if (Build.VERSION.SDK_INT >= 14) {
+ MediaMetadataRetriever mediaMetadataRetriever = null;
try {
- if (mediaMetadataRetriever != null) {
- mediaMetadataRetriever.release();
- mediaMetadataRetriever = null;
+ mediaMetadataRetriever = new MediaMetadataRetriever();
+ mediaMetadataRetriever.setDataSource(videoPath);
+ String width = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH);
+ if (width != null) {
+ video.w = Integer.parseInt(width);
+ }
+ String height = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT);
+ if (height != null) {
+ video.h = Integer.parseInt(height);
+ }
+ String duration = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION);
+ if (duration != null) {
+ video.duration = (int) Math.ceil(Long.parseLong(duration) / 1000.0f);
+ }
+ infoObtained = true;
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ } finally {
+ try {
+ if (mediaMetadataRetriever != null) {
+ mediaMetadataRetriever.release();
+ mediaMetadataRetriever = null;
+ }
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
+ }
+ }
+ if (!infoObtained) {
+ try {
+ MediaPlayer mp = MediaPlayer.create(ApplicationLoader.applicationContext, Uri.fromFile(new File(videoPath)));
+ if (mp != null) {
+ video.duration = (int) Math.ceil(mp.getDuration() / 1000.0f);
+ video.w = mp.getVideoWidth();
+ video.h = mp.getVideoHeight();
+ mp.release();
}
} catch (Exception e) {
FileLog.e("tmessages", e);
}
}
}
- if (!infoObtained) {
- try {
- MediaPlayer mp = MediaPlayer.create(ApplicationLoader.applicationContext, Uri.fromFile(new File(videoPath)));
- if (mp != null) {
- video.duration = (int) Math.ceil(mp.getDuration() / 1000.0f);
- video.w = mp.getVideoWidth();
- video.h = mp.getVideoHeight();
- mp.release();
- }
- } catch (Exception e) {
- FileLog.e("tmessages", e);
- }
+ }
+ final TLRPC.TL_video videoFinal = video;
+ final String originalPathFinal = originalPath;
+ final String finalPath = path;
+ AndroidUtilities.runOnUIThread(new Runnable() {
+ @Override
+ public void run() {
+ SendMessagesHelper.getInstance().sendMessage(videoFinal, originalPathFinal, finalPath, dialog_id);
}
- }
+ });
+ } else {
+ prepareSendingDocumentInternal(videoPath, videoPath, null, null, dialog_id);
}
-
- final TLRPC.TL_video videoFinal = video;
- final String originalPathFinal = originalPath;
- final String finalPath = path;
- AndroidUtilities.runOnUIThread(new Runnable() {
- @Override
- public void run() {
- SendMessagesHelper.getInstance().sendMessage(videoFinal, originalPathFinal, finalPath, dialog_id);
- }
- });
}
}).start();
}
diff --git a/TMessagesProj/src/main/java/org/telegram/android/video/MP4Builder.java b/TMessagesProj/src/main/java/org/telegram/android/video/MP4Builder.java
index 9d9eca96..cdb69332 100644
--- a/TMessagesProj/src/main/java/org/telegram/android/video/MP4Builder.java
+++ b/TMessagesProj/src/main/java/org/telegram/android/video/MP4Builder.java
@@ -59,7 +59,7 @@ public class MP4Builder {
private long dataOffset = 0;
private long writedSinceLastMdat = 0;
private boolean writeNewMdat = true;
- private HashMap track2SampleSizes = new HashMap();
+ private HashMap track2SampleSizes = new HashMap<>();
private ByteBuffer sizeBuffer = null;
public MP4Builder createMovie(Mp4Movie mp4Movie) throws Exception {
@@ -158,7 +158,7 @@ public class MP4Builder {
}
protected FileTypeBox createFileTypeBox() {
- LinkedList minorBrands = new LinkedList();
+ LinkedList minorBrands = new LinkedList<>();
minorBrands.add("isom");
minorBrands.add("3gp4");
return new FileTypeBox("isom", 0, minorBrands);
@@ -347,7 +347,7 @@ public class MP4Builder {
protected void createStts(Track track, SampleTableBox stbl) {
TimeToSampleBox.Entry lastEntry = null;
- List entries = new ArrayList();
+ List entries = new ArrayList<>();
for (long delta : track.getSampleDurations()) {
if (lastEntry != null && lastEntry.getDelta() == delta) {
@@ -418,7 +418,7 @@ public class MP4Builder {
}
protected void createStco(Track track, SampleTableBox stbl) {
- ArrayList chunksOffsets = new ArrayList();
+ ArrayList chunksOffsets = new ArrayList<>();
long lastOffset = -1;
for (Sample sample : track.getSamples()) {
long offset = sample.getOffset();
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java b/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java
index b788712c..481be841 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java
@@ -8,6 +8,7 @@
package org.telegram.messenger;
+import android.app.Activity;
import android.app.AlarmManager;
import android.app.Application;
import android.app.PendingIntent;
@@ -19,6 +20,7 @@ import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
+import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Build;
@@ -38,10 +40,13 @@ import org.telegram.android.LocaleController;
import org.telegram.android.MessagesController;
import org.telegram.android.NativeLoader;
import org.telegram.android.ScreenReceiver;
+import org.telegram.ui.Components.ForegroundDetector;
+import java.io.File;
import java.util.concurrent.atomic.AtomicInteger;
public class ApplicationLoader extends Application {
+
private GoogleCloudMessaging gcm;
private AtomicInteger msgId = new AtomicInteger();
private String regid;
@@ -49,15 +54,80 @@ public class ApplicationLoader extends Application {
public static final String PROPERTY_REG_ID = "registration_id";
private static final String PROPERTY_APP_VERSION = "appVersion";
private static final int PLAY_SERVICES_RESOLUTION_REQUEST = 9000;
- public static Drawable cachedWallpaper = null;
+ private static Drawable cachedWallpaper;
+ private static int selectedColor;
+ private static boolean isCustomTheme;
+ private static final Object sync = new Object();
- public static volatile Context applicationContext = null;
- public static volatile Handler applicationHandler = null;
+ public static volatile Context applicationContext;
+ public static volatile Handler applicationHandler;
private static volatile boolean applicationInited = false;
public static volatile boolean isScreenOn = false;
public static volatile boolean mainInterfacePaused = true;
+ public static boolean isCustomTheme() {
+ return isCustomTheme;
+ }
+
+ public static int getSelectedColor() {
+ return selectedColor;
+ }
+
+ public static void reloadWallpaper() {
+ cachedWallpaper = null;
+ loadWallpaper();
+ }
+
+ public static void loadWallpaper() {
+ if (cachedWallpaper != null) {
+ return;
+ }
+ Utilities.searchQueue.postRunnable(new Runnable() {
+ @Override
+ public void run() {
+ synchronized (sync) {
+ int selectedColor = 0;
+ try {
+ SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
+ int selectedBackground = preferences.getInt("selectedBackground", 1000001);
+ selectedColor = preferences.getInt("selectedColor", 0);
+ int cacheColorHint = 0;
+ if (selectedColor == 0) {
+ if (selectedBackground == 1000001) {
+ cachedWallpaper = applicationContext.getResources().getDrawable(R.drawable.background_hd);
+ isCustomTheme = false;
+ } else {
+ File toFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper.jpg");
+ if (toFile.exists()) {
+ cachedWallpaper = Drawable.createFromPath(toFile.getAbsolutePath());
+ isCustomTheme = true;
+ } else {
+ cachedWallpaper = applicationContext.getResources().getDrawable(R.drawable.background_hd);
+ isCustomTheme = false;
+ }
+ }
+ }
+ } catch (Throwable throwable) {
+ //ignore
+ }
+ if (cachedWallpaper == null) {
+ if (selectedColor == 0) {
+ selectedColor = -2693905;
+ }
+ cachedWallpaper = new ColorDrawable(selectedColor);
+ }
+ }
+ }
+ });
+ }
+
+ public static Drawable getCachedWallpaper() {
+ synchronized (sync) {
+ return cachedWallpaper;
+ }
+ }
+
public static void postInitApplication() {
if (applicationInited) {
return;
@@ -117,6 +187,10 @@ public class ApplicationLoader extends Application {
applicationContext = getApplicationContext();
NativeLoader.initNativeLibs(ApplicationLoader.applicationContext);
+ if (Build.VERSION.SDK_INT >= 14) {
+ new ForegroundDetector(this);
+ }
+
applicationHandler = new Handler(applicationContext.getMainLooper());
startPushService();
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java b/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java
index bc3dd299..487f019c 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java
@@ -366,6 +366,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
datacenters.put(datacenter.datacenterId, datacenter);
}
currentDatacenterId = data.readInt32();
+ data.cleanup();
} catch (Exception e) {
UserConfig.clearConfig();
}
@@ -388,6 +389,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
for (int a = 0; a < count; a++) {
sessionsToDestroy.add(data.readInt64());
}
+ data.cleanup();
}
}
} catch (Exception e) {
@@ -405,6 +407,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
Datacenter datacenter = new Datacenter(data, 1);
datacenters.put(datacenter.datacenterId, datacenter);
}
+ data.cleanup();
}
}
} catch (Exception e) {
@@ -452,7 +455,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
datacenter = new Datacenter();
datacenter.datacenterId = 3;
- datacenter.addAddressAndPort("174.140.142.6", 443);
+ datacenter.addAddressAndPort("149.154.175.100", 443);
datacenters.put(datacenter.datacenterId, datacenter);
datacenter = new Datacenter();
@@ -488,7 +491,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
datacenter = new Datacenter();
datacenter.datacenterId = 3;
- datacenter.addAddressAndPort("174.140.142.6", 443);
+ datacenter.addAddressAndPort("149.154.175.100", 443);
datacenters.put(datacenter.datacenterId, datacenter);
datacenter = new Datacenter();
@@ -528,6 +531,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
data.writeInt64(session);
}
editor.putString("sessionsToDestroy", Base64.encodeToString(data.toByteArray(), Base64.DEFAULT));
+ data.cleanup();
} else {
editor.remove("sessionsToDestroy");
}
@@ -539,6 +543,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
datacenter.SerializeToStream(data);
}
editor.putString("datacenters", Base64.encodeToString(data.toByteArray(), Base64.DEFAULT));
+ data.cleanup();
} else {
editor.remove("datacenters");
}
@@ -763,8 +768,12 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
return;
}
if (error == null) {
- lastDcUpdateTime = (int)(System.currentTimeMillis() / 1000);
TLRPC.TL_config config = (TLRPC.TL_config)response;
+ int updateIn = config.expires - getCurrentTime();
+ if (updateIn <= 0) {
+ updateIn = 120;
+ }
+ lastDcUpdateTime = (int)(System.currentTimeMillis() / 1000) - DC_UPDATE_TIME + updateIn;
ArrayList datacentersArr = new ArrayList<>();
HashMap datacenterMap = new HashMap<>();
for (TLRPC.TL_dcOption datacenterDesc : config.dc_options) {
@@ -1338,6 +1347,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
if (canCompress) {
try {
byte[] data = Utilities.compress(os.toByteArray());
+ os.cleanup();
if (data.length < requestLength) {
TLRPC.TL_gzip_packed packed = new TLRPC.TL_gzip_packed();
packed.packed_data = data;
@@ -1345,6 +1355,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
os = new SerializedData(true);
packed.serializeToStream(os);
requestLength = os.length();
+ os.cleanup();
}
} catch (Exception e) {
FileLog.e("tmessages", e);
@@ -1406,6 +1417,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
if (rawRequest != null && (rawRequest instanceof TLRPC.TL_messages_sendMessage ||
rawRequest instanceof TLRPC.TL_messages_sendMedia ||
rawRequest instanceof TLRPC.TL_messages_forwardMessages ||
+ rawRequest instanceof TLRPC.TL_messages_forwardMessage ||
rawRequest instanceof TLRPC.TL_messages_sendEncrypted ||
rawRequest instanceof TLRPC.TL_messages_sendEncryptedFile ||
rawRequest instanceof TLRPC.TL_messages_sendEncryptedService)) {
@@ -1426,6 +1438,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
if (currentRawRequest instanceof TLRPC.TL_messages_sendMessage ||
currentRawRequest instanceof TLRPC.TL_messages_sendMedia ||
currentRawRequest instanceof TLRPC.TL_messages_forwardMessages ||
+ currentRawRequest instanceof TLRPC.TL_messages_forwardMessage ||
currentRawRequest instanceof TLRPC.TL_messages_sendEncrypted ||
currentRawRequest instanceof TLRPC.TL_messages_sendEncryptedFile ||
currentRawRequest instanceof TLRPC.TL_messages_sendEncryptedService) {
@@ -1438,6 +1451,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
if (request.rawRequest instanceof TLRPC.TL_messages_sendMessage ||
request.rawRequest instanceof TLRPC.TL_messages_sendMedia ||
request.rawRequest instanceof TLRPC.TL_messages_forwardMessages ||
+ request.rawRequest instanceof TLRPC.TL_messages_forwardMessage ||
request.rawRequest instanceof TLRPC.TL_messages_sendEncrypted ||
request.rawRequest instanceof TLRPC.TL_messages_sendEncryptedFile ||
request.rawRequest instanceof TLRPC.TL_messages_sendEncryptedService) {
@@ -1720,6 +1734,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection.
if (quickAckId != null) {
SerializedData data = new SerializedData(messageKeyFull);
quickAckId.add(data.readInt32() & 0x7fffffff);
+ data.cleanup();
}
MessageKeyData keyData = Utilities.generateMessageKeyData(datacenter.authKey, messageKey, false);
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java b/TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
index b0e1ac4e..74afae27 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
@@ -638,7 +638,7 @@ public class FileLoader {
continue;
}
int currentSide = obj.w >= obj.h ? obj.w : obj.h;
- if (closestObject == null || obj instanceof TLRPC.TL_photoCachedSize || currentSide <= side && lastSide < currentSide) {
+ if (closestObject == null || side > 100 && closestObject.location != null && closestObject.location.dc_id == Integer.MIN_VALUE || obj instanceof TLRPC.TL_photoCachedSize || currentSide <= side && lastSide < currentSide) {
closestObject = obj;
lastSide = currentSide;
}
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/FileUploadOperation.java b/TMessagesProj/src/main/java/org/telegram/messenger/FileUploadOperation.java
index 157103be..6bf1f236 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/FileUploadOperation.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/FileUploadOperation.java
@@ -91,6 +91,14 @@ public class FileUploadOperation {
remove(fileKey + "_iv").
remove(fileKey + "_key").
remove(fileKey + "_ivc").commit();
+ try {
+ if (stream != null) {
+ stream.close();
+ stream = null;
+ }
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
}
protected void checkNewDataAvailable(final long finalSize) {
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/HandshakeAction.java b/TMessagesProj/src/main/java/org/telegram/messenger/HandshakeAction.java
index 770dbd6f..dc5f426d 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/HandshakeAction.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/HandshakeAction.java
@@ -55,7 +55,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
}
datacenter.connection.delegate = this;
- processedMessageIds = new ArrayList();
+ processedMessageIds = new ArrayList<>();
authNonce = null;
authServerNonce = null;
authNewNonce = null;
@@ -92,10 +92,10 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
HashMap selectPublicKey(ArrayList fingerprints) {
synchronized (lock) {
if (serverPublicKeys == null) {
- serverPublicKeys = new ArrayList>();
+ serverPublicKeys = new ArrayList<>();
HashMap map;
- map = new HashMap();
+ map = new HashMap<>();
map.put("key", new BigInteger[]{
new BigInteger("c150023e2f70db7985ded064759cfecf0af328e69a41daf4d6f01b538135" +
"a6f91f8f8b2a0ec9ba9720ce352efcf6c5680ffc424bd634864902de0b4bd6d49f4e580230e" +
@@ -108,7 +108,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
map.put("fingerprint", 0xc3b42b026ce86b21L);
serverPublicKeys.add(map);
- map = new HashMap();
+ map = new HashMap<>();
map.put("key", new BigInteger[]{
new BigInteger("c6aeda78b02a251db4b6441031f467fa871faed32526c436524b1fb3b5dc" +
"a28efb8c089dd1b46d92c895993d87108254951c5f001a0f055f3063dcd14d431a300eb9e29" +
@@ -121,7 +121,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
map.put("fingerprint", 0x9a996a1db11c729bL);
serverPublicKeys.add(map);
- map = new HashMap();
+ map = new HashMap<>();
map.put("key", new BigInteger[]{
new BigInteger("b1066749655935f0a5936f517034c943bea7f3365a8931ae52c8bcb14856" +
"f004b83d26cf2839be0f22607470d67481771c1ce5ec31de16b20bbaa4ecd2f7d2ecf6b6356" +
@@ -134,7 +134,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
map.put("fingerprint", 0xb05b2a6f70cdea78L);
serverPublicKeys.add(map);
- map = new HashMap();
+ map = new HashMap<>();
map.put("key", new BigInteger[]{
new BigInteger("c2a8c55b4a62e2b78a19b91cf692bcdc4ba7c23fe4d06f194e2a0c30f6d9" +
"996f7d1a2bcc89bc1ac4333d44359a6c433252d1a8402d9970378b5912b75bc8cc3fa76710a" +
@@ -190,7 +190,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
if (message instanceof TLRPC.TL_resPQ) {
if (processedPQRes) {
TLRPC.TL_msgs_ack msgsAck = new TLRPC.TL_msgs_ack();
- msgsAck.msg_ids = new ArrayList();
+ msgsAck.msg_ids = new ArrayList<>();
msgsAck.msg_ids.add(messageId);
sendMessageData(msgsAck, generateMessageId());
return;
@@ -250,6 +250,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
innerData.serializeToStream(os);
byte[] innerDataBytes = os.toByteArray();
+ os.cleanup();
SerializedData dataWithHash = new SerializedData();
dataWithHash.writeRaw(Utilities.computeSHA1(innerDataBytes));
@@ -261,6 +262,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
}
byte[] encryptedBytes = Utilities.encryptWithRSA((BigInteger[])publicKey.get("key"), dataWithHash.toByteArray());
+ dataWithHash.cleanup();
SerializedData encryptedData = new SerializedData();
encryptedData.writeRaw(encryptedBytes);
if (encryptedData.length() < 256) {
@@ -269,12 +271,14 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
newEncryptedData.writeByte(0);
}
newEncryptedData.writeRaw(encryptedData.toByteArray());
+ encryptedData.cleanup();
encryptedData = newEncryptedData;
}
reqDH.encrypted_data = encryptedData.toByteArray();
+ encryptedData.cleanup();
TLRPC.TL_msgs_ack msgsAck = new TLRPC.TL_msgs_ack();
- msgsAck.msg_ids = new ArrayList();
+ msgsAck.msg_ids = new ArrayList<>();
msgsAck.msg_ids.add(messageIdf);
sendMessageData(msgsAck, generateMessageId());
@@ -305,8 +309,10 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
serverNonceAndNewNonce.writeRaw(authServerNonce);
serverNonceAndNewNonce.writeRaw(authNewNonce);
tmpAesKey.writeRaw(Utilities.computeSHA1(newNonceAndServerNonce.toByteArray()));
+ newNonceAndServerNonce.cleanup();
byte[] serverNonceAndNewNonceHash = Utilities.computeSHA1(serverNonceAndNewNonce.toByteArray());
+ serverNonceAndNewNonce.cleanup();
byte[] serverNonceAndNewNonceHash0_12 = new byte[12];
System.arraycopy(serverNonceAndNewNonceHash, 0, serverNonceAndNewNonceHash0_12, 0, 12);
@@ -322,6 +328,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
newNonceAndNewNonce.writeRaw(authNewNonce);
newNonceAndNewNonce.writeRaw(authNewNonce);
tmpAesIv.writeRaw(Utilities.computeSHA1(newNonceAndNewNonce.toByteArray()));
+ newNonceAndNewNonce.cleanup();
byte[] newNonce0_4 = new byte[4];
System.arraycopy(authNewNonce, 0, newNonce0_4, 0, 4);
@@ -417,6 +424,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
serverSaltData.writeByte(x);
}
ByteBuffer saltBuffer = ByteBuffer.wrap(serverSaltData.toByteArray());
+ serverSaltData.cleanup();
timeDifference = dhInnerData.server_time - (int)(System.currentTimeMillis() / 1000);
@@ -455,8 +463,11 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
Utilities.aesIgeEncryption(clientDataWithHash.buffer, tmpAesKey.toByteArray(), tmpAesIv.toByteArray(), true, false, 0, clientDataWithHash.length());
setClientDhParams.encrypted_data = clientDataWithHash;
+ tmpAesKey.cleanup();
+ tmpAesIv.cleanup();
+
TLRPC.TL_msgs_ack msgsAck = new TLRPC.TL_msgs_ack();
- msgsAck.msg_ids = new ArrayList();
+ msgsAck.msg_ids = new ArrayList<>();
msgsAck.msg_ids.add(messageId);
sendMessageData(msgsAck, generateMessageId());
@@ -494,7 +505,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
}
TLRPC.TL_msgs_ack msgsAck = new TLRPC.TL_msgs_ack();
- msgsAck.msg_ids = new ArrayList();
+ msgsAck.msg_ids = new ArrayList<>();
msgsAck.msg_ids.add(messageId);
sendMessageData(msgsAck, generateMessageId());
@@ -507,6 +518,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
newNonce1.writeByte(1);
newNonce1.writeRaw(authKeyAuxHash);
byte[] newNonceHash1Full = Utilities.computeSHA1(newNonce1.toByteArray());
+ newNonce1.cleanup();
byte[] newNonceHash1 = new byte[16];
System.arraycopy(newNonceHash1Full, newNonceHash1Full.length - 16, newNonceHash1, 0, 16);
@@ -515,6 +527,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
newNonce2.writeByte(2);
newNonce2.writeRaw(authKeyAuxHash);
byte[] newNonceHash2Full = Utilities.computeSHA1(newNonce2.toByteArray());
+ newNonce2.cleanup();
byte[] newNonceHash2 = new byte[16];
System.arraycopy(newNonceHash2Full, newNonceHash2Full.length - 16, newNonceHash2, 0, 16);
@@ -523,6 +536,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
newNonce3.writeByte(3);
newNonce3.writeRaw(authKeyAuxHash);
byte[] newNonceHash3Full = Utilities.computeSHA1(newNonce3.toByteArray());
+ newNonce3.cleanup();
byte[] newNonceHash3 = new byte[16];
System.arraycopy(newNonceHash3Full, newNonceHash3Full.length - 16, newNonceHash3, 0, 16);
@@ -544,7 +558,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
datacenter.authKey = authKey;
datacenter.authKeyId = authKeyId;
datacenter.addServerSalt(serverSalt);
- HashMap resultDict = new HashMap();
+ HashMap resultDict = new HashMap<>();
resultDict.put("timeDifference", timeDifference);
if (delegate != null) {
delegate.ActionDidFinishExecution(parent, resultDict);
@@ -575,7 +589,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti
}
} else {
TLRPC.TL_msgs_ack msgsAck = new TLRPC.TL_msgs_ack();
- msgsAck.msg_ids = new ArrayList();
+ msgsAck.msg_ids = new ArrayList<>();
msgsAck.msg_ids.add(messageId);
sendMessageData(msgsAck, generateMessageId());
}
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/SerializedData.java b/TMessagesProj/src/main/java/org/telegram/messenger/SerializedData.java
index 59b59e6d..40847dab 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/SerializedData.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/SerializedData.java
@@ -49,6 +49,41 @@ public class SerializedData extends AbsSerializedData {
in = new DataInputStream(inbuf);
}
+ public void cleanup() {
+ try {
+ if (inbuf != null) {
+ inbuf.close();
+ inbuf = null;
+ }
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
+ try {
+ if (in != null) {
+ in.close();
+ in = null;
+ }
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
+ try {
+ if (outbuf != null) {
+ outbuf.close();
+ outbuf = null;
+ }
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
+ try {
+ if (out != null) {
+ out.close();
+ out = null;
+ }
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
+ }
+
public SerializedData(File file) throws Exception {
FileInputStream is = new FileInputStream(file);
byte[] data = new byte[(int)file.length()];
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/TLClassStore.java b/TMessagesProj/src/main/java/org/telegram/messenger/TLClassStore.java
index 6d51db70..a2d747a2 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/TLClassStore.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/TLClassStore.java
@@ -216,6 +216,7 @@ public class TLClassStore {
classStore.put(TLRPC.TL_userStatusRecently.constructor, TLRPC.TL_userStatusRecently.class);
classStore.put(TLRPC.TL_msg_copy.constructor, TLRPC.TL_msg_copy.class);
classStore.put(TLRPC.TL_contacts_importedContacts.constructor, TLRPC.TL_contacts_importedContacts.class);
+ classStore.put(TLRPC.TL_disabledFeature.constructor, TLRPC.TL_disabledFeature.class);
classStore.put(TLRPC.TL_futureSalt.constructor, TLRPC.TL_futureSalt.class);
classStore.put(TLRPC.TL_updateEncryptedMessagesRead.constructor, TLRPC.TL_updateEncryptedMessagesRead.class);
classStore.put(TLRPC.TL_updateContactLink.constructor, TLRPC.TL_updateContactLink.class);
@@ -413,6 +414,7 @@ public class TLClassStore {
classStore.put(TLRPC.TL_decryptedMessageHolder.constructor, TLRPC.TL_decryptedMessageHolder.class);
classStore.put(TLRPC.TL_documentEncrypted_old.constructor, TLRPC.TL_documentEncrypted_old.class);
classStore.put(TLRPC.TL_document_old.constructor, TLRPC.TL_document_old.class);
+ classStore.put(TLRPC.TL_config_old.constructor, TLRPC.TL_config_old.class);
}
static TLClassStore store = null;
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/TLRPC.java b/TMessagesProj/src/main/java/org/telegram/messenger/TLRPC.java
index 2348395b..6ce1e519 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/TLRPC.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/TLRPC.java
@@ -16,7 +16,7 @@ public class TLRPC {
public static final int MESSAGE_FLAG_UNREAD = 1;
public static final int MESSAGE_FLAG_OUT = 2;
- public static final int LAYER = 22;
+ public static final int LAYER = 23;
public static class ChatPhoto extends TLObject {
public FileLocation photo_small;
@@ -3743,6 +3743,24 @@ public class TLRPC {
}
}
+ public static class TL_disabledFeature extends TLObject {
+ public static int constructor = 0xae636f24;
+
+ public String feature;
+ public String description;
+
+ public void readParams(AbsSerializedData stream) {
+ feature = stream.readString();
+ description = stream.readString();
+ }
+
+ public void serializeToStream(AbsSerializedData stream) {
+ stream.writeInt32(constructor);
+ stream.writeString(feature);
+ stream.writeString(description);
+ }
+ }
+
public static class TL_futureSalt extends TLObject {
public static int constructor = 0x0949d9dc;
@@ -5023,17 +5041,21 @@ public class TLRPC {
}
public static class TL_config extends TLObject {
- public static int constructor = 0x2e54dd74;
+ public static int constructor = 0x7dae33e0;
public int date;
+ public int expires;
public boolean test_mode;
public int this_dc;
public ArrayList dc_options = new ArrayList<>();
+ public int chat_big_size;
public int chat_size_max;
public int broadcast_size_max;
+ public ArrayList disabled_features = new ArrayList<>();
public void readParams(AbsSerializedData stream) {
date = stream.readInt32();
+ expires = stream.readInt32();
test_mode = stream.readBool();
this_dc = stream.readInt32();
stream.readInt32();
@@ -5041,23 +5063,37 @@ public class TLRPC {
for (int a = 0; a < count; a++) {
dc_options.add((TL_dcOption)TLClassStore.Instance().TLdeserialize(stream, stream.readInt32()));
}
+ chat_big_size = stream.readInt32();
chat_size_max = stream.readInt32();
broadcast_size_max = stream.readInt32();
+ stream.readInt32();
+ count = stream.readInt32();
+ for (int a = 0; a < count; a++) {
+ disabled_features.add((TL_disabledFeature)TLClassStore.Instance().TLdeserialize(stream, stream.readInt32()));
+ }
}
public void serializeToStream(AbsSerializedData stream) {
stream.writeInt32(constructor);
stream.writeInt32(date);
+ stream.writeInt32(expires);
stream.writeBool(test_mode);
stream.writeInt32(this_dc);
stream.writeInt32(0x1cb5c415);
int count = dc_options.size();
stream.writeInt32(count);
- for (TL_dcOption dc_option : dc_options) {
- dc_option.serializeToStream(stream);
+ for (int a = 0; a < count; a++) {
+ dc_options.get(a).serializeToStream(stream);
}
+ stream.writeInt32(chat_big_size);
stream.writeInt32(chat_size_max);
stream.writeInt32(broadcast_size_max);
+ stream.writeInt32(0x1cb5c415);
+ count = disabled_features.size();
+ stream.writeInt32(count);
+ for (int a = 0; a < count; a++) {
+ disabled_features.get(a).serializeToStream(stream);
+ }
}
}
@@ -9298,6 +9334,40 @@ public class TLRPC {
//manually created
+ public static class TL_config_old extends TL_config {
+ public static int constructor = 0x2e54dd74;
+
+ public void readParams(AbsSerializedData stream) {
+ date = stream.readInt32();
+ test_mode = stream.readBool();
+ this_dc = stream.readInt32();
+ stream.readInt32();
+ int count = stream.readInt32();
+ for (int a = 0; a < count; a++) {
+ dc_options.add((TL_dcOption) TLClassStore.Instance().TLdeserialize(stream, stream.readInt32()));
+ }
+ chat_size_max = stream.readInt32();
+ broadcast_size_max = stream.readInt32();
+ expires = (int) (System.currentTimeMillis() / 1000) + 3600;
+ chat_big_size = 10;
+ }
+
+ public void serializeToStream(AbsSerializedData stream) {
+ stream.writeInt32(constructor);
+ stream.writeInt32(date);
+ stream.writeBool(test_mode);
+ stream.writeInt32(this_dc);
+ stream.writeInt32(0x1cb5c415);
+ int count = dc_options.size();
+ stream.writeInt32(count);
+ for (TL_dcOption dc_option : dc_options) {
+ dc_option.serializeToStream(stream);
+ }
+ stream.writeInt32(chat_size_max);
+ stream.writeInt32(broadcast_size_max);
+ }
+ }
+
public static class TL_document_old extends TL_document {
public static int constructor = 0x9efc6326;
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java b/TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java
index 0cd09865..6974ca94 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java
@@ -31,6 +31,12 @@ public class UserConfig {
public static boolean saveIncomingPhotos = false;
public static int contactsVersion = 1;
public static boolean waitingForPasswordEnter = false;
+ public static String passcodeHash = "";
+ public static boolean appLocked = false;
+ public static int passcodeType = 0;
+ public static int autoLockIn = 60 * 60;
+ public static int lastPauseTime = 0;
+ public static boolean isWaitingForPasscodeEnter = false;
public static int getNewMessageId() {
int id;
@@ -62,12 +68,19 @@ public class UserConfig {
editor.putBoolean("registeredForInternalPush", registeredForInternalPush);
editor.putBoolean("blockedUsersLoaded", blockedUsersLoaded);
editor.putBoolean("waitingForPasswordEnter", waitingForPasswordEnter);
+ editor.putString("passcodeHash1", passcodeHash);
+ editor.putBoolean("appLocked", appLocked);
+ editor.putInt("passcodeType", passcodeType);
+ editor.putInt("autoLockIn", autoLockIn);
+ editor.putInt("lastPauseTime", lastPauseTime);
+
if (currentUser != null) {
if (withFile) {
SerializedData data = new SerializedData();
currentUser.serializeToStream(data);
String userString = Base64.encodeToString(data.toByteArray(), Base64.DEFAULT);
editor.putString("user", userString);
+ data.cleanup();
}
} else {
editor.remove("user");
@@ -172,6 +185,7 @@ public class UserConfig {
if (lastSendMessageId > -210000) {
lastSendMessageId = -210000;
}
+ data.cleanup();
Utilities.stageQueue.postRunnable(new Runnable() {
@Override
public void run() {
@@ -195,12 +209,18 @@ public class UserConfig {
registeredForInternalPush = preferences.getBoolean("registeredForInternalPush", false);
blockedUsersLoaded = preferences.getBoolean("blockedUsersLoaded", false);
waitingForPasswordEnter = preferences.getBoolean("waitingForPasswordEnter", false);
+ passcodeHash = preferences.getString("passcodeHash1", "");
+ appLocked = preferences.getBoolean("appLocked", false);
+ passcodeType = preferences.getInt("passcodeType", 0);
+ autoLockIn = preferences.getInt("autoLockIn", 60 * 60);
+ lastPauseTime = preferences.getInt("lastPauseTime", 0);
String user = preferences.getString("user", null);
if (user != null) {
byte[] userBytes = Base64.decode(user, Base64.DEFAULT);
if (userBytes != null) {
SerializedData data = new SerializedData(userBytes);
currentUser = (TLRPC.TL_userSelf)TLClassStore.Instance().TLdeserialize(data, data.readInt32());
+ data.cleanup();
}
}
}
@@ -214,12 +234,17 @@ public class UserConfig {
waitingForPasswordEnter = false;
contactsHash = "";
importHash = "";
- lastLocalId = -210000;
lastSendMessageId = -210000;
contactsVersion = 1;
lastBroadcastId = -1;
saveIncomingPhotos = false;
blockedUsersLoaded = false;
+ appLocked = false;
+ passcodeType = 0;
+ passcodeHash = "";
+ autoLockIn = 60 * 60;
+ lastPauseTime = 0;
+ isWaitingForPasscodeEnter = false;
saveConfig(true);
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java b/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
index f1c865a9..d1cff124 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java
@@ -29,6 +29,8 @@ import net.hockeyapp.android.CrashManager;
import net.hockeyapp.android.CrashManagerListener;
import net.hockeyapp.android.UpdateManager;
+import org.telegram.android.AndroidUtilities;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -97,6 +99,7 @@ public class Utilities {
for (int a = 0; a < count; a++) {
goodPrimes.add(data.readString());
}
+ data.cleanup();
}
} catch (Exception e) {
FileLog.e("tmessages", e);
@@ -109,6 +112,7 @@ public class Utilities {
public native static long doPQNative(long _what);
public native static void loadBitmap(String path, Bitmap bitmap, int scale, int width, int height, int stride);
public native static void blurBitmap(Object bitmap, int radius);
+ public native static void calcCDT(ByteBuffer hsvBuffer, int width, int height, ByteBuffer buffer);
public native static Bitmap loadWebpImage(ByteBuffer buffer, int len, BitmapFactory.Options options);
public native static Bitmap loadBpgImage(ByteBuffer buffer, int len, BitmapFactory.Options options);
public native static int convertVideoFrame(ByteBuffer src, ByteBuffer dest, int destFormat, int width, int height, int padding, int swap);
@@ -228,6 +232,7 @@ public class Utilities {
data.writeString(pr);
}
byte[] bytes = data.toByteArray();
+ data.cleanup();
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("primes", Context.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit();
editor.putString("primes", Base64.encodeToString(bytes, Base64.DEFAULT));
@@ -363,35 +368,41 @@ public class Utilities {
data.writeRaw(messageKey);
data.writeRaw(authKey, x, 32);
byte[] sha1_a = Utilities.computeSHA1(data.toByteArray());
+ data.cleanup();
data = new SerializedData();
data.writeRaw(authKey, 32 + x, 16);
data.writeRaw(messageKey);
data.writeRaw(authKey, 48 + x, 16);
byte[] sha1_b = Utilities.computeSHA1(data.toByteArray());
+ data.cleanup();
data = new SerializedData();
data.writeRaw(authKey, 64 + x, 32);
data.writeRaw(messageKey);
byte[] sha1_c = Utilities.computeSHA1(data.toByteArray());
+ data.cleanup();
data = new SerializedData();
data.writeRaw(messageKey);
data.writeRaw(authKey, 96 + x, 32);
byte[] sha1_d = Utilities.computeSHA1(data.toByteArray());
+ data.cleanup();
- SerializedData aesKey = new SerializedData();
- aesKey.writeRaw(sha1_a, 0, 8);
- aesKey.writeRaw(sha1_b, 8, 12);
- aesKey.writeRaw(sha1_c, 4, 12);
- keyData.aesKey = aesKey.toByteArray();
+ data = new SerializedData();
+ data.writeRaw(sha1_a, 0, 8);
+ data.writeRaw(sha1_b, 8, 12);
+ data.writeRaw(sha1_c, 4, 12);
+ keyData.aesKey = data.toByteArray();
+ data.cleanup();
- SerializedData aesIv = new SerializedData();
- aesIv.writeRaw(sha1_a, 8, 12);
- aesIv.writeRaw(sha1_b, 0, 8);
- aesIv.writeRaw(sha1_c, 16, 4);
- aesIv.writeRaw(sha1_d, 0, 8);
- keyData.aesIv = aesIv.toByteArray();
+ data = new SerializedData();
+ data.writeRaw(sha1_a, 8, 12);
+ data.writeRaw(sha1_b, 0, 8);
+ data.writeRaw(sha1_c, 16, 4);
+ data.writeRaw(sha1_d, 0, 8);
+ keyData.aesIv = data.toByteArray();
+ data.cleanup();
return keyData;
}
@@ -408,10 +419,25 @@ public class Utilities {
while ((bytesRead = gis.read(data)) != -1) {
bytesOutput.write(data, 0, bytesRead);
}
+ try {
gis.close();
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
+ try {
is.close();
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
SerializedData stream = new SerializedData(bytesOutput.toByteArray());
- return TLClassStore.Instance().TLdeserialize(stream, stream.readInt32(), parentObject);
+ try {
+ bytesOutput.close();
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
+ TLObject object = TLClassStore.Instance().TLdeserialize(stream, stream.readInt32(), parentObject);
+ stream.cleanup();
+ return object;
} catch (IOException e) {
FileLog.e("tmessages", e);
}
@@ -432,6 +458,12 @@ public class Utilities {
packedData = bytesStream.toByteArray();
} catch (IOException e) {
FileLog.e("tmessages", e);
+ } finally {
+ try {
+ bytesStream.close();
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
}
return packedData;
}
@@ -449,23 +481,23 @@ public class Utilities {
}
public static boolean copyFile(File sourceFile, File destFile) throws IOException {
- if(!destFile.exists()) {
+ if (!destFile.exists()) {
destFile.createNewFile();
}
- FileChannel source = null;
- FileChannel destination = null;
+ FileInputStream source = null;
+ FileOutputStream destination = null;
try {
- source = new FileInputStream(sourceFile).getChannel();
- destination = new FileOutputStream(destFile).getChannel();
- destination.transferFrom(source, 0, source.size());
+ source = new FileInputStream(sourceFile);
+ destination = new FileOutputStream(destFile);
+ destination.getChannel().transferFrom(source.getChannel(), 0, source.getChannel().size());
} catch (Exception e) {
FileLog.e("tmessages", e);
return false;
} finally {
- if(source != null) {
+ if (source != null) {
source.close();
}
- if(destination != null) {
+ if (destination != null) {
destination.close();
}
}
@@ -638,7 +670,7 @@ public class Utilities {
}
wholeString = wholeString.trim();
String lower = " " + wholeString.toLowerCase();
-
+ String hexDarkColor = String.format("#%06X", (0xFFFFFF & AndroidUtilities.getIntDarkerColor("themeColor", 0x15)));
int index = -1;
int lastIndex = 0;
while ((index = lower.indexOf(" " + q, lastIndex)) != -1) {
@@ -656,7 +688,8 @@ public class Utilities {
builder.append(" ");
}
query.trim();
- builder.append(Html.fromHtml("" + query + ""));
+ builder.append(Html.fromHtml("" + query + ""));
+ //builder.append(Html.fromHtml("" + query + ""));
lastIndex = end;
}
@@ -711,7 +744,13 @@ public class Utilities {
buffer.write(b);
}
}
- return buffer.toByteArray();
+ byte[] array = buffer.toByteArray();
+ try {
+ buffer.close();
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
+ return array;
}
public static void checkForCrashes(Activity context) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/AccountPasswordActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/AccountPasswordActivity.java
index 348d20ee..a7c4f6b2 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/AccountPasswordActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/AccountPasswordActivity.java
@@ -94,7 +94,7 @@ public class AccountPasswordActivity extends BaseFragment {
}
@Override
- public View createView(LayoutInflater inflater, ViewGroup container) {
+ public View createView(LayoutInflater inflater) {
if (fragmentView == null) {
if (type == 0) {
actionBar.setBackButtonImage(R.drawable.ic_ab_back);
@@ -271,7 +271,7 @@ public class AccountPasswordActivity extends BaseFragment {
listAdapter.notifyDataSetChanged();
}
- private void needShowAlert(final String text) {
+ private void ShowAlert(final String text) {
if (text == null || getParentActivity() == null) {
return;
}
@@ -355,20 +355,20 @@ public class AccountPasswordActivity extends BaseFragment {
String hint = hintPasswordCell.getFieldText();
if (hasPassword) {
if (oldPassword.length() == 0) {
- needShowAlert(LocaleController.getString("PasswordOldIncorrect", R.string.PasswordOldIncorrect));
+ ShowAlert(LocaleController.getString("PasswordOldIncorrect", R.string.PasswordOldIncorrect));
return;
}
}
if (newPassword.length() == 0) {
- needShowAlert(LocaleController.getString("PasswordNewIncorrect", R.string.PasswordNewIncorrect));
+ ShowAlert(LocaleController.getString("PasswordNewIncorrect", R.string.PasswordNewIncorrect));
return;
}
if (!newPassword.equals(verifyPasswrod)) {
- needShowAlert(LocaleController.getString("PasswordDoNotMatch", R.string.PasswordDoNotMatch));
+ ShowAlert(LocaleController.getString("PasswordDoNotMatch", R.string.PasswordDoNotMatch));
return;
}
if (hint.toLowerCase().contains(newPassword.toLowerCase())) {
- needShowAlert(LocaleController.getString("HintIncorrect", R.string.HintIncorrect));
+ ShowAlert(LocaleController.getString("HintIncorrect", R.string.HintIncorrect));
return;
}
byte[] oldPasswordBytes = null;
@@ -418,13 +418,13 @@ public class AccountPasswordActivity extends BaseFragment {
finishFragment();
} else {
if (error.text.contains("PASSWORD_HASH_INVALID")) {
- needShowAlert(LocaleController.getString("PasswordOldIncorrect", R.string.PasswordOldIncorrect));
+ ShowAlert(LocaleController.getString("PasswordOldIncorrect", R.string.PasswordOldIncorrect));
} else if (error.text.contains("NEW_PASSWORD_BAD")) {
- needShowAlert(LocaleController.getString("PasswordNewIncorrect", R.string.PasswordNewIncorrect));
+ ShowAlert(LocaleController.getString("PasswordNewIncorrect", R.string.PasswordNewIncorrect));
} else if (error.text.startsWith("FLOOD_WAIT")) {
- needShowAlert(LocaleController.getString("FloodWait", R.string.FloodWait));
+ ShowAlert(LocaleController.getString("FloodWait", R.string.FloodWait));
} else {
- needShowAlert(error.text);
+ ShowAlert(error.text);
}
}
}
@@ -434,7 +434,7 @@ public class AccountPasswordActivity extends BaseFragment {
} else if (type == 1) {
String oldPassword = oldPasswordCell.getFieldText();
if (oldPassword.length() == 0) {
- needShowAlert(LocaleController.getString("PasswordIncorrect", R.string.PasswordIncorrect));
+ ShowAlert(LocaleController.getString("PasswordIncorrect", R.string.PasswordIncorrect));
return;
}
byte[] oldPasswordBytes = null;
@@ -486,11 +486,11 @@ public class AccountPasswordActivity extends BaseFragment {
}
} else {
if (error.text.contains("PASSWORD_HASH_INVALID")) {
- needShowAlert(LocaleController.getString("PasswordOldIncorrect", R.string.PasswordOldIncorrect));
+ ShowAlert(LocaleController.getString("PasswordOldIncorrect", R.string.PasswordOldIncorrect));
} else if (error.text.startsWith("FLOOD_WAIT")) {
- needShowAlert(LocaleController.getString("FloodWait", R.string.FloodWait));
+ ShowAlert(LocaleController.getString("FloodWait", R.string.FloodWait));
} else {
- needShowAlert(error.text);
+ ShowAlert(error.text);
}
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java
index 188fdf76..c01b464b 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java
@@ -8,11 +8,14 @@
package org.telegram.ui.ActionBar;
+import android.app.Activity;
import android.content.Context;
+import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.text.TextUtils;
+import android.util.TypedValue;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -91,9 +94,9 @@ public class ActionBar extends FrameLayout {
if (titleTextView != null && titleTextView.getVisibility() == VISIBLE) {
if (!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
- titleTextView.setTextSize(18);
+ titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 18);
} else {
- titleTextView.setTextSize(20);
+ titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
}
layoutParams = (LayoutParams) titleTextView.getLayoutParams();
@@ -106,9 +109,9 @@ public class ActionBar extends FrameLayout {
}
if (subTitleTextView != null && subTitleTextView.getVisibility() == VISIBLE) {
if (!AndroidUtilities.isTablet() && getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
- subTitleTextView.setTextSize(14);
+ subTitleTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
} else {
- subTitleTextView.setTextSize(16);
+ subTitleTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
}
layoutParams = (LayoutParams) subTitleTextView.getLayoutParams();
@@ -136,7 +139,7 @@ public class ActionBar extends FrameLayout {
}
if (menu != null) {
- maxTextWidth = Math.min(maxTextWidth, width - menu.getMeasuredWidth() - AndroidUtilities.dp(16));
+ maxTextWidth = Math.min(maxTextWidth, width - menu.getMeasuredWidth() - AndroidUtilities.dp(16) - x);
}
if (titleTextView != null && titleTextView.getVisibility() == VISIBLE) {
@@ -173,7 +176,7 @@ public class ActionBar extends FrameLayout {
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)menu.getLayoutParams();
layoutParams.width = isSearchFieldVisible ? LayoutParams.MATCH_PARENT : LayoutParams.WRAP_CONTENT;
layoutParams.height = height;
- layoutParams.leftMargin = isSearchFieldVisible ? AndroidUtilities.dp(54) : 0;
+ layoutParams.leftMargin = isSearchFieldVisible ? AndroidUtilities.dp(AndroidUtilities.isTablet() ? 74 : 66) : 0;
layoutParams.topMargin = occupyStatusBar ? AndroidUtilities.statusBarHeight : 0;
menu.setLayoutParams(layoutParams);
menu.measure(width, height);
@@ -366,7 +369,7 @@ public class ActionBar extends FrameLayout {
return;
}
actionMode.setVisibility(VISIBLE);
- if (actionModeTop != null) {
+ if (occupyStatusBar && actionModeTop != null) {
actionModeTop.setVisibility(VISIBLE);
}
if (titleFrameLayout != null) {
@@ -382,7 +385,7 @@ public class ActionBar extends FrameLayout {
return;
}
actionMode.setVisibility(GONE);
- if (actionModeTop != null) {
+ if (occupyStatusBar && actionModeTop != null) {
actionModeTop.setVisibility(GONE);
}
if (titleFrameLayout != null) {
@@ -473,6 +476,9 @@ public class ActionBar extends FrameLayout {
public void setOccupyStatusBar(boolean value) {
occupyStatusBar = value;
+ if (actionMode != null) {
+ actionMode.setPadding(0, occupyStatusBar ? AndroidUtilities.statusBarHeight : 0, 0, 0);
+ }
}
public boolean getOccupyStatusBar() {
@@ -484,6 +490,11 @@ public class ActionBar extends FrameLayout {
if (backButtonImageView != null) {
backButtonImageView.setBackgroundResource(itemsBackgroundResourceId);
}
+ //
+ //SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(AndroidUtilities.THEME_PREFS, Activity.MODE_PRIVATE);
+ //setBackgroundColor(themePrefs.getInt("themeColor", 0x000000));
+ setBackgroundColor(AndroidUtilities.getIntColor("themeColor"));
+ //
}
public void setCastShadows(boolean value) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java
index bf295a53..398ecde2 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java
@@ -225,7 +225,7 @@ public class ActionBarLayout extends FrameLayout {
@Override
public boolean dispatchKeyEventPreIme(KeyEvent event) {
- if (event != null && event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+ if (event != null && event.getKeyCode() == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) {
return delegate != null && delegate.onPreIme() || super.dispatchKeyEventPreIme(event);
}
return super.dispatchKeyEventPreIme(event);
@@ -321,7 +321,7 @@ public class ActionBarLayout extends FrameLayout {
beginTrackingSent = false;
BaseFragment lastFragment = fragmentsStack.get(fragmentsStack.size() - 2);
- View fragmentView = lastFragment.createView(parentActivity.getLayoutInflater(), null);
+ View fragmentView = lastFragment.createView(parentActivity.getLayoutInflater());
ViewGroup parent = (ViewGroup) fragmentView.getParent();
if (parent != null) {
parent.removeView(fragmentView);
@@ -502,8 +502,7 @@ public class ActionBarLayout extends FrameLayout {
}
public boolean checkTransitionAnimation() {
- if (transitionAnimationInProgress && transitionAnimationStartTime < System.currentTimeMillis() - 400) {
- transitionAnimationInProgress = false;
+ if (transitionAnimationInProgress && transitionAnimationStartTime < System.currentTimeMillis() - 1000) {
onAnimationEndCheck(true);
}
return transitionAnimationInProgress;
@@ -556,7 +555,7 @@ public class ActionBarLayout extends FrameLayout {
final BaseFragment currentFragment = !fragmentsStack.isEmpty() ? fragmentsStack.get(fragmentsStack.size() - 1) : null;
fragment.setParentLayout(this);
- View fragmentView = fragment.createView(parentActivity.getLayoutInflater(), null);
+ View fragmentView = fragment.createView(parentActivity.getLayoutInflater());
if (fragment.needAddActionBar() && fragment.actionBar != null) {
if (removeActionBarExtraHeight) {
fragment.actionBar.setOccupyStatusBar(false);
@@ -585,6 +584,7 @@ public class ActionBarLayout extends FrameLayout {
containerView = containerViewBack;
containerViewBack = temp;
containerView.setVisibility(View.VISIBLE);
+ setInnerTranslationX(0);
bringChildToFront(containerView);
@@ -633,6 +633,8 @@ public class ActionBarLayout extends FrameLayout {
ViewProxy.setTranslationX(containerView, 0);
}
};
+ ViewProxy.setAlpha(containerView, 0.0f);
+ ViewProxy.setTranslationX(containerView, 48.0f);
currentAnimation = new AnimatorSetProxy();
currentAnimation.playTogether(
ObjectAnimatorProxy.ofFloat(containerView, "alpha", 0.0f, 1.0f),
@@ -640,6 +642,11 @@ public class ActionBarLayout extends FrameLayout {
currentAnimation.setInterpolator(new DecelerateInterpolator(1.5f));
currentAnimation.setDuration(200);
currentAnimation.addListener(new AnimatorListenerAdapterProxy() {
+ @Override
+ public void onAnimationStart(Object animation) {
+ transitionAnimationStartTime = System.currentTimeMillis();
+ }
+
@Override
public void onAnimationEnd(Object animation) {
onAnimationEndCheck(false);
@@ -672,6 +679,22 @@ public class ActionBarLayout extends FrameLayout {
}
fragment.setParentLayout(this);
if (position == -1) {
+ if (!fragmentsStack.isEmpty()) {
+ BaseFragment previousFragment = fragmentsStack.get(fragmentsStack.size() - 1);
+ previousFragment.onPause();
+ if (previousFragment.actionBar != null) {
+ ViewGroup parent = (ViewGroup) previousFragment.actionBar.getParent();
+ if (parent != null) {
+ parent.removeView(previousFragment.actionBar);
+ }
+ }
+ if (previousFragment.fragmentView != null) {
+ ViewGroup parent = (ViewGroup) previousFragment.fragmentView.getParent();
+ if (parent != null) {
+ parent.removeView(previousFragment.fragmentView);
+ }
+ }
+ }
fragmentsStack.add(fragment);
} else {
fragmentsStack.add(position, fragment);
@@ -689,12 +712,13 @@ public class ActionBarLayout extends FrameLayout {
}
public void closeLastFragment(boolean animated) {
- if (delegate != null && !delegate.needCloseLastFragment(this) || checkTransitionAnimation()) {
+ if (delegate != null && !delegate.needCloseLastFragment(this) || checkTransitionAnimation() || fragmentsStack.isEmpty()) {
return;
}
if (parentActivity.getCurrentFocus() != null) {
AndroidUtilities.hideKeyboard(parentActivity.getCurrentFocus());
}
+ setInnerTranslationX(0);
boolean needAnimation = Build.VERSION.SDK_INT > 10 && animated && parentActivity.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE).getBoolean("view_animations", true);
final BaseFragment currentFragment = fragmentsStack.get(fragmentsStack.size() - 1);
BaseFragment previousFragment = null;
@@ -709,7 +733,7 @@ public class ActionBarLayout extends FrameLayout {
containerView.setVisibility(View.VISIBLE);
previousFragment.setParentLayout(this);
- View fragmentView = previousFragment.createView(parentActivity.getLayoutInflater(), null);
+ View fragmentView = previousFragment.createView(parentActivity.getLayoutInflater());
if (previousFragment.needAddActionBar() && previousFragment.actionBar != null) {
if (removeActionBarExtraHeight) {
previousFragment.actionBar.setOccupyStatusBar(false);
@@ -754,6 +778,11 @@ public class ActionBarLayout extends FrameLayout {
currentAnimation.setInterpolator(new DecelerateInterpolator(1.5f));
currentAnimation.setDuration(200);
currentAnimation.addListener(new AnimatorListenerAdapterProxy() {
+ @Override
+ public void onAnimationStart(Object animation) {
+ transitionAnimationStartTime = System.currentTimeMillis();
+ }
+
@Override
public void onAnimationEnd(Object animation) {
onAnimationEndCheck(false);
@@ -796,6 +825,11 @@ public class ActionBarLayout extends FrameLayout {
currentAnimation.setInterpolator(new AccelerateDecelerateInterpolator());
currentAnimation.setDuration(200);
currentAnimation.addListener(new AnimatorListenerAdapterProxy() {
+ @Override
+ public void onAnimationStart(Object animation) {
+ transitionAnimationStartTime = System.currentTimeMillis();
+ }
+
@Override
public void onAnimationEnd(Object animation) {
onAnimationEndCheck(false);
@@ -823,7 +857,7 @@ public class ActionBarLayout extends FrameLayout {
}
BaseFragment previousFragment = fragmentsStack.get(fragmentsStack.size() - 1);
previousFragment.setParentLayout(this);
- View fragmentView = previousFragment.createView(parentActivity.getLayoutInflater(), null);
+ View fragmentView = previousFragment.createView(parentActivity.getLayoutInflater());
if (previousFragment.needAddActionBar() && previousFragment.actionBar != null) {
if (removeActionBarExtraHeight) {
previousFragment.actionBar.setOccupyStatusBar(false);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuItem.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuItem.java
index 96650548..fa19aa49 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuItem.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuItem.java
@@ -348,6 +348,10 @@ public class ActionBarMenuItem extends FrameLayoutFixed {
}
}
+ public void setIcon(int resId) {
+ iconView.setImageResource(resId);
+ }
+
public EditText getSearchField() {
return searchField;
}
@@ -399,7 +403,7 @@ public class ActionBarMenuItem extends FrameLayoutFixed {
searchField.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
- if (actionId == EditorInfo.IME_ACTION_SEARCH || event != null && event.getAction() == KeyEvent.ACTION_UP && event.getKeyCode() == KeyEvent.KEYCODE_SEARCH) {
+ if (actionId == EditorInfo.IME_ACTION_SEARCH || event != null && (event.getAction() == KeyEvent.ACTION_UP && event.getKeyCode() == KeyEvent.KEYCODE_SEARCH || event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
AndroidUtilities.hideKeyboard(searchField);
if (listener != null) {
listener.onSearchPressed(searchField);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java
index e67c9c64..241cf3b3 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java
@@ -200,7 +200,11 @@ public class ActionBarPopupWindow extends PopupWindow {
@Override
public void dismiss() {
setFocusable(false);
+ try {
super.dismiss();
+ } catch (Exception e) {
+ //don't promt
+ }
unregisterListener();
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BaseFragment.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BaseFragment.java
index 9270ca1c..72a48781 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BaseFragment.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BaseFragment.java
@@ -41,7 +41,7 @@ public class BaseFragment {
classGuid = ConnectionsManager.getInstance().generateClassGuid();
}
- public View createView(LayoutInflater inflater, ViewGroup container) {
+ public View createView(LayoutInflater inflater) {
return null;
}
@@ -201,7 +201,7 @@ public class BaseFragment {
return true;
}
- protected void showAlertDialog(AlertDialog.Builder builder) {
+ public void showAlertDialog(AlertDialog.Builder builder) {
if (parentLayout == null || parentLayout.checkTransitionAnimation() || parentLayout.animationInProgress || parentLayout.startedTracking) {
return;
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java
index 1c607dd5..600807d1 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java
@@ -165,6 +165,9 @@ public class DrawerLayoutContainer extends FrameLayout {
}
public void openDrawer(boolean fast) {
+ if (!allowOpenDrawer) {
+ return;
+ }
if (AndroidUtilities.isTablet() && parentActionBarLayout != null && parentActionBarLayout.parentActivity != null) {
AndroidUtilities.hideKeyboard(parentActionBarLayout.parentActivity.getCurrentFocus());
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java
index cd50fac4..a2729f95 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsAdapter.java
@@ -8,13 +8,16 @@
package org.telegram.ui.Adapters;
+import android.app.Activity;
import android.content.Context;
+import android.content.SharedPreferences;
import android.os.Build;
import android.view.View;
import android.view.ViewGroup;
import org.telegram.android.AndroidUtilities;
import org.telegram.android.LocaleController;
+import org.telegram.messenger.ApplicationLoader;
import org.telegram.messenger.TLRPC;
import org.telegram.android.ContactsController;
import org.telegram.android.MessagesController;
@@ -28,6 +31,7 @@ import org.telegram.ui.Cells.UserCell;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Locale;
public class ContactsAdapter extends BaseSectionsAdapter {
@@ -187,12 +191,15 @@ public class ContactsAdapter extends BaseSectionsAdapter {
if (convertView == null) {
convertView = new GreySectionCell(mContext);
((GreySectionCell) convertView).setText(LocaleController.getString("Contacts", R.string.Contacts).toUpperCase());
+ //((GreySectionCell) convertView).setText(String.format(Locale.US, " %d " + LocaleController.getString("Contacts", R.string.Contacts).toUpperCase(), arr0.size()));
+ ((GreySectionCell) convertView).setBackgroundColor(AndroidUtilities.getIntDef("contactsRowColor", 0xffffffff));
}
} else if (type == 2) {
if (convertView == null) {
convertView = new TextCell(mContext);
}
TextCell actionCell = (TextCell) convertView;
+ actionCell.setTextColor(AndroidUtilities.getIntDef("contactsNameColor", 0xff000000));
if (needPhonebook) {
actionCell.setTextAndIcon(LocaleController.getString("InviteFriends", R.string.InviteFriends), R.drawable.menu_invite);
} else {
@@ -207,6 +214,8 @@ public class ContactsAdapter extends BaseSectionsAdapter {
} else if (type == 1) {
if (convertView == null) {
convertView = new TextCell(mContext);
+ ((TextCell) convertView).setTextColor(AndroidUtilities.getIntDef("contactsNameColor", 0xff000000));
+ ((TextCell) convertView).setTextSize(AndroidUtilities.getIntDef("contactsNameSize", 16));
}
ContactsController.Contact contact = ContactsController.getInstance().phoneBookContacts.get(position);
if (contact.first_name != null && contact.last_name != null) {
@@ -219,7 +228,9 @@ public class ContactsAdapter extends BaseSectionsAdapter {
} else if (type == 0) {
if (convertView == null) {
convertView = new UserCell(mContext, 58);
- ((UserCell) convertView).setStatusColors(0xffa8a8a8, 0xff3b84c0);
+ //((UserCell) convertView).setStatusColors(0xffa8a8a8, 0xff3b84c0);
+ ((UserCell) convertView).setStatusColors(AndroidUtilities.getIntDef("contactsStatusColor", 0xffa8a8a8), AndroidUtilities.getIntDef("contactsOnlineColor", AndroidUtilities.getIntDarkerColor("themeColor",0x15)));
+ ((UserCell) convertView).setNameColor(AndroidUtilities.getIntDef("contactsNameColor", 0xff000000));
}
ArrayList arr = ContactsController.getInstance().usersSectionsDict.get(ContactsController.getInstance().sortedUsersSectionsArray.get(section - (onlyUsers ? 0 : 1)));
@@ -236,6 +247,7 @@ public class ContactsAdapter extends BaseSectionsAdapter {
}
}
}
+ parent.setBackgroundColor(AndroidUtilities.getIntDef("contactsRowColor", 0xffffffff));
return convertView;
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsSearchAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsSearchAdapter.java
index e68e9be5..132e24a8 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsSearchAdapter.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/ContactsSearchAdapter.java
@@ -124,10 +124,14 @@ public class ContactsSearchAdapter extends BaseContactsSearchAdapter {
}
String name = ContactsController.formatName(user.first_name, user.last_name).toLowerCase();
+ String tName = LocaleController.getInstance().getTranslitString(name);
+ if (name.equals(tName)) {
+ tName = null;
+ }
int found = 0;
for (String q : search) {
- if (name.startsWith(q) || name.contains(" " + q)) {
+ if (name.startsWith(q) || name.contains(" " + q) || tName != null && (tName.startsWith(q) || tName.contains(" " + q))) {
found = 1;
} else if (user.username != null && user.username.startsWith(q)) {
found = 2;
@@ -234,7 +238,7 @@ public class ContactsSearchAdapter extends BaseContactsSearchAdapter {
view = new ProfileSearchCell(mContext);
}
}
-
+ String hexDarkColor = String.format("#%06X", (0xFFFFFF & AndroidUtilities.getIntDarkerColor("themeColor", 0x15)));
TLRPC.User user = getItem(i);
if (user != null) {
CharSequence username = null;
@@ -253,7 +257,8 @@ public class ContactsSearchAdapter extends BaseContactsSearchAdapter {
foundUserName = foundUserName.substring(1);
}
try {
- username = Html.fromHtml(String.format("@%s%s", user.username.substring(0, foundUserName.length()), user.username.substring(foundUserName.length())));
+ username = Html.fromHtml(String.format("@%s%s", user.username.substring(0, foundUserName.length()), user.username.substring(foundUserName.length())));
+ //username = Html.fromHtml(String.format("@%s%s", user.username.substring(0, foundUserName.length()), user.username.substring(foundUserName.length())));
} catch (Exception e) {
username = user.username;
FileLog.e("tmessages", e);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java
index 6031ed21..c3b27858 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java
@@ -8,13 +8,17 @@
package org.telegram.ui.Adapters;
+import android.app.Activity;
import android.content.Context;
+import android.content.SharedPreferences;
import android.view.View;
import android.view.ViewGroup;
import org.telegram.android.AndroidUtilities;
import org.telegram.android.MessageObject;
import org.telegram.android.MessagesController;
+import org.telegram.messenger.ApplicationLoader;
+import org.telegram.messenger.R;
import org.telegram.messenger.TLRPC;
import org.telegram.ui.Cells.DialogCell;
import org.telegram.ui.Cells.LoadingCell;
@@ -24,6 +28,7 @@ public class DialogsAdapter extends BaseFragmentAdapter {
private Context mContext;
private boolean serverOnly;
private long openedDialogId;
+ private int currentCount;
public DialogsAdapter(Context context, boolean onlyFromServer) {
mContext = context;
@@ -34,6 +39,11 @@ public class DialogsAdapter extends BaseFragmentAdapter {
openedDialogId = id;
}
+ public boolean isDataSetChanged() {
+ int current = currentCount;
+ return current != getCount();
+ }
+
@Override
public boolean areAllItemsEnabled() {
return true;
@@ -58,6 +68,7 @@ public class DialogsAdapter extends BaseFragmentAdapter {
if (!MessagesController.getInstance().dialogsEndReached) {
count++;
}
+ currentCount = count;
return count;
}
@@ -97,6 +108,7 @@ public class DialogsAdapter extends BaseFragmentAdapter {
if (view == null) {
view = new DialogCell(mContext);
}
+ if (view instanceof DialogCell) { //TODO finally i need to find this crash
((DialogCell) view).useSeparator = (i != getCount() - 1);
TLRPC.TL_dialog dialog = null;
if (serverOnly) {
@@ -111,13 +123,18 @@ public class DialogsAdapter extends BaseFragmentAdapter {
}
}
}
- MessageObject message = MessagesController.getInstance().dialogMessage.get(dialog.top_message);
- ((DialogCell) view).setDialog(dialog.id, message, true, dialog.last_message_date, dialog.unread_count, MessagesController.getInstance().isDialogMuted(dialog.id));
+ ((DialogCell) view).setDialog(dialog, i, serverOnly);
+ }
}
-
+ updateColors(viewGroup);
return view;
}
+ private void updateColors(ViewGroup viewGroup){
+ SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(AndroidUtilities.THEME_PREFS, Activity.MODE_PRIVATE);
+ viewGroup.setBackgroundColor(themePrefs.getInt("chatsRowColor", 0xffffffff));
+ }
+
@Override
public int getItemViewType(int i) {
if (serverOnly && i == MessagesController.getInstance().dialogsServerOnly.size() || !serverOnly && i == MessagesController.getInstance().dialogs.size()) {
@@ -133,9 +150,6 @@ public class DialogsAdapter extends BaseFragmentAdapter {
@Override
public boolean isEmpty() {
- if (MessagesController.getInstance().loadingDialogs && MessagesController.getInstance().dialogs.isEmpty()) {
- return true;
- }
int count;
if (serverOnly) {
count = MessagesController.getInstance().dialogsServerOnly.size();
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java
index 2424062c..25aeb0a9 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java
@@ -215,6 +215,10 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
cursor = MessagesStorage.getInstance().getDatabase().queryFinalized(String.format(Locale.US, "SELECT data, status, name FROM users WHERE uid IN(%s)", TextUtils.join(",", usersToLoad)));
while (cursor.next()) {
String name = cursor.stringValue(2);
+ String tName = LocaleController.getInstance().getTranslitString(name);
+ if (name.equals(tName)) {
+ tName = null;
+ }
String username = null;
int usernamePos = name.lastIndexOf(";;;");
if (usernamePos != -1) {
@@ -222,7 +226,7 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
}
int found = 0;
for (String q : search) {
- if (name.startsWith(q) || name.contains(" " + q)) {
+ if (name.startsWith(q) || name.contains(" " + q) || tName != null && (tName.startsWith(q) || tName.contains(" " + q))) {
found = 1;
} else if (username != null && username.startsWith(q)) {
found = 2;
@@ -257,8 +261,12 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
cursor = MessagesStorage.getInstance().getDatabase().queryFinalized(String.format(Locale.US, "SELECT data, name FROM chats WHERE uid IN(%s)", TextUtils.join(",", chatsToLoad)));
while (cursor.next()) {
String name = cursor.stringValue(1);
+ String tName = LocaleController.getInstance().getTranslitString(name);
+ if (name.equals(tName)) {
+ tName = null;
+ }
for (String q : search) {
- if (name.startsWith(q) || name.contains(" " + q)) {
+ if (name.startsWith(q) || name.contains(" " + q) || tName != null && (tName.startsWith(q) || tName.contains(" " + q))) {
ByteBufferDesc data = MessagesStorage.getInstance().getBuffersStorage().getFreeBuffer(cursor.byteArrayLength(0));
if (data != null && cursor.byteBufferValue(0, data.buffer) != 0) {
TLRPC.Chat chat = (TLRPC.Chat) TLClassStore.Instance().TLdeserialize(data, data.readInt32());
@@ -285,6 +293,10 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
cursor = MessagesStorage.getInstance().getDatabase().queryFinalized(String.format(Locale.US, "SELECT q.data, u.name, q.user, q.g, q.authkey, q.ttl, u.data, u.status, q.layer, q.seq_in, q.seq_out, q.use_count, q.exchange_id, q.key_date, q.fprint, q.fauthkey, q.khash FROM enc_chats as q INNER JOIN users as u ON q.user = u.uid WHERE q.uid IN(%s)", TextUtils.join(",", encryptedToLoad)));
while (cursor.next()) {
String name = cursor.stringValue(1);
+ String tName = LocaleController.getInstance().getTranslitString(name);
+ if (name.equals(tName)) {
+ tName = null;
+ }
String username = null;
int usernamePos = name.lastIndexOf(";;;");
@@ -293,7 +305,7 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
}
int found = 0;
for (String q : search) {
- if (name.startsWith(q) || name.contains(" " + q)) {
+ if (name.startsWith(q) || name.contains(" " + q) || tName != null && (tName.startsWith(q) || tName.contains(" " + q))) {
found = 1;
} else if (username != null && username.startsWith(q)) {
found = 2;
@@ -378,6 +390,10 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
continue;
}
String name = cursor.stringValue(2);
+ String tName = LocaleController.getInstance().getTranslitString(name);
+ if (name.equals(tName)) {
+ tName = null;
+ }
String username = null;
int usernamePos = name.lastIndexOf(";;;");
if (usernamePos != -1) {
@@ -385,7 +401,7 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
}
int found = 0;
for (String q : search) {
- if (name.startsWith(q) || name.contains(" " + q)) {
+ if (name.startsWith(q) || name.contains(" " + q) || tName != null && (tName.startsWith(q) || tName.contains(" " + q))) {
found = 1;
} else if (username != null && username.startsWith(q)) {
found = 2;
@@ -573,7 +589,7 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
int localCount = searchResult.size();
int globalCount = globalSearch.isEmpty() ? 0 : globalSearch.size() + 1;
-
+ String hexDarkColor = String.format("#%06X", (0xFFFFFF & AndroidUtilities.getIntDarkerColor("themeColor", 0x15)));
((ProfileSearchCell) view).useSeparator = (i != getCount() - 1 && i != localCount - 1 && i != localCount + globalCount - 1);
Object obj = getItem(i);
if (obj instanceof TLRPC.User) {
@@ -604,7 +620,8 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
foundUserName = foundUserName.substring(1);
}
try {
- username = Html.fromHtml(String.format("@%s%s", user.username.substring(0, foundUserName.length()), user.username.substring(foundUserName.length())));
+ username = Html.fromHtml(String.format("@%s%s", user.username.substring(0, foundUserName.length()), user.username.substring(foundUserName.length())));
+ //username = Html.fromHtml(String.format("@%s%s", user.username.substring(0, foundUserName.length()), user.username.substring(foundUserName.length())));
} catch (Exception e) {
username = user.username;
FileLog.e("tmessages", e);
@@ -618,7 +635,7 @@ public class DialogsSearchAdapter extends BaseContactsSearchAdapter {
}
((DialogCell) view).useSeparator = (i != getCount() - 1);
MessageObject messageObject = (MessageObject)getItem(i);
- ((DialogCell) view).setDialog(messageObject.getDialogId(), messageObject, false, messageObject.messageOwner.date, 0, false);
+ ((DialogCell) view).setDialog(messageObject.getDialogId(), messageObject, messageObject.messageOwner.date);
} else if (type == 3) {
if (view == null) {
view = new LoadingCell(mContext);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
index 8304f7f7..75892c2b 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
@@ -9,22 +9,34 @@
package org.telegram.ui.Adapters;
import android.content.Context;
+import android.content.pm.PackageInfo;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import org.telegram.android.LocaleController;
import org.telegram.android.MessagesController;
+import org.telegram.messenger.ApplicationLoader;
+import org.telegram.messenger.FileLog;
import org.telegram.messenger.R;
import org.telegram.messenger.UserConfig;
-import org.telegram.ui.Cells.DrawerActionCell;
import org.telegram.ui.Cells.DividerCell;
-import org.telegram.ui.Cells.EmptyCell;
+import org.telegram.ui.Cells.DrawerActionCell;
import org.telegram.ui.Cells.DrawerProfileCell;
+import org.telegram.ui.Cells.EmptyCell;
+import org.telegram.ui.Cells.TextInfoCell;
+
+import java.util.Locale;
public class DrawerLayoutAdapter extends BaseAdapter {
private Context mContext;
+ private int versionType = 4;
+ private int versionRow = 10;
+ private int themingRow = 7;
+ private int communityRow = 9;
+
+ private int rowCount = 0;
public DrawerLayoutAdapter(Context context) {
mContext = context;
@@ -42,7 +54,8 @@ public class DrawerLayoutAdapter extends BaseAdapter {
@Override
public int getCount() {
- return UserConfig.isClientActivated() ? 10 : 0;
+ //return UserConfig.isClientActivated() ? 10 : 0;
+ return UserConfig.isClientActivated() ? 11 : 0;
}
@Override
@@ -89,12 +102,26 @@ public class DrawerLayoutAdapter extends BaseAdapter {
actionCell.setTextAndIcon(LocaleController.getString("NewBroadcastList", R.string.NewBroadcastList), R.drawable.menu_broadcast);
} else if (i == 6) {
actionCell.setTextAndIcon(LocaleController.getString("Contacts", R.string.Contacts), R.drawable.menu_contacts);
- } else if (i == 7) {
+ }/* else if (i == 7) {
actionCell.setTextAndIcon(LocaleController.getString("InviteFriends", R.string.InviteFriends), R.drawable.menu_invite);
+ }*/ else if (i == themingRow) {
+ actionCell.setTextAndIcon(LocaleController.getString("Theming", R.string.Theming), R.drawable.menu_theming);
} else if (i == 8) {
actionCell.setTextAndIcon(LocaleController.getString("Settings", R.string.Settings), R.drawable.menu_settings);
- } else if (i == 9) {
+ } else if (i == communityRow) {
+ actionCell.setTextAndIcon(LocaleController.getString("Community", R.string.Community), R.drawable.menu_forum);
+ } /*else if (i == 10) {
actionCell.setTextAndIcon(LocaleController.getString("TelegramFaq", R.string.TelegramFaq), R.drawable.menu_help);
+ }*/
+ } else if (type == versionType) {
+ view = new TextInfoCell(mContext);
+ if (i == versionRow) {
+ try {
+ PackageInfo pInfo = ApplicationLoader.applicationContext.getPackageManager().getPackageInfo(ApplicationLoader.applicationContext.getPackageName(), 0);
+ ((TextInfoCell) view).setText(String.format(Locale.US, LocaleController.getString("TelegramForAndroid", R.string.TelegramForAndroid)+" v%s (%d)", pInfo.versionName, pInfo.versionCode));
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
}
}
@@ -110,12 +137,17 @@ public class DrawerLayoutAdapter extends BaseAdapter {
} else if (i == 5) {
return 2;
}
+ //new
+ else if (i == versionRow) {
+ return versionType;
+ }
+ //
return 3;
}
@Override
public int getViewTypeCount() {
- return 4;
+ return 5;
}
@Override
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/StickersAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/StickersAdapter.java
index 2d52263f..538756f7 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/StickersAdapter.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/StickersAdapter.java
@@ -203,6 +203,9 @@ public class StickersAdapter extends RecyclerView.Adapter implements Notificatio
}
HashMap documents = new HashMap<>();
for (TLRPC.Document document : res.documents) {
+ if (document == null) {
+ continue;
+ }
documents.put(document.id, document);
if (document.thumb != null && document.thumb.location != null) {
document.thumb.location.ext = "webp";
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Animation/AnimatorSet10.java b/TMessagesProj/src/main/java/org/telegram/ui/Animation/AnimatorSet10.java
index 0f91b93b..274dd604 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Animation/AnimatorSet10.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Animation/AnimatorSet10.java
@@ -25,10 +25,10 @@ import java.util.List;
public final class AnimatorSet10 extends Animator10 {
- private ArrayList mPlayingSet = new ArrayList();
- private HashMap mNodeMap = new HashMap();
- private ArrayList mNodes = new ArrayList();
- private ArrayList mSortedNodes = new ArrayList();
+ private ArrayList mPlayingSet = new ArrayList<>();
+ private HashMap mNodeMap = new HashMap<>();
+ private ArrayList mNodes = new ArrayList<>();
+ private ArrayList mSortedNodes = new ArrayList<>();
private boolean mNeedsSort = true;
private AnimatorSetListener mSetListener = null;
boolean mTerminated = false;
@@ -89,7 +89,7 @@ public final class AnimatorSet10 extends Animator10 {
}
public ArrayList getChildAnimations() {
- ArrayList childList = new ArrayList();
+ ArrayList childList = new ArrayList<>();
for (Node node : mNodes) {
childList.add(node.animation);
}
@@ -295,7 +295,7 @@ public final class AnimatorSet10 extends Animator10 {
ArrayList oldListeners = node.animation.getListeners();
if (oldListeners != null && oldListeners.size() > 0) {
final ArrayList clonedListeners = new
- ArrayList(oldListeners);
+ ArrayList<>(oldListeners);
for (AnimatorListener listener : clonedListeners) {
if (listener instanceof DependencyListener ||
@@ -306,7 +306,7 @@ public final class AnimatorSet10 extends Animator10 {
}
}
- final ArrayList nodesToStart = new ArrayList();
+ final ArrayList nodesToStart = new ArrayList<>();
for (Node node : mSortedNodes) {
if (mSetListener == null) {
mSetListener = new AnimatorSetListener(this);
@@ -379,12 +379,12 @@ public final class AnimatorSet10 extends Animator10 {
anim.mNeedsSort = true;
anim.mTerminated = false;
anim.mStarted = false;
- anim.mPlayingSet = new ArrayList();
- anim.mNodeMap = new HashMap();
- anim.mNodes = new ArrayList();
- anim.mSortedNodes = new ArrayList();
+ anim.mPlayingSet = new ArrayList<>();
+ anim.mNodeMap = new HashMap<>();
+ anim.mNodes = new ArrayList<>();
+ anim.mSortedNodes = new ArrayList<>();
- HashMap nodeCloneMap = new HashMap();
+ HashMap nodeCloneMap = new HashMap<>();
for (Node node : mNodes) {
Node nodeClone = node.clone();
nodeCloneMap.put(node, nodeClone);
@@ -400,7 +400,7 @@ public final class AnimatorSet10 extends Animator10 {
for (AnimatorListener listener : cloneListeners) {
if (listener instanceof AnimatorSetListener) {
if (listenersToRemove == null) {
- listenersToRemove = new ArrayList();
+ listenersToRemove = new ArrayList<>();
}
listenersToRemove.add(listener);
}
@@ -543,14 +543,14 @@ public final class AnimatorSet10 extends Animator10 {
private void sortNodes() {
if (mNeedsSort) {
mSortedNodes.clear();
- ArrayList roots = new ArrayList();
+ ArrayList roots = new ArrayList<>();
int numNodes = mNodes.size();
for (Node node : mNodes) {
if (node.dependencies == null || node.dependencies.size() == 0) {
roots.add(node);
}
}
- ArrayList tmpRoots = new ArrayList();
+ ArrayList tmpRoots = new ArrayList<>();
while (roots.size() > 0) {
int numRoots = roots.size();
for (Node root : roots) {
@@ -582,7 +582,7 @@ public final class AnimatorSet10 extends Animator10 {
for (int j = 0; j < numDependencies; ++j) {
Dependency dependency = node.dependencies.get(j);
if (node.nodeDependencies == null) {
- node.nodeDependencies = new ArrayList();
+ node.nodeDependencies = new ArrayList<>();
}
if (!node.nodeDependencies.contains(dependency.node)) {
node.nodeDependencies.add(dependency.node);
@@ -620,8 +620,8 @@ public final class AnimatorSet10 extends Animator10 {
public void addDependency(Dependency dependency) {
if (dependencies == null) {
- dependencies = new ArrayList();
- nodeDependencies = new ArrayList();
+ dependencies = new ArrayList<>();
+ nodeDependencies = new ArrayList<>();
}
dependencies.add(dependency);
if (!nodeDependencies.contains(dependency.node)) {
@@ -629,7 +629,7 @@ public final class AnimatorSet10 extends Animator10 {
}
Node dependencyNode = dependency.node;
if (dependencyNode.nodeDependents == null) {
- dependencyNode.nodeDependents = new ArrayList();
+ dependencyNode.nodeDependents = new ArrayList<>();
}
dependencyNode.nodeDependents.add(this);
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Animation/View10.java b/TMessagesProj/src/main/java/org/telegram/ui/Animation/View10.java
index 0863204d..4a89fe9c 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Animation/View10.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Animation/View10.java
@@ -31,7 +31,7 @@ public class View10 extends Animation {
public static boolean NEED_PROXY = Build.VERSION.SDK_INT < 11;
- private static final WeakHashMap PROXIES = new WeakHashMap();
+ private static final WeakHashMap PROXIES = new WeakHashMap<>();
public static View10 wrap(View view) {
View10 proxy = PROXIES.get(view);
@@ -68,7 +68,7 @@ public class View10 extends Animation {
setDuration(0);
setFillAfter(true);
view.setAnimation(this);
- mView = new WeakReference(view);
+ mView = new WeakReference<>(view);
}
public float getAlpha() {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java
index 0f0eb843..ef1e5475 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java
@@ -64,7 +64,7 @@ public class BlockedUsersActivity extends BaseFragment implements NotificationCe
}
@Override
- public View createView(LayoutInflater inflater, ViewGroup container) {
+ public View createView(LayoutInflater inflater) {
if (fragmentView == null) {
actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBar.setAllowOverlayTitle(true);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatActionCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatActionCell.java
index f07555cf..f1073509 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatActionCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatActionCell.java
@@ -12,6 +12,7 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Paint;
+import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.text.Layout;
import android.text.Spannable;
@@ -45,6 +46,8 @@ public class ChatActionCell extends BaseCell {
private static Drawable backgroundBlue;
private static TextPaint textPaint;
+ private static Drawable backgroundWhite;
+
private URLSpan pressedLink;
private ImageReceiver imageReceiver;
@@ -69,6 +72,9 @@ public class ChatActionCell extends BaseCell {
backgroundBlack = getResources().getDrawable(R.drawable.system_black);
backgroundBlue = getResources().getDrawable(R.drawable.system_blue);
+ backgroundWhite = getResources().getDrawable(R.drawable.system_white);
+ backgroundBlue = backgroundWhite;
+
textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
textPaint.setColor(0xffffffff);
textPaint.linkColor = 0xffffffff;
@@ -220,6 +226,7 @@ public class ChatActionCell extends BaseCell {
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ updateColor();
if (currentMessageObject == null) {
setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), textHeight + AndroidUtilities.dp(14));
return;
@@ -286,4 +293,14 @@ public class ChatActionCell extends BaseCell {
canvas.restore();
}
}
+
+ private void updateColor(){
+ int color = AndroidUtilities.getIntDef("chatDateColor", 0xffffffff);
+ textPaint.setColor(color);
+ if(color != 0xffffffff){
+ textPaint.linkColor = AndroidUtilities.getIntDarkerColor("chatDateColor", -0x50);
+ }
+ textPaint.setTextSize(AndroidUtilities.dp(AndroidUtilities.getIntDef("chatDateSize",16)));//16
+ backgroundWhite.setColorFilter(AndroidUtilities.getIntDef("chatDateBubbleColor",0x59000000), PorterDuff.Mode.MULTIPLY);
+ }
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatBaseCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatBaseCell.java
index ec5ac969..4a2c1fba 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatBaseCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatBaseCell.java
@@ -11,6 +11,7 @@ package org.telegram.ui.Cells;
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Canvas;
+import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.text.Html;
import android.text.Layout;
@@ -73,6 +74,14 @@ public class ChatBaseCell extends BaseCell {
private static TextPaint namePaint;
private static TextPaint forwardNamePaint;
+ private static Drawable backgroundDrawableOutWhite;
+ private static Drawable backgroundDrawableOutWhiteSelected;
+ private static Drawable backgroundMediaDrawableOutWhite;
+ private static Drawable backgroundMediaDrawableOutWhiteSelected;
+ private static Drawable checkDrawableWhite;
+ private static Drawable halfCheckDrawableWhite;
+ private static Drawable clockDrawableWhite;
+
protected int backgroundWidth = 100;
protected int layoutWidth;
@@ -138,6 +147,15 @@ public class ChatBaseCell extends BaseCell {
broadcastDrawable = getResources().getDrawable(R.drawable.broadcast3);
broadcastMediaDrawable = getResources().getDrawable(R.drawable.broadcast4);
+ backgroundDrawableOutWhite = getResources().getDrawable(R.drawable.msg_out_white);
+ backgroundDrawableOutWhiteSelected = getResources().getDrawable(R.drawable.msg_out_white_selected);
+ backgroundMediaDrawableOutWhite = getResources().getDrawable(R.drawable.msg_out_photo_white);
+ backgroundMediaDrawableOutWhiteSelected = getResources().getDrawable(R.drawable.msg_out_photo_white_selected);
+
+ checkDrawableWhite = getResources().getDrawable(R.drawable.msg_check_white);
+ halfCheckDrawableWhite = getResources().getDrawable(R.drawable.msg_halfcheck_white);
+ clockDrawableWhite = getResources().getDrawable(R.drawable.msg_clock_white);
+
timePaintIn = new TextPaint(TextPaint.ANTI_ALIAS_FLAG);
timePaintIn.setTextSize(AndroidUtilities.dp(12));
timePaintIn.setColor(0xffa1aab3);
@@ -161,6 +179,26 @@ public class ChatBaseCell extends BaseCell {
avatarDrawable = new AvatarDrawable();
}
+ private void updateColors(){
+ int tColor = AndroidUtilities.getIntColor("themeColor");
+ int lColor = AndroidUtilities.getIntDarkerColor("themeColor",-0x80);
+ int dColor = AndroidUtilities.getIntDarkerColor("themeColor",0x15);
+ backgroundDrawableOutWhite.setColorFilter(AndroidUtilities.getIntDef("chatRBubbleColor", lColor), PorterDuff.Mode.MULTIPLY);
+ backgroundMediaDrawableOutWhite.setColorFilter(AndroidUtilities.getIntDef("chatRBubbleColor", lColor), PorterDuff.Mode.MULTIPLY);
+ backgroundDrawableIn.setColorFilter(AndroidUtilities.getIntDef("chatLBubbleColor",0xffffffff), PorterDuff.Mode.MULTIPLY);
+ backgroundMediaDrawableIn.setColorFilter(AndroidUtilities.getIntDef("chatLBubbleColor",0xffffffff), PorterDuff.Mode.MULTIPLY);
+
+ int checksColor = AndroidUtilities.getIntDef("chatChecksColor", tColor);
+ checkDrawableWhite.setColorFilter(checksColor, PorterDuff.Mode.MULTIPLY);
+ halfCheckDrawableWhite.setColorFilter(checksColor, PorterDuff.Mode.MULTIPLY);
+ clockDrawableWhite.setColorFilter(checksColor, PorterDuff.Mode.MULTIPLY);
+
+ timePaintOut.setColor(AndroidUtilities.getIntDef("chatRTimeColor",dColor));
+ timePaintOut.setTextSize(AndroidUtilities.dp(AndroidUtilities.getIntDef("chatTimeSize",12)));
+ timePaintIn.setColor(AndroidUtilities.getIntDef("chatLTimeColor",0xffa1aab3));
+ timePaintIn.setTextSize(AndroidUtilities.dp(AndroidUtilities.getIntDef("chatTimeSize",12)));
+ }
+
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
@@ -427,6 +465,7 @@ public class ChatBaseCell extends BaseCell {
@Override
protected void onDraw(Canvas canvas) {
+ updateColors();
if (currentMessageObject == null) {
return;
}
@@ -444,15 +483,15 @@ public class ChatBaseCell extends BaseCell {
if (currentMessageObject.isOut()) {
if (isPressed() && isCheckPressed || !isCheckPressed && isPressed) {
if (!media) {
- currentBackgroundDrawable = backgroundDrawableOutSelected;
+ currentBackgroundDrawable = backgroundDrawableOutWhiteSelected;//backgroundDrawableOutSelected;
} else {
- currentBackgroundDrawable = backgroundMediaDrawableOutSelected;
+ currentBackgroundDrawable = backgroundMediaDrawableOutWhiteSelected;//backgroundMediaDrawableOutSelected;
}
} else {
if (!media) {
- currentBackgroundDrawable = backgroundDrawableOut;
+ currentBackgroundDrawable = backgroundDrawableOutWhite;//backgroundDrawableOut;
} else {
- currentBackgroundDrawable = backgroundMediaDrawableOut;
+ currentBackgroundDrawable = backgroundMediaDrawableOutWhite;//backgroundMediaDrawableOut;
}
}
setDrawableBounds(currentBackgroundDrawable, layoutWidth - backgroundWidth - (!media ? 0 : AndroidUtilities.dp(9)), AndroidUtilities.dp(1), backgroundWidth, layoutHeight - AndroidUtilities.dp(2));
@@ -553,6 +592,7 @@ public class ChatBaseCell extends BaseCell {
if (drawClock) {
if (!media) {
+ clockDrawable = clockDrawableWhite;
setDrawableBounds(clockDrawable, layoutWidth - AndroidUtilities.dp(18.5f) - clockDrawable.getIntrinsicWidth(), layoutHeight - AndroidUtilities.dp(8.5f) - clockDrawable.getIntrinsicHeight());
clockDrawable.draw(canvas);
} else {
@@ -573,6 +613,7 @@ public class ChatBaseCell extends BaseCell {
} else {
if (drawCheck2) {
if (!media) {
+ checkDrawable = checkDrawableWhite;
if (drawCheck1) {
setDrawableBounds(checkDrawable, layoutWidth - AndroidUtilities.dp(22.5f) - checkDrawable.getIntrinsicWidth(), layoutHeight - AndroidUtilities.dp(8.5f) - checkDrawable.getIntrinsicHeight());
} else {
@@ -590,6 +631,7 @@ public class ChatBaseCell extends BaseCell {
}
if (drawCheck1) {
if (!media) {
+ halfCheckDrawable = halfCheckDrawableWhite;
setDrawableBounds(halfCheckDrawable, layoutWidth - AndroidUtilities.dp(18) - halfCheckDrawable.getIntrinsicWidth(), layoutHeight - AndroidUtilities.dp(8.5f) - halfCheckDrawable.getIntrinsicHeight());
halfCheckDrawable.draw(canvas);
} else {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java
index 87825a1c..db40b041 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java
@@ -530,19 +530,14 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
break;
}
}
- float maxWidth;
- if (AndroidUtilities.isTablet()) {
- maxWidth = (int) (AndroidUtilities.getMinTabletSide() * 0.5f);
- } else {
- maxWidth = (int) (Math.min(AndroidUtilities.displaySize.x, AndroidUtilities.displaySize.y) * 0.5f);
- }
+ float maxHeight = AndroidUtilities.displaySize.y * 0.4f;
if (photoWidth == 0) {
- photoWidth = (int)maxWidth;
- photoHeight = photoWidth + AndroidUtilities.dp(100);
+ photoHeight = (int) maxHeight;
+ photoWidth = photoHeight + AndroidUtilities.dp(100);
}
- if (photoWidth > maxWidth) {
- photoHeight *= maxWidth / photoWidth;
- photoWidth = (int)maxWidth;
+ if (photoHeight > maxHeight) {
+ photoWidth *= maxHeight / photoHeight;
+ photoHeight = (int)maxHeight;
}
backgroundWidth = photoWidth + AndroidUtilities.dp(12);
currentPhotoObjectThumb = FileLoader.getClosestPhotoSizeWithSize(messageObject.photoThumbs, 80);
@@ -870,8 +865,8 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD
if (currentMessageObject.type == 9) {
Drawable menuDrawable = null;
if (currentMessageObject.isOut()) {
- infoPaint.setColor(0xff75b166);
- docBackPaint.setColor(0xffd0f3b3);
+ infoPaint.setColor(0xff70b15c);
+ docBackPaint.setColor(0xffdaf5c3);
menuDrawable = docMenuOutDrawable;
} else {
infoPaint.setColor(0xffa1adbb);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
index d04e80cc..1f799a2e 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
@@ -8,9 +8,12 @@
package org.telegram.ui.Cells;
+import android.app.Activity;
import android.content.Context;
+import android.content.SharedPreferences;
import android.graphics.Canvas;
import android.graphics.Paint;
+import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.text.Html;
import android.text.Layout;
@@ -22,6 +25,7 @@ import org.telegram.android.AndroidUtilities;
import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.android.LocaleController;
import org.telegram.android.MessageObject;
+import org.telegram.messenger.ApplicationLoader;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.TLRPC;
import org.telegram.android.ContactsController;
@@ -52,15 +56,26 @@ public class DialogCell extends BaseCell {
private static Drawable broadcastDrawable;
private static Drawable muteDrawable;
+ private static Drawable checkWhiteDrawable;
+ private static Drawable halfCheckWhiteDrawable;
+ private static Drawable countWhiteDrawable;
+ private static Drawable lockWhiteDrawable;
+ private static Drawable groupWhiteDrawable;
+ private static Drawable broadcastWhiteDrawable;
+ private static Drawable muteWhiteDrawable;
+
private static Paint linePaint;
private long currentDialogId;
- private boolean allowPrintStrings;
+ private boolean isDialogCell;
private int lastMessageDate;
private int unreadCount;
private boolean lastUnreadState;
+ private int lastSendState;
private boolean dialogMuted;
private MessageObject message;
+ private int index;
+ private boolean isServerOnly;
private ImageReceiver avatarImage;
private AvatarDrawable avatarDrawable;
@@ -155,6 +170,22 @@ public class DialogCell extends BaseCell {
groupDrawable = getResources().getDrawable(R.drawable.list_group);
broadcastDrawable = getResources().getDrawable(R.drawable.list_broadcast);
muteDrawable = getResources().getDrawable(R.drawable.mute_grey);
+
+ checkWhiteDrawable = getResources().getDrawable(R.drawable.dialogs_check_white);
+ checkDrawable = checkWhiteDrawable;
+ halfCheckWhiteDrawable = getResources().getDrawable(R.drawable.dialogs_halfcheck_white);
+ halfCheckDrawable = halfCheckWhiteDrawable;
+ countWhiteDrawable = getResources().getDrawable(R.drawable.dialogs_badge_white);
+ countDrawable = countWhiteDrawable;
+ lockWhiteDrawable = getResources().getDrawable(R.drawable.list_secret_white);
+ lockDrawable = lockWhiteDrawable;
+ groupWhiteDrawable = getResources().getDrawable(R.drawable.list_group_white);
+ groupDrawable = groupWhiteDrawable;
+ broadcastWhiteDrawable = getResources().getDrawable(R.drawable.list_broadcast_white);
+ broadcastDrawable = broadcastWhiteDrawable;
+ muteWhiteDrawable = getResources().getDrawable(R.drawable.mute_white);
+ muteDrawable = muteWhiteDrawable;
+ updateColors();
}
}
@@ -163,17 +194,28 @@ public class DialogCell extends BaseCell {
init();
avatarImage = new ImageReceiver(this);
avatarImage.setRoundRadius(AndroidUtilities.dp(26));
+ //avatarImage.setRoundRadius(AndroidUtilities.dp(5));
avatarDrawable = new AvatarDrawable();
+ //avatarDrawable.setRadius(5);
+ }
+ public void setDialog(TLRPC.TL_dialog dialog, int i, boolean server) {
+ currentDialogId = dialog.id;
+ isDialogCell = true;
+ index = i;
+ isServerOnly = server;
+ update(0);
}
- public void setDialog(long dialog_id, MessageObject messageObject, boolean usePrintStrings, int date, int unread, boolean muted) {
+ public void setDialog(long dialog_id, MessageObject messageObject, int date) {
currentDialogId = dialog_id;
message = messageObject;
- allowPrintStrings = usePrintStrings;
+ isDialogCell = false;
lastMessageDate = date;
- unreadCount = unread;
- dialogMuted = muted;
+ unreadCount = 0;
lastUnreadState = messageObject != null && messageObject.isUnread();
+ if (message != null) {
+ lastSendState = message.messageOwner.send_state;
+ }
update(0);
}
@@ -211,7 +253,7 @@ public class DialogCell extends BaseCell {
String countString = null;
CharSequence messageString = "";
CharSequence printingString = null;
- if (allowPrintStrings) {
+ if (isDialogCell) {
printingString = MessagesController.getInstance().printingStrings.get(currentDialogId);
}
TextPaint currentNamePaint = namePaint;
@@ -328,9 +370,13 @@ public class DialogCell extends BaseCell {
}
}
checkMessage = false;
+ String hexColor = String.format("#%06X", (0xFFFFFF & AndroidUtilities.getIntColor("themeColor")));
+ String hexMsgColor = String.format("#%06X", (0xFFFFFF & AndroidUtilities.getIntDef("chatsMessageColor",0xff8f8f8f)));
+ String hexDarkColor = String.format("#%06X", (0xFFFFFF & AndroidUtilities.getIntDef("chatsParticipantColor", AndroidUtilities.getIntDarkerColor("themeColor",0x15))));
if (message.messageOwner.media != null && !(message.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) {
currentMessagePaint = messagePrintingPaint;
- messageString = Emoji.replaceEmoji(Html.fromHtml(String.format("%s: %s", name, message.messageText)), messagePaint.getFontMetricsInt(), AndroidUtilities.dp(20));
+ //messageString = Emoji.replaceEmoji(Html.fromHtml(String.format("%s: %s", name, message.messageText)), messagePaint.getFontMetricsInt(), AndroidUtilities.dp(20));
+ messageString = Emoji.replaceEmoji(Html.fromHtml(String.format("%s: %s", name, message.messageText)), messagePaint.getFontMetricsInt(), AndroidUtilities.dp(20));
} else {
if (message.messageOwner.message != null) {
String mess = message.messageOwner.message;
@@ -338,7 +384,8 @@ public class DialogCell extends BaseCell {
mess = mess.substring(0, 150);
}
mess = mess.replace("\n", " ");
- messageString = Emoji.replaceEmoji(Html.fromHtml(String.format("%s: %s", name, mess.replace("<", "<").replace(">", ">"))), messagePaint.getFontMetricsInt(), AndroidUtilities.dp(20));
+ //messageString = Emoji.replaceEmoji(Html.fromHtml(String.format("%s: %s", name, mess.replace("<", "<").replace(">", ">"))), messagePaint.getFontMetricsInt(), AndroidUtilities.dp(20));
+ messageString = Emoji.replaceEmoji(Html.fromHtml(String.format("%s: %s", name, mess.replace("<", "<").replace(">", ">"))), messagePaint.getFontMetricsInt(), AndroidUtilities.dp(20));
}
}
} else {
@@ -543,15 +590,15 @@ public class DialogCell extends BaseCell {
if (LocaleController.isRTL) {
if (nameLayout != null && nameLayout.getLineCount() > 0) {
left = nameLayout.getLineLeft(0);
- if (left == 0) {
widthpx = Math.ceil(nameLayout.getLineWidth(0));
+ if (dialogMuted) {
+ nameMuteLeft = (int) (nameLeft + (nameWidth - widthpx) - AndroidUtilities.dp(6) - muteDrawable.getIntrinsicWidth());
+ }
+ if (left == 0) {
if (widthpx < nameWidth) {
nameLeft += (nameWidth - widthpx);
}
}
- if (dialogMuted) {
- nameMuteLeft = (nameLeft - AndroidUtilities.dp(6) - muteDrawable.getIntrinsicWidth());
- }
}
if (messageLayout != null && messageLayout.getLineCount() > 0) {
left = messageLayout.getLineLeft(0);
@@ -587,10 +634,43 @@ public class DialogCell extends BaseCell {
}
}
+ public void checkCurrentDialogIndex() {
+ TLRPC.TL_dialog dialog = null;
+ if (isServerOnly) {
+ if (index < MessagesController.getInstance().dialogsServerOnly.size()) {
+ dialog = MessagesController.getInstance().dialogsServerOnly.get(index);
+ }
+ } else {
+ if (index < MessagesController.getInstance().dialogs.size()) {
+ dialog = MessagesController.getInstance().dialogs.get(index);
+ }
+ }
+ if (dialog != null) {
+ if (currentDialogId != dialog.id || message != null && message.messageOwner.id != dialog.top_message || unreadCount != dialog.unread_count) {
+ currentDialogId = dialog.id;
+ update(0);
+ }
+ }
+ }
+
public void update(int mask) {
+ updateColors();
+ if (isDialogCell) {
+ TLRPC.TL_dialog dialog = MessagesController.getInstance().dialogs_dict.get(currentDialogId);
+ if (dialog != null && mask == 0) {
+ message = MessagesController.getInstance().dialogMessage.get(dialog.top_message);
+ lastUnreadState = message != null && message.isUnread();
+ unreadCount = dialog.unread_count;
+ lastMessageDate = dialog.last_message_date;
+ if (message != null) {
+ lastSendState = message.messageOwner.send_state;
+ }
+ }
+ }
+
if (mask != 0) {
boolean continueUpdate = false;
- if (allowPrintStrings && (mask & MessagesController.UPDATE_MASK_USER_PRINT) != 0) {
+ if (isDialogCell && (mask & MessagesController.UPDATE_MASK_USER_PRINT) != 0) {
CharSequence printString = MessagesController.getInstance().printingStrings.get(currentDialogId);
if (lastPrintString != null && printString == null || lastPrintString == null && printString != null || lastPrintString != null && printString != null && !lastPrintString.equals(printString)) {
continueUpdate = true;
@@ -618,8 +698,9 @@ public class DialogCell extends BaseCell {
}
if (!continueUpdate && (mask & MessagesController.UPDATE_MASK_READ_DIALOG_MESSAGE) != 0) {
if (message != null && lastUnreadState != message.isUnread()) {
+ lastUnreadState = message.isUnread();
continueUpdate = true;
- } else if (allowPrintStrings) {
+ } else if (isDialogCell) {
TLRPC.TL_dialog dialog = MessagesController.getInstance().dialogs_dict.get(currentDialogId);
if (dialog != null && unreadCount != dialog.unread_count) {
unreadCount = dialog.unread_count;
@@ -627,11 +708,19 @@ public class DialogCell extends BaseCell {
}
}
}
+ if (!continueUpdate && (mask & MessagesController.UPDATE_MASK_SEND_STATE) != 0) {
+ if (message != null && lastSendState != message.messageOwner.send_state) {
+ lastSendState = message.messageOwner.send_state;
+ continueUpdate = true;
+ }
+ }
if (!continueUpdate) {
return;
}
}
+
+ dialogMuted = isDialogCell && MessagesController.getInstance().isDialogMuted(currentDialogId);
user = null;
chat = null;
encryptedChat = null;
@@ -756,4 +845,44 @@ public class DialogCell extends BaseCell {
avatarImage.draw(canvas);
}
+
+ private void updateColors(){
+ SharedPreferences themePrefs = ApplicationLoader.applicationContext.getSharedPreferences(AndroidUtilities.THEME_PREFS, Activity.MODE_PRIVATE);
+ int tColor = AndroidUtilities.getIntColor("themeColor");
+ int dColor = AndroidUtilities.getIntDarkerColor("themeColor",0x15);
+
+ namePaint.setTextSize(AndroidUtilities.dp(themePrefs.getInt("chatsNameSize", 17)));
+ namePaint.setColor(themePrefs.getInt("chatsNameColor", 0xff212121));
+
+ nameEncryptedPaint.setTextSize(AndroidUtilities.dp(themePrefs.getInt("chatsNameSize", 17)));
+ nameEncryptedPaint.setColor(themePrefs.getInt("chatsNameColor", dColor));//0xff00a60e
+
+ nameUnknownPaint.setTextSize(AndroidUtilities.dp(themePrefs.getInt("chatsNameSize", 17)));
+ nameUnknownPaint.setColor(themePrefs.getInt("chatsNameColor", 0xff000000));//0xff4d83b3
+
+ messagePaint.setTextSize(AndroidUtilities.dp(themePrefs.getInt("chatsMessageSize", 16)));
+ messagePaint.setColor(themePrefs.getInt("chatsMessageColor", 0xff8f8f8f));
+ //Audio Archivo ... te expulsó
+ messagePrintingPaint.setTextSize(AndroidUtilities.dp(themePrefs.getInt("chatsMessageSize", 16)));
+ messagePrintingPaint.setColor(themePrefs.getInt("chatsMessageColor", tColor));//0xff4d83b3
+
+ timePaint.setTextSize(AndroidUtilities.dp(themePrefs.getInt("chatsTimeSize", 13)));
+ timePaint.setColor(themePrefs.getInt("chatsTimeColor", 0xff999999));
+
+ countPaint.setTextSize(AndroidUtilities.dp(themePrefs.getInt("chatsCountSize", 13)));
+ countPaint.setColor(themePrefs.getInt("chatsCountColor", 0xffffffff));
+
+ checkWhiteDrawable.setColorFilter(AndroidUtilities.getIntDef("chatsChecksColor",AndroidUtilities.getIntColor("themeColor")), PorterDuff.Mode.MULTIPLY);
+ halfCheckWhiteDrawable.setColorFilter(AndroidUtilities.getIntDef("chatsChecksColor",AndroidUtilities.getIntColor("themeColor")), PorterDuff.Mode.MULTIPLY);
+
+ countWhiteDrawable.setColorFilter(themePrefs.getInt("chatsCountBGColor", tColor), PorterDuff.Mode.MULTIPLY);
+ lockWhiteDrawable.setColorFilter(dColor, PorterDuff.Mode.MULTIPLY);
+
+ int nColor = themePrefs.getInt("chatsNameColor", 0xff000000);
+ groupWhiteDrawable.setColorFilter(nColor, PorterDuff.Mode.MULTIPLY);
+ broadcastWhiteDrawable.setColorFilter(nColor, PorterDuff.Mode.MULTIPLY);
+
+ int mColor = themePrefs.getInt("chatsMuteColor", 0xffa8a8a8);
+ muteWhiteDrawable.setColorFilter(mColor, PorterDuff.Mode.MULTIPLY);
+ }
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java
index f1dfbb2e..053af150 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java
@@ -8,7 +8,11 @@
package org.telegram.ui.Cells;
+import android.app.Activity;
import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
import android.os.Build;
import android.util.TypedValue;
import android.view.Gravity;
@@ -18,7 +22,9 @@ import android.widget.TextView;
import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.android.AndroidUtilities;
import org.telegram.android.ContactsController;
+import org.telegram.android.MessagesController;
import org.telegram.messenger.TLRPC;
+import org.telegram.messenger.UserConfig;
import org.telegram.ui.Components.AvatarDrawable;
import org.telegram.ui.Components.BackupImageView;
@@ -86,6 +92,7 @@ public class DrawerProfileCell extends FrameLayout {
} else {
super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(148), MeasureSpec.EXACTLY));
}
+ updateColors();
}
public void setUser(TLRPC.User user) {
@@ -102,4 +109,23 @@ public class DrawerProfileCell extends FrameLayout {
avatarDrawable.setColor(0xff5c98cd);
avatarImageView.setImage(photo, "50_50", avatarDrawable);
}
+
+ private void updateColors(){
+ setBackgroundColor(AndroidUtilities.getIntColor("themeColor"));
+ phoneTextView.setTextColor(AndroidUtilities.getIntDarkerColor("themeColor",-0x40));
+ TLRPC.User user = MessagesController.getInstance().getUser(UserConfig.getClientUserId());
+ TLRPC.FileLocation photo = null;
+ if (user.photo != null) {
+ photo = user.photo.photo_small;
+ }
+ AvatarDrawable avatarDrawable = new AvatarDrawable(user);
+ avatarDrawable.setColor(AndroidUtilities.getIntDarkerColor("themeColor",0x15));
+ avatarImageView.setImage(photo, "50_50", avatarDrawable);
+
+ if(AndroidUtilities.getBoolMain("hideMobile")){
+ phoneTextView.setVisibility(GONE);
+ }else{
+ phoneTextView.setVisibility(VISIBLE);
+ }
+ }
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/GreySectionCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/GreySectionCell.java
index b13f3de7..633e02c8 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/GreySectionCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/GreySectionCell.java
@@ -9,7 +9,6 @@
package org.telegram.ui.Cells;
import android.content.Context;
-import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.Gravity;
import android.widget.FrameLayout;
@@ -21,7 +20,9 @@ import org.telegram.android.LocaleController;
public class GreySectionCell extends FrameLayout {
private TextView textView;
- private void init() {
+ public GreySectionCell(Context context) {
+ super(context);
+
setBackgroundColor(0xfff2f2f2);
textView = new TextView(getContext());
@@ -39,26 +40,6 @@ public class GreySectionCell extends FrameLayout {
textView.setLayoutParams(layoutParams);
}
- public GreySectionCell(Context context) {
- super(context);
- init();
- }
-
- public GreySectionCell(Context context, AttributeSet attrs) {
- super(context, attrs);
- init();
- }
-
- public GreySectionCell(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- init();
- }
-
- public GreySectionCell(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
- super(context, attrs, defStyleAttr, defStyleRes);
- init();
- }
-
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(36), MeasureSpec.EXACTLY));
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/HeaderCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/HeaderCell.java
index fcfd8b2e..3cc09042 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/HeaderCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/HeaderCell.java
@@ -8,7 +8,9 @@
package org.telegram.ui.Cells;
+import android.app.Activity;
import android.content.Context;
+import android.content.SharedPreferences;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.Gravity;
@@ -26,7 +28,10 @@ public class HeaderCell extends FrameLayout {
textView = new TextView(getContext());
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
textView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
- textView.setTextColor(0xff3e90cf);
+ //textView.setTextColor(0xff3e90cf);
+ //
+ textView.setTextColor(AndroidUtilities.getIntColor("themeColor"));
+ //
textView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL);
addView(textView);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)textView.getLayoutParams();
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoEditToolCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoEditToolCell.java
index b6be0e98..faf3b163 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoEditToolCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoEditToolCell.java
@@ -9,6 +9,7 @@
package org.telegram.ui.Cells;
import android.content.Context;
+import android.text.TextUtils;
import android.util.TypedValue;
import android.view.Gravity;
import android.widget.ImageView;
@@ -32,28 +33,54 @@ public class PhotoEditToolCell extends FrameLayoutFixed {
LayoutParams layoutParams = (LayoutParams) iconImage.getLayoutParams();
layoutParams.width = LayoutParams.MATCH_PARENT;
layoutParams.height = LayoutParams.MATCH_PARENT;
- layoutParams.bottomMargin = AndroidUtilities.dp(20);
+ layoutParams.bottomMargin = AndroidUtilities.dp(12);
iconImage.setLayoutParams(layoutParams);
nameTextView = new TextView(context);
nameTextView.setGravity(Gravity.CENTER);
nameTextView.setTextColor(0xffffffff);
- nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 12);
+ nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 10);
+ nameTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
+ nameTextView.setMaxLines(1);
+ nameTextView.setSingleLine(true);
+ nameTextView.setEllipsize(TextUtils.TruncateAt.END);
addView(nameTextView);
layoutParams = (LayoutParams) nameTextView.getLayoutParams();
layoutParams.width = LayoutParams.MATCH_PARENT;
- layoutParams.height = AndroidUtilities.dp(20);
+ layoutParams.height = LayoutParams.WRAP_CONTENT;
layoutParams.gravity = Gravity.LEFT | Gravity.BOTTOM;
+ layoutParams.leftMargin = AndroidUtilities.dp(4);
+ layoutParams.rightMargin = AndroidUtilities.dp(4);
nameTextView.setLayoutParams(layoutParams);
+
+ valueTextView = new TextView(context);
+ valueTextView.setTextColor(0xff6cc3ff);
+ valueTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 11);
+ valueTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
+ addView(valueTextView);
+ layoutParams = (LayoutParams) valueTextView.getLayoutParams();
+ layoutParams.width = LayoutParams.WRAP_CONTENT;
+ layoutParams.height = LayoutParams.WRAP_CONTENT;
+ layoutParams.gravity = Gravity.LEFT | Gravity.TOP;
+ layoutParams.leftMargin = AndroidUtilities.dp(57);
+ layoutParams.topMargin = AndroidUtilities.dp(3);
+ valueTextView.setLayoutParams(layoutParams);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(80), MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(60), MeasureSpec.EXACTLY));
+ super.onMeasure(MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(86), MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(60), MeasureSpec.EXACTLY));
}
- public void setIconAndText(int resId, String text) {
+ public void setIconAndTextAndValue(int resId, String text, float value) {
iconImage.setImageResource(resId);
- nameTextView.setText(text);
+ nameTextView.setText(text.toUpperCase());
+ if (value == 0) {
+ valueTextView.setText("");
+ } else if (value > 0) {
+ valueTextView.setText("+" + (int) value);
+ } else {
+ valueTextView.setText("" + (int) value);
+ }
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoPickerAlbumsCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoPickerAlbumsCell.java
index 15a24037..2fe47d9e 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoPickerAlbumsCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoPickerAlbumsCell.java
@@ -15,7 +15,7 @@ import android.util.TypedValue;
import android.view.Gravity;
import android.view.MotionEvent;
import android.view.View;
-import android.widget.FrameLayout;
+import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -23,8 +23,9 @@ import org.telegram.android.AndroidUtilities;
import org.telegram.android.MediaController;
import org.telegram.messenger.R;
import org.telegram.ui.Components.BackupImageView;
+import org.telegram.ui.Components.FrameLayoutFixed;
-public class PhotoPickerAlbumsCell extends FrameLayout {
+public class PhotoPickerAlbumsCell extends FrameLayoutFixed {
public static interface PhotoPickerAlbumsCellDelegate {
public abstract void didSelectAlbum(MediaController.AlbumEntry albumEntry);
@@ -35,7 +36,7 @@ public class PhotoPickerAlbumsCell extends FrameLayout {
private int albumsCount;
private PhotoPickerAlbumsCellDelegate delegate;
- private class AlbumView extends FrameLayout {
+ private class AlbumView extends FrameLayoutFixed {
private BackupImageView imageView;
private TextView nameTextView;
@@ -146,7 +147,9 @@ public class PhotoPickerAlbumsCell extends FrameLayout {
if (albumEntry != null) {
AlbumView albumView = albumViews[a];
+ albumView.imageView.setOrientation(0, true);
if (albumEntry.coverPhoto != null && albumEntry.coverPhoto.path != null) {
+ albumView.imageView.setOrientation(albumEntry.coverPhoto.orientation, true);
albumView.imageView.setImage("thumb://" + albumEntry.coverPhoto.imageId + ":" + albumEntry.coverPhoto.path, null, getContext().getResources().getDrawable(R.drawable.nophotos));
} else {
albumView.imageView.setImageResource(R.drawable.nophotos);
@@ -167,16 +170,21 @@ public class PhotoPickerAlbumsCell extends FrameLayout {
itemWidth = (AndroidUtilities.displaySize.x - ((albumsCount + 1) * AndroidUtilities.dp(4))) / albumsCount;
}
- setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(4) + itemWidth, MeasureSpec.EXACTLY));
-
for (int a = 0; a < albumsCount; a++) {
LayoutParams layoutParams = (LayoutParams) albumViews[a].getLayoutParams();
layoutParams.topMargin = AndroidUtilities.dp(4);
layoutParams.leftMargin = (itemWidth + AndroidUtilities.dp(4)) * a;
layoutParams.width = itemWidth;
layoutParams.height = itemWidth;
+ layoutParams.gravity = Gravity.LEFT | Gravity.TOP;
albumViews[a].setLayoutParams(layoutParams);
- albumViews[a].measure(MeasureSpec.makeMeasureSpec(itemWidth, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(itemWidth, MeasureSpec.EXACTLY));
}
+
+ ViewGroup.LayoutParams layoutParams = getLayoutParams();
+ if (layoutParams != null) {
+ layoutParams.height = AndroidUtilities.dp(4) + itemWidth;
+ setLayoutParams(layoutParams);
+ }
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoPickerPhotoCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoPickerPhotoCell.java
index 4879a0c0..f0043492 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoPickerPhotoCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoPickerPhotoCell.java
@@ -11,7 +11,6 @@ package org.telegram.ui.Cells;
import android.content.Context;
import android.view.Gravity;
import android.widget.FrameLayout;
-import android.widget.ImageView;
import org.telegram.android.AndroidUtilities;
import org.telegram.messenger.R;
@@ -23,7 +22,6 @@ public class PhotoPickerPhotoCell extends FrameLayout {
public BackupImageView photoImage;
public FrameLayout checkFrame;
public CheckBox checkBox;
- public ImageView editedImage;
public int itemWidth;
public PhotoPickerPhotoCell(Context context) {
@@ -57,16 +55,6 @@ public class PhotoPickerPhotoCell extends FrameLayout {
layoutParams.topMargin = AndroidUtilities.dp(6);
layoutParams.rightMargin = AndroidUtilities.dp(6);
checkBox.setLayoutParams(layoutParams);
-
- editedImage = new ImageView(context);
- editedImage.setImageResource(R.drawable.photo_edit);
- editedImage.setScaleType(ImageView.ScaleType.CENTER);
- addView(editedImage);
- layoutParams = (LayoutParams) editedImage.getLayoutParams();
- layoutParams.width = AndroidUtilities.dp(42);
- layoutParams.height = AndroidUtilities.dp(42);
- layoutParams.gravity = Gravity.LEFT | Gravity.TOP;
- editedImage.setLayoutParams(layoutParams);
}
@Override
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoPickerSearchCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoPickerSearchCell.java
index ecd88357..30c1fe4c 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoPickerSearchCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/PhotoPickerSearchCell.java
@@ -10,6 +10,7 @@ package org.telegram.ui.Cells;
import android.content.Context;
import android.os.Build;
+import android.text.TextUtils;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.MotionEvent;
@@ -39,62 +40,57 @@ public class PhotoPickerSearchCell extends LinearLayout {
public SearchButton(Context context) {
super(context);
- setBackgroundColor(0xff292929);
+ setBackgroundColor(0xff1a1a1a);
selector = new View(context);
selector.setBackgroundResource(R.drawable.list_selector);
addView(selector);
FrameLayout.LayoutParams layoutParams1 = (FrameLayout.LayoutParams) selector.getLayoutParams();
- layoutParams1.width = FrameLayout.LayoutParams.MATCH_PARENT;
- layoutParams1.height = FrameLayout.LayoutParams.MATCH_PARENT;
+ layoutParams1.width = LayoutParams.MATCH_PARENT;
+ layoutParams1.height = LayoutParams.MATCH_PARENT;
selector.setLayoutParams(layoutParams1);
- LinearLayout linearLayout = new LinearLayout(context);
- linearLayout.setOrientation(HORIZONTAL);
- addView(linearLayout);
- layoutParams1 = (FrameLayout.LayoutParams) linearLayout.getLayoutParams();
- layoutParams1.width = FrameLayout.LayoutParams.WRAP_CONTENT;
- layoutParams1.height = FrameLayout.LayoutParams.MATCH_PARENT;
- layoutParams1.gravity = Gravity.CENTER;
- linearLayout.setLayoutParams(layoutParams1);
-
imageView = new ImageView(context);
- linearLayout.addView(imageView);
- LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) imageView.getLayoutParams();
- layoutParams.height = LinearLayout.LayoutParams.WRAP_CONTENT;
- layoutParams.width = LinearLayout.LayoutParams.WRAP_CONTENT;
+ imageView.setScaleType(ImageView.ScaleType.CENTER);
+ addView(imageView);
+ FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) imageView.getLayoutParams();
+ layoutParams.height = AndroidUtilities.dp(48);
+ layoutParams.width = AndroidUtilities.dp(48);
+ layoutParams1.gravity = Gravity.LEFT | Gravity.TOP;
imageView.setLayoutParams(layoutParams);
- FrameLayout frameLayout = new FrameLayout(context);
- frameLayout.setPadding(AndroidUtilities.dp(4), 0, 0, 0);
- linearLayout.addView(frameLayout);
- layoutParams = (LinearLayout.LayoutParams) frameLayout.getLayoutParams();
- layoutParams.height = LinearLayout.LayoutParams.MATCH_PARENT;
- layoutParams.width = LinearLayout.LayoutParams.WRAP_CONTENT;
- frameLayout.setLayoutParams(layoutParams);
-
textView1 = new TextView(context);
textView1.setGravity(Gravity.CENTER_VERTICAL);
- textView1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 13);
- textView1.setPadding(0, 0, AndroidUtilities.dp(8), 0);
+ textView1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
textView1.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
textView1.setTextColor(0xffffffff);
- frameLayout.addView(textView1);
+ textView1.setSingleLine(true);
+ textView1.setEllipsize(TextUtils.TruncateAt.END);
+ addView(textView1);
layoutParams1 = (FrameLayout.LayoutParams) textView1.getLayoutParams();
- layoutParams1.width = FrameLayout.LayoutParams.WRAP_CONTENT;
- layoutParams1.height = FrameLayout.LayoutParams.MATCH_PARENT;
+ layoutParams1.width = LayoutParams.MATCH_PARENT;
+ layoutParams1.height = LayoutParams.WRAP_CONTENT;
+ layoutParams1.gravity = Gravity.TOP | Gravity.LEFT;
+ layoutParams1.rightMargin = AndroidUtilities.dp(4);
+ layoutParams1.leftMargin = AndroidUtilities.dp(51);
+ layoutParams1.topMargin = AndroidUtilities.dp(8);
textView1.setLayoutParams(layoutParams1);
textView2 = new TextView(context);
textView2.setGravity(Gravity.CENTER_VERTICAL);
- textView2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 9);
- textView2.setPadding(0, AndroidUtilities.dp(24), AndroidUtilities.dp(8), 0);
+ textView2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 10);
textView2.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
- textView2.setTextColor(0xff464646);
- frameLayout.addView(textView2);
+ textView2.setTextColor(0xff666666);
+ textView2.setSingleLine(true);
+ textView2.setEllipsize(TextUtils.TruncateAt.END);
+ addView(textView2);
layoutParams1 = (FrameLayout.LayoutParams) textView2.getLayoutParams();
- layoutParams1.width = FrameLayout.LayoutParams.WRAP_CONTENT;
- layoutParams1.height = FrameLayout.LayoutParams.MATCH_PARENT;
+ layoutParams1.width = LayoutParams.MATCH_PARENT;
+ layoutParams1.height = LayoutParams.WRAP_CONTENT;
+ layoutParams1.gravity = Gravity.TOP | Gravity.LEFT;
+ layoutParams1.leftMargin = AndroidUtilities.dp(51);
+ layoutParams1.rightMargin = AndroidUtilities.dp(4);
+ layoutParams1.topMargin = AndroidUtilities.dp(26);
textView2.setLayoutParams(layoutParams1);
}
@@ -115,7 +111,8 @@ public class PhotoPickerSearchCell extends LinearLayout {
SearchButton searchButton = new SearchButton(context);
searchButton.textView1.setText(LocaleController.getString("SearchImages", R.string.SearchImages));
- searchButton.imageView.setImageResource(R.drawable.web_search);
+ searchButton.textView2.setText(LocaleController.getString("SearchImagesInfo", R.string.SearchImagesInfo));
+ searchButton.imageView.setImageResource(R.drawable.search_web);
addView(searchButton);
LayoutParams layoutParams = (LayoutParams) searchButton.getLayoutParams();
layoutParams.weight = 0.5f;
@@ -144,7 +141,7 @@ public class PhotoPickerSearchCell extends LinearLayout {
searchButton = new SearchButton(context);
searchButton.textView1.setText(LocaleController.getString("SearchGifs", R.string.SearchGifs));
searchButton.textView2.setText("GIPHY");
- searchButton.imageView.setImageResource(R.drawable.gif_search);
+ searchButton.imageView.setImageResource(R.drawable.search_gif);
addView(searchButton);
layoutParams = (LayoutParams) searchButton.getLayoutParams();
layoutParams.weight = 0.5f;
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedDocumentCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedDocumentCell.java
index 2ddd7307..1938fea3 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedDocumentCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedDocumentCell.java
@@ -249,6 +249,12 @@ public class SharedDocumentCell extends FrameLayout implements MediaController.
}
}
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ MediaController.getInstance().removeLoadingFileObserver(this);
+ }
+
public void setChecked(boolean checked, boolean animated) {
if (checkBox.getVisibility() != VISIBLE) {
checkBox.setVisibility(VISIBLE);
@@ -262,30 +268,40 @@ public class SharedDocumentCell extends FrameLayout implements MediaController.
loaded = false;
loading = false;
- int idx = -1;
- String name = FileLoader.getDocumentFileName(document.messageOwner.media.document);
- placeholderImabeView.setVisibility(VISIBLE);
- extTextView.setVisibility(VISIBLE);
- placeholderImabeView.setImageResource(getThumbForNameOrMime(name, document.messageOwner.media.document.mime_type));
- nameTextView.setText(name);
- extTextView.setText((idx = name.lastIndexOf(".")) == -1 ? "" : name.substring(idx + 1).toLowerCase());
- if (document.messageOwner.media.document.thumb instanceof TLRPC.TL_photoSizeEmpty) {
+ if (document != null && document.messageOwner.media != null) {
+ int idx = -1;
+ String name = FileLoader.getDocumentFileName(document.messageOwner.media.document);
+ placeholderImabeView.setVisibility(VISIBLE);
+ extTextView.setVisibility(VISIBLE);
+ placeholderImabeView.setImageResource(getThumbForNameOrMime(name, document.messageOwner.media.document.mime_type));
+ nameTextView.setText(name);
+ extTextView.setText((idx = name.lastIndexOf(".")) == -1 ? "" : name.substring(idx + 1).toLowerCase());
+ if (document.messageOwner.media.document.thumb instanceof TLRPC.TL_photoSizeEmpty) {
+ thumbImageView.setVisibility(GONE);
+ thumbImageView.setImageBitmap(null);
+ } else {
+ thumbImageView.setVisibility(VISIBLE);
+ thumbImageView.setImage(document.messageOwner.media.document.thumb.location, "40_40", (Drawable) null);
+ }
+ long date = (long) document.messageOwner.date * 1000;
+ dateTextView.setText(String.format("%s, %s", Utilities.formatFileSize(document.messageOwner.media.document.size), LocaleController.formatString("formatDateAtTime", R.string.formatDateAtTime, LocaleController.formatterYear.format(new Date(date)), LocaleController.formatterDay.format(new Date(date)))));
+ } else {
+ nameTextView.setText("");
+ extTextView.setText("");
+ dateTextView.setText("");
+ placeholderImabeView.setVisibility(VISIBLE);
+ extTextView.setVisibility(VISIBLE);
thumbImageView.setVisibility(GONE);
thumbImageView.setImageBitmap(null);
- } else {
- thumbImageView.setVisibility(VISIBLE);
- thumbImageView.setImage(document.messageOwner.media.document.thumb.location, "40_40", (Drawable) null);
}
- long date = (long) document.messageOwner.date * 1000;
- dateTextView.setText(String.format("%s, %s", Utilities.formatFileSize(document.messageOwner.media.document.size), LocaleController.formatString("formatDateAtTime", R.string.formatDateAtTime, LocaleController.formatterYear.format(new Date(date)), LocaleController.formatterDay.format(new Date(date)))));
+
setWillNotDraw(!needDivider);
progressView.setProgress(0, false);
-
updateFileExistIcon();
}
public void updateFileExistIcon() {
- if (message != null) {
+ if (message != null && message.messageOwner.media != null) {
String fileName = null;
File cacheFile = null;
if (message.messageOwner.attachPath == null || message.messageOwner.attachPath.length() == 0 || !(new File(message.messageOwner.attachPath).exists())) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedMediaSectionCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedMediaSectionCell.java
new file mode 100644
index 00000000..4b7d29c5
--- /dev/null
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedMediaSectionCell.java
@@ -0,0 +1,50 @@
+/*
+ * This is the source code of Telegram for Android v. 2.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-2015.
+ */
+
+package org.telegram.ui.Cells;
+
+import android.content.Context;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import org.telegram.android.AndroidUtilities;
+import org.telegram.android.LocaleController;
+
+public class SharedMediaSectionCell extends FrameLayout {
+
+ private TextView textView;
+
+ public SharedMediaSectionCell(Context context) {
+ super(context);
+
+ textView = new TextView(getContext());
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+ textView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
+ textView.setTextColor(0xff222222);
+ textView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL);
+ addView(textView);
+ FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams)textView.getLayoutParams();
+ layoutParams.width = FrameLayout.LayoutParams.MATCH_PARENT;
+ layoutParams.height = FrameLayout.LayoutParams.MATCH_PARENT;
+ layoutParams.leftMargin = AndroidUtilities.dp(13);
+ layoutParams.rightMargin = AndroidUtilities.dp(13);
+ layoutParams.gravity = LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT;
+ textView.setLayoutParams(layoutParams);
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(40), MeasureSpec.EXACTLY));
+ }
+
+ public void setText(String text) {
+ textView.setText(text);
+ }
+}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedPhotoVideoCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedPhotoVideoCell.java
new file mode 100644
index 00000000..90f3d4f5
--- /dev/null
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedPhotoVideoCell.java
@@ -0,0 +1,255 @@
+/*
+ * This is the source code of Telegram for Android v. 2.0.x.
+ * It is licensed under GNU GPL v. 2 or later.
+ * You should have received a copy of the license in this archive (see LICENSE).
+ *
+ * Copyright Nikolai Kudashov, 2013-2014.
+ */
+
+package org.telegram.ui.Cells;
+
+import android.content.Context;
+import android.os.Build;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.telegram.android.AndroidUtilities;
+import org.telegram.android.MessageObject;
+import org.telegram.messenger.ApplicationLoader;
+import org.telegram.messenger.FileLoader;
+import org.telegram.messenger.R;
+import org.telegram.messenger.TLRPC;
+import org.telegram.ui.Components.BackupImageView;
+import org.telegram.ui.Components.CheckBox;
+import org.telegram.ui.Components.FrameLayoutFixed;
+import org.telegram.ui.PhotoViewer;
+
+public class SharedPhotoVideoCell extends FrameLayoutFixed {
+
+ private PhotoVideoView[] photoVideoViews;
+ private MessageObject[] messageObjects;
+ private int[] indeces;
+ private SharedPhotoVideoCellDelegate delegate;
+ private int itemsCount;
+ private boolean isFirst;
+
+ public static interface SharedPhotoVideoCellDelegate {
+ public abstract void didClickItem(SharedPhotoVideoCell cell, int index, MessageObject messageObject, int a);
+ public abstract boolean didLongClickItem(SharedPhotoVideoCell cell, int index, MessageObject messageObject, int a);
+ }
+
+ private class PhotoVideoView extends FrameLayoutFixed {
+
+ private BackupImageView imageView;
+ private TextView videoTextView;
+ private LinearLayout videoInfoContainer;
+ private View selector;
+ private CheckBox checkBox;
+
+ public PhotoVideoView(Context context) {
+ super(context);
+
+ imageView = new BackupImageView(context);
+ imageView.imageReceiver.setNeedsQualityThumb(true);
+ imageView.imageReceiver.setShouldGenerateQualityThumb(true);
+ addView(imageView);
+ LayoutParams layoutParams = (LayoutParams) imageView.getLayoutParams();
+ layoutParams.width = LayoutParams.MATCH_PARENT;
+ layoutParams.height = LayoutParams.MATCH_PARENT;
+ imageView.setLayoutParams(layoutParams);
+
+ videoInfoContainer = new LinearLayout(context);
+ videoInfoContainer.setOrientation(LinearLayout.HORIZONTAL);
+ videoInfoContainer.setBackgroundResource(R.drawable.phototime);
+ videoInfoContainer.setPadding(AndroidUtilities.dp(3), 0, AndroidUtilities.dp(3), 0);
+ videoInfoContainer.setGravity(Gravity.CENTER_VERTICAL);
+ addView(videoInfoContainer);
+ layoutParams = (LayoutParams) videoInfoContainer.getLayoutParams();
+ layoutParams.width = LayoutParams.MATCH_PARENT;
+ layoutParams.height = AndroidUtilities.dp(16);
+ layoutParams.gravity = Gravity.BOTTOM | Gravity.LEFT;
+ videoInfoContainer.setLayoutParams(layoutParams);
+
+ ImageView imageView1 = new ImageView(context);
+ imageView1.setImageResource(R.drawable.ic_video);
+ videoInfoContainer.addView(imageView1);
+ LinearLayout.LayoutParams layoutParams1 = (LinearLayout.LayoutParams) imageView1.getLayoutParams();
+ layoutParams1.width = LinearLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams1.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+ imageView1.setLayoutParams(layoutParams1);
+
+ videoTextView = new TextView(context);
+ videoTextView.setTextColor(0xffffffff);
+ videoTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 12);
+ videoTextView.setGravity(Gravity.CENTER_VERTICAL);
+ videoInfoContainer.addView(videoTextView);
+ layoutParams1 = (LinearLayout.LayoutParams) videoTextView.getLayoutParams();
+ layoutParams1.width = LinearLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams1.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams1.leftMargin = AndroidUtilities.dp(4);
+ layoutParams1.gravity = Gravity.CENTER_VERTICAL;
+ layoutParams1.bottomMargin = AndroidUtilities.dp(1);
+ videoTextView.setLayoutParams(layoutParams1);
+
+ selector = new View(context);
+ selector.setBackgroundResource(R.drawable.list_selector);
+ addView(selector);
+ layoutParams = (LayoutParams) selector.getLayoutParams();
+ layoutParams.width = LayoutParams.MATCH_PARENT;
+ layoutParams.height = LayoutParams.MATCH_PARENT;
+ selector.setLayoutParams(layoutParams);
+
+ checkBox = new CheckBox(context, R.drawable.round_check2);
+ checkBox.setVisibility(GONE);
+ addView(checkBox);
+ layoutParams = (LayoutParams) checkBox.getLayoutParams();
+ layoutParams.width = AndroidUtilities.dp(22);
+ layoutParams.height = AndroidUtilities.dp(22);
+ layoutParams.gravity = Gravity.RIGHT | Gravity.TOP;
+ layoutParams.topMargin = AndroidUtilities.dp(6);
+ layoutParams.rightMargin = AndroidUtilities.dp(6);
+ checkBox.setLayoutParams(layoutParams);
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ if (Build.VERSION.SDK_INT >= 21) {
+ selector.drawableHotspotChanged(event.getX(), event.getY());
+ }
+ return super.onTouchEvent(event);
+ }
+ }
+
+ public SharedPhotoVideoCell(Context context) {
+ super(context);
+
+ messageObjects = new MessageObject[6];
+ photoVideoViews = new PhotoVideoView[6];
+ indeces = new int[6];
+ for (int a = 0; a < 6; a++) {
+ photoVideoViews[a] = new PhotoVideoView(context);
+ addView(photoVideoViews[a]);
+ photoVideoViews[a].setVisibility(GONE);
+ photoVideoViews[a].setTag(a);
+ photoVideoViews[a].setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (delegate != null) {
+ int a = (Integer) v.getTag();
+ delegate.didClickItem(SharedPhotoVideoCell.this, indeces[a], messageObjects[a], a);
+ }
+ }
+ });
+ photoVideoViews[a].setOnLongClickListener(new OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View v) {
+ if (delegate != null) {
+ int a = (Integer) v.getTag();
+ return delegate.didLongClickItem(SharedPhotoVideoCell.this, indeces[a], messageObjects[a], a);
+ }
+ return false;
+ }
+ });
+ }
+ }
+
+ public void setDelegate(SharedPhotoVideoCellDelegate delegate) {
+ this.delegate = delegate;
+ }
+
+ public void setItemsCount(int count) {
+ for (int a = 0; a < photoVideoViews.length; a++) {
+ photoVideoViews[a].setVisibility(a < count ? VISIBLE : GONE);
+ }
+ itemsCount = count;
+ }
+
+ public BackupImageView getImageView(int a) {
+ if (a >= itemsCount) {
+ return null;
+ }
+ return photoVideoViews[a].imageView;
+ }
+
+ public MessageObject getMessageObject(int a) {
+ if (a >= itemsCount) {
+ return null;
+ }
+ return messageObjects[a];
+ }
+
+ public void setIsFirst(boolean first) {
+ isFirst = first;
+ }
+
+ public void setChecked(int a, boolean checked, boolean animated) {
+ if (photoVideoViews[a].checkBox.getVisibility() != VISIBLE) {
+ photoVideoViews[a].checkBox.setVisibility(VISIBLE);
+ }
+ photoVideoViews[a].checkBox.setChecked(checked, animated);
+ }
+
+ public void setItem(int a, int index, MessageObject messageObject) {
+ messageObjects[a] = messageObject;
+ indeces[a] = index;
+
+ if (messageObject != null) {
+ photoVideoViews[a].setVisibility(VISIBLE);
+
+ PhotoVideoView photoVideoView = photoVideoViews[a];
+ photoVideoView.imageView.imageReceiver.setParentMessageObject(messageObject);
+ photoVideoView.imageView.imageReceiver.setVisible(!PhotoViewer.getInstance().isShowingImage(messageObject), false);
+ if (messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaVideo && messageObject.messageOwner.media.video != null) {
+ photoVideoView.videoInfoContainer.setVisibility(VISIBLE);
+ int duration = messageObject.messageOwner.media.video.duration;
+ int minutes = duration / 60;
+ int seconds = duration - minutes * 60;
+ photoVideoView.videoTextView.setText(String.format("%d:%02d", minutes, seconds));
+ if (messageObject.messageOwner.media.video.thumb != null) {
+ TLRPC.FileLocation location = messageObject.messageOwner.media.video.thumb.location;
+ photoVideoView.imageView.setImage(null, null, null, ApplicationLoader.applicationContext.getResources().getDrawable(R.drawable.photo_placeholder_in), null, location, "b", 0);
+ } else {
+ photoVideoView.imageView.setImageResource(R.drawable.photo_placeholder_in);
+ }
+ } else if (messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaPhoto && messageObject.messageOwner.media.photo != null && !messageObject.photoThumbs.isEmpty()) {
+ photoVideoView.videoInfoContainer.setVisibility(GONE);
+ TLRPC.PhotoSize photoSize = FileLoader.getClosestPhotoSizeWithSize(messageObject.photoThumbs, 80);
+ photoVideoView.imageView.setImage(null, null, null, ApplicationLoader.applicationContext.getResources().getDrawable(R.drawable.photo_placeholder_in), null, photoSize.location, "b", 0);
+ } else {
+ photoVideoView.videoInfoContainer.setVisibility(GONE);
+ photoVideoView.imageView.setImageResource(R.drawable.photo_placeholder_in);
+ }
+ } else {
+ photoVideoViews[a].setVisibility(GONE);
+ messageObjects[a] = null;
+ }
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ int itemWidth;
+ if (AndroidUtilities.isTablet()) {
+ itemWidth = (AndroidUtilities.dp(490) - ((itemsCount + 1) * AndroidUtilities.dp(4))) / itemsCount;
+ } else {
+ itemWidth = (AndroidUtilities.displaySize.x - ((itemsCount + 1) * AndroidUtilities.dp(4))) / itemsCount;
+ }
+
+ for (int a = 0; a < itemsCount; a++) {
+ LayoutParams layoutParams = (LayoutParams) photoVideoViews[a].getLayoutParams();
+ layoutParams.topMargin = isFirst ? 0 : AndroidUtilities.dp(4);
+ layoutParams.leftMargin = (itemWidth + AndroidUtilities.dp(4)) * a + AndroidUtilities.dp(4);
+ layoutParams.width = itemWidth;
+ layoutParams.height = itemWidth;
+ layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
+ photoVideoViews[a].setLayoutParams(layoutParams);
+ }
+
+ super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec((isFirst ? 0 : AndroidUtilities.dp(4)) + itemWidth, MeasureSpec.EXACTLY));
+ }
+}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextCell.java
index 0c05b6e5..c392bcb9 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextCell.java
@@ -48,7 +48,8 @@ public class TextCell extends FrameLayout {
textView.setLayoutParams(layoutParams);
valueTextView = new TextView(context);
- valueTextView.setTextColor(0xff2f8cc9);
+ //valueTextView.setTextColor(0xff2f8cc9);
+ valueTextView.setTextColor(AndroidUtilities.getIntColor("themeColor"));
valueTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
valueTextView.setLines(1);
valueTextView.setMaxLines(1);
@@ -95,6 +96,10 @@ public class TextCell extends FrameLayout {
textView.setTextColor(color);
}
+ public void setTextSize(int size) {
+ textView.setTextSize(size);
+ }
+
public void setText(String text) {
textView.setText(text);
imageView.setVisibility(GONE);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSettingsCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSettingsCell.java
index e6c0414c..c2be7360 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSettingsCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSettingsCell.java
@@ -56,7 +56,10 @@ public class TextSettingsCell extends FrameLayout {
textView.setLayoutParams(layoutParams);
valueTextView = new TextView(context);
- valueTextView.setTextColor(0xff2f8cc9);
+ //valueTextView.setTextColor(0xff2f8cc9);
+ //
+ valueTextView.setTextColor(AndroidUtilities.getIntColor("themeColor"));
+ //
valueTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
valueTextView.setLines(1);
valueTextView.setMaxLines(1);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java
index c5bda382..7136d2c3 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell.java
@@ -48,7 +48,9 @@ public class UserCell extends FrameLayout {
private TLRPC.FileLocation lastAvatar = null;
private int statusColor = 0xffa8a8a8;
- private int statusOnlineColor = 0xff3b84c0;
+ private int statusOnlineColor = AndroidUtilities.getIntDarkerColor("themeColor",0x15);//0xff3b84c0;
+
+ private int nameColor = 0xff000000;
public UserCell(Context context, int padding) {
super(context);
@@ -67,6 +69,7 @@ public class UserCell extends FrameLayout {
avatarDrawable = new AvatarDrawable();
nameTextView = new TextView(context);
+ //ContactsNamesColor
nameTextView.setTextColor(0xff212121);
nameTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 17);
nameTextView.setLines(1);
@@ -165,6 +168,10 @@ public class UserCell extends FrameLayout {
statusOnlineColor = onlineColor;
}
+ public void setNameColor(int color) {
+ nameColor = color;
+ }
+
public void update(int mask) {
if (currentUser == null) {
return;
@@ -214,6 +221,8 @@ public class UserCell extends FrameLayout {
nameTextView.setText(currentName);
} else {
nameTextView.setText(ContactsController.formatName(currentUser.first_name, currentUser.last_name));
+ nameTextView.setTextColor(nameColor);
+ nameTextView.setTextSize(AndroidUtilities.getIntDef("contactsNameSize", 17));
}
if (currrntStatus != null) {
statusTextView.setText(currrntStatus);
@@ -227,7 +236,7 @@ public class UserCell extends FrameLayout {
statusTextView.setTextColor(statusColor);
}
}
-
+ statusTextView.setTextSize(AndroidUtilities.getIntDef("contactsStatusSize", 14));
imageView.setVisibility(currentDrawable == 0 ? GONE : VISIBLE);
imageView.setImageResource(currentDrawable);
avatarImageView.setImage(photo, "50_50", avatarDrawable);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChangeChatNameActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChangeChatNameActivity.java
index ddecb6b5..5213e61c 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChangeChatNameActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChangeChatNameActivity.java
@@ -55,7 +55,7 @@ public class ChangeChatNameActivity extends BaseFragment {
}
@Override
- public View createView(LayoutInflater inflater, ViewGroup container) {
+ public View createView(LayoutInflater inflater) {
if (fragmentView == null) {
actionBar.setBackButtonImage(R.drawable.ic_ab_back);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChangeNameActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChangeNameActivity.java
index 666525aa..465b38ff 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChangeNameActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChangeNameActivity.java
@@ -48,7 +48,7 @@ public class ChangeNameActivity extends BaseFragment {
private final static int done_button = 1;
@Override
- public View createView(LayoutInflater inflater, ViewGroup container) {
+ public View createView(LayoutInflater inflater) {
if (fragmentView == null) {
actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBar.setAllowOverlayTitle(true);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChangePhoneActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChangePhoneActivity.java
index d0dc19b2..9a1bdcd5 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChangePhoneActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChangePhoneActivity.java
@@ -101,7 +101,7 @@ public class ChangePhoneActivity extends BaseFragment {
}
@Override
- public View createView(LayoutInflater inflater, ViewGroup container) {
+ public View createView(LayoutInflater inflater) {
if (fragmentView == null) {
actionBar.setTitle(LocaleController.getString("AppName", R.string.AppName));
actionBar.setBackButtonImage(R.drawable.ic_ab_back);
@@ -289,9 +289,9 @@ public class ChangePhoneActivity extends BaseFragment {
private int countryState = 0;
- private ArrayList countriesArray = new ArrayList();
- private HashMap countriesMap = new HashMap();
- private HashMap codesMap = new HashMap();
+ private ArrayList countriesArray = new ArrayList<>();
+ private HashMap countriesMap = new HashMap<>();
+ private HashMap codesMap = new HashMap<>();
private boolean ignoreSelection = false;
private boolean ignoreOnTextChange = false;
@@ -533,7 +533,7 @@ public class ChangePhoneActivity extends BaseFragment {
layoutParams.gravity = Gravity.LEFT;
textView.setLayoutParams(layoutParams);
- HashMap languageMap = new HashMap();
+ HashMap languageMap = new HashMap<>();
try {
BufferedReader reader = new BufferedReader(new InputStreamReader(getResources().getAssets().open("countries.txt")));
String line;
@@ -544,6 +544,7 @@ public class ChangePhoneActivity extends BaseFragment {
codesMap.put(args[0], args[2]);
languageMap.put(args[1], args[2]);
}
+ reader.close();
} catch (Exception e) {
FileLog.e("tmessages", e);
}
@@ -815,7 +816,8 @@ public class ChangePhoneActivity extends BaseFragment {
TextView wrongNumber = new TextView(context);
wrongNumber.setGravity(Gravity.LEFT | Gravity.CENTER_HORIZONTAL);
- wrongNumber.setTextColor(0xff4d83b3);
+ //wrongNumber.setTextColor(0xff4d83b3);
+ wrongNumber.setTextColor(AndroidUtilities.getIntColor("themeColor"));
wrongNumber.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
wrongNumber.setLineSpacing(AndroidUtilities.dp(2), 1.0f);
wrongNumber.setPadding(0, AndroidUtilities.dp(24), 0, 0);
@@ -1013,7 +1015,7 @@ public class ChangePhoneActivity extends BaseFragment {
destroyCodeTimer();
UserConfig.setCurrentUser(user);
UserConfig.saveConfig(true);
- ArrayList users = new ArrayList();
+ ArrayList users = new ArrayList<>();
users.add(user);
MessagesStorage.getInstance().putUsersAndChats(users, null, true, true);
MessagesController.getInstance().putUser(user, false);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChangePhoneHelpActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChangePhoneHelpActivity.java
index e2c2b2cb..34b5d446 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChangePhoneHelpActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChangePhoneHelpActivity.java
@@ -35,7 +35,7 @@ import org.telegram.ui.ActionBar.BaseFragment;
public class ChangePhoneHelpActivity extends BaseFragment {
@Override
- public View createView(LayoutInflater inflater, ViewGroup container) {
+ public View createView(LayoutInflater inflater) {
if (fragmentView == null) {
actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBar.setAllowOverlayTitle(true);
@@ -118,7 +118,8 @@ public class ChangePhoneHelpActivity extends BaseFragment {
textView = new TextView(getParentActivity());
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 18);
textView.setGravity(Gravity.CENTER_HORIZONTAL);
- textView.setTextColor(0xff4d83b3);
+ //textView.setTextColor(0xff4d83b3);
+ textView.setTextColor(AndroidUtilities.getIntColor("themeColor"));
textView.setText(LocaleController.getString("PhoneNumberChange", R.string.PhoneNumberChange));
textView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
textView.setPadding(0, AndroidUtilities.dp(10), 0, AndroidUtilities.dp(10));
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChangeUsernameActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChangeUsernameActivity.java
index 42c81134..0f5d8429 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChangeUsernameActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChangeUsernameActivity.java
@@ -61,7 +61,7 @@ public class ChangeUsernameActivity extends BaseFragment {
private final static int done_button = 1;
@Override
- public View createView(LayoutInflater inflater, ViewGroup container) {
+ public View createView(LayoutInflater inflater) {
if (fragmentView == null) {
actionBar.setBackButtonImage(R.drawable.ic_ab_back);
actionBar.setAllowOverlayTitle(true);
@@ -205,14 +205,19 @@ public class ChangeUsernameActivity extends BaseFragment {
}
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
builder.setTitle(LocaleController.getString("AppName", R.string.AppName));
- if (error.equals("USERNAME_INVALID")) {
- builder.setMessage(LocaleController.getString("UsernameInvalid", R.string.UsernameInvalid));
- } else if (error.equals("USERNAME_OCCUPIED")) {
- builder.setMessage(LocaleController.getString("UsernameInUse", R.string.UsernameInUse));
- } else if (error.equals("USERNAMES_UNAVAILABLE")) {
- builder.setMessage(LocaleController.getString("FeatureUnavailable", R.string.FeatureUnavailable));
- } else {
- builder.setMessage(LocaleController.getString("ErrorOccurred", R.string.ErrorOccurred));
+ switch (error) {
+ case "USERNAME_INVALID":
+ builder.setMessage(LocaleController.getString("UsernameInvalid", R.string.UsernameInvalid));
+ break;
+ case "USERNAME_OCCUPIED":
+ builder.setMessage(LocaleController.getString("UsernameInUse", R.string.UsernameInUse));
+ break;
+ case "USERNAMES_UNAVAILABLE":
+ builder.setMessage(LocaleController.getString("FeatureUnavailable", R.string.FeatureUnavailable));
+ break;
+ default:
+ builder.setMessage(LocaleController.getString("ErrorOccurred", R.string.ErrorOccurred));
+ break;
}
builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), null);
showAlertDialog(builder);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
index 7b459010..1bbd3576 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -19,7 +19,7 @@ import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
+import android.media.ExifInterface;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -42,29 +42,36 @@ import android.widget.AdapterView;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
-import org.telegram.android.AndroidUtilities;
import org.telegram.PhoneFormat.PhoneFormat;
+import org.telegram.android.AndroidUtilities;
+import org.telegram.android.ContactsController;
+import org.telegram.android.ImageReceiver;
import org.telegram.android.LocaleController;
import org.telegram.android.MediaController;
+import org.telegram.android.MessageObject;
+import org.telegram.android.MessagesController;
import org.telegram.android.MessagesStorage;
+import org.telegram.android.NotificationCenter;
import org.telegram.android.NotificationsController;
import org.telegram.android.SecretChatHelper;
import org.telegram.android.SendMessagesHelper;
import org.telegram.messenger.ApplicationLoader;
-import org.telegram.messenger.FileLoader;
-import org.telegram.messenger.TLRPC;
-import org.telegram.android.ContactsController;
-import org.telegram.messenger.FileLog;
-import org.telegram.android.MessageObject;
import org.telegram.messenger.ConnectionsManager;
-import org.telegram.android.MessagesController;
-import org.telegram.android.NotificationCenter;
+import org.telegram.messenger.FileLoader;
+import org.telegram.messenger.FileLog;
import org.telegram.messenger.R;
+import org.telegram.messenger.TLRPC;
import org.telegram.messenger.UserConfig;
import org.telegram.messenger.Utilities;
+import org.telegram.ui.ActionBar.ActionBar;
+import org.telegram.ui.ActionBar.ActionBarMenu;
+import org.telegram.ui.ActionBar.ActionBarMenuItem;
+import org.telegram.ui.ActionBar.BaseFragment;
import org.telegram.ui.Adapters.BaseFragmentAdapter;
import org.telegram.ui.Adapters.StickersAdapter;
import org.telegram.ui.AnimationCompat.AnimatorListenerAdapterProxy;
@@ -77,14 +84,9 @@ import org.telegram.ui.Cells.ChatBaseCell;
import org.telegram.ui.Cells.ChatContactCell;
import org.telegram.ui.Cells.ChatMediaCell;
import org.telegram.ui.Cells.ChatMessageCell;
-import org.telegram.ui.ActionBar.ActionBar;
-import org.telegram.ui.ActionBar.ActionBarMenu;
-import org.telegram.ui.ActionBar.ActionBarMenuItem;
import org.telegram.ui.Components.AvatarDrawable;
import org.telegram.ui.Components.BackupImageView;
-import org.telegram.ui.ActionBar.BaseFragment;
import org.telegram.ui.Components.ChatActivityEnterView;
-import org.telegram.android.ImageReceiver;
import org.telegram.ui.Components.FrameLayoutFixed;
import org.telegram.ui.Components.LayoutListView;
import org.telegram.ui.Components.RecyclerListView;
@@ -107,8 +109,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private TLRPC.EncryptedChat currentEncryptedChat;
private boolean userBlocked = false;
- private View progressView;
- private View bottomOverlay;
+ private FrameLayout progressView;
+ private FrameLayout bottomOverlay;
private ChatAdapter chatAdapter;
private ChatActivityEnterView chatActivityEnterView;
private ImageView timeItem;
@@ -121,9 +123,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private LayoutListView chatListView;
private BackupImageView avatarImageView;
private TextView bottomOverlayChatText;
- private View bottomOverlayChat;
+ private FrameLayout bottomOverlayChat;
private TypingDotsDrawable typingDotsDrawable;
- private View emptyViewContainer;
+ private FrameLayout emptyViewContainer;
private ArrayList actionModeViews = new ArrayList<>();
private TextView nameTextView;
private TextView onlineTextView;
@@ -133,8 +135,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private TextView selectedMessagesCountTextView;
private RecyclerListView stickersListView;
private StickersAdapter stickersAdapter;
- private View stickersPanel;
+ private FrameLayout stickersPanel;
private TextView muteItem;
+ private ImageView pagedownButton;
private boolean allowStickersPanel;
private AnimatorSetProxy runningAnimation;
@@ -151,7 +154,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private boolean scrollToTopOnResume = false;
private boolean scrollToTopUnReadOnResume = false;
private boolean isCustomTheme = false;
- private View pagedownButton;
private long dialog_id;
private boolean isBroadcast = false;
private HashMap selectedMessagesIds = new HashMap<>();
@@ -215,6 +217,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private final static int delete_chat = 12;
private final static int share_contact = 13;
private final static int mute = 14;
+ private final static int attach_music = 15;
+
+ private final static int id_chat_compose_panel = 1000;
AdapterView.OnItemLongClickListener onItemLongClickListener = new AdapterView.OnItemLongClickListener() {
@Override
@@ -362,68 +367,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} else {
return false;
}
- chatActivityEnterView = new ChatActivityEnterView();
- chatActivityEnterView.setDialogId(dialog_id);
- chatActivityEnterView.setDelegate(new ChatActivityEnterView.ChatActivityEnterViewDelegate() {
- @Override
- public void onMessageSend() {
- chatListView.post(new Runnable() {
- @Override
- public void run() {
- chatListView.setSelectionFromTop(messages.size() - 1, -100000 - chatListView.getPaddingTop());
- }
- });
- }
- @Override
- public void onTextChanged(CharSequence text) {
- if (stickersAdapter != null) {
- stickersAdapter.loadStikersForEmoji(text);
- }
- }
-
- @Override
- public void needSendTyping() {
- MessagesController.getInstance().sendTyping(dialog_id, classGuid);
- }
-
- @Override
- public void onAttachButtonHidden() {
- if (attachItem != null) {
- attachItem.setVisibility(View.VISIBLE);
- }
- if (headerItem != null) {
- headerItem.setVisibility(View.INVISIBLE);
- }
- }
-
- @Override
- public void onAttachButtonShow() {
- if (attachItem != null) {
- attachItem.setVisibility(View.INVISIBLE);
- }
- if (headerItem != null) {
- headerItem.setVisibility(View.VISIBLE);
- }
- }
-
- @Override
- public void onWindowSizeChanged(int size) {
- if (size < AndroidUtilities.dp(72) + AndroidUtilities.getCurrentActionBarHeight()) {
- allowStickersPanel = false;
- if (stickersPanel.getVisibility() == View.VISIBLE) {
- stickersPanel.clearAnimation();
- stickersPanel.setVisibility(View.INVISIBLE);
- }
- } else {
- allowStickersPanel = true;
- if (stickersPanel.getVisibility() == View.INVISIBLE) {
- stickersPanel.clearAnimation();
- stickersPanel.setVisibility(View.VISIBLE);
- }
- }
- }
- });
NotificationCenter.getInstance().addObserver(this, NotificationCenter.messagesDidLoaded);
NotificationCenter.getInstance().addObserver(this, NotificationCenter.emojiDidLoaded);
NotificationCenter.getInstance().addObserver(this, NotificationCenter.updateInterfaces);
@@ -528,7 +472,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
MediaController.getInstance().stopAudio();
}
- public View createView(LayoutInflater inflater, ViewGroup container) {
+ @Override
+ public View createView(LayoutInflater inflater) {
if (fragmentView == null) {
lastPrintString = null;
lastStatus = null;
@@ -537,6 +482,33 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override
public void onItemClick(final int id) {
+ if (id == attach_photo || id == attach_gallery || id == attach_document || id == attach_video) {
+ String action = null;
+ if (currentChat != null) {
+ if (currentChat.participants_count > MessagesController.getInstance().groupBigSize) {
+ if (id == attach_photo || id == attach_gallery) {
+ action = "bigchat_upload_photo";
+ } else {
+ action = "bigchat_upload_document";
+ }
+ } else {
+ if (id == attach_photo || id == attach_gallery) {
+ action = "chat_upload_photo";
+ } else {
+ action = "chat_upload_document";
+ }
+ }
+ } else {
+ if (id == attach_photo || id == attach_gallery) {
+ action = "pm_upload_photo";
+ } else {
+ action = "pm_upload_document";
+ }
+ }
+ if (action != null && !MessagesController.isFeatureEnabled(action, ChatActivity.this)) {
+ return;
+ }
+ }
if (id == -1) {
finishFragment();
} else if (id == -2) {
@@ -557,7 +529,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
FileLog.e("tmessages", e);
}
} else if (id == attach_gallery) {
- PhotoAlbumPickerActivity fragment = new PhotoAlbumPickerActivity();
+ PhotoAlbumPickerActivity fragment = new PhotoAlbumPickerActivity(false);
fragment.setDelegate(new PhotoAlbumPickerActivity.PhotoAlbumPickerActivityDelegate() {
@Override
public void didSelectPhotos(ArrayList photos) {
@@ -586,23 +558,31 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
Intent pickIntent = new Intent();
pickIntent.setType("video/*");
pickIntent.setAction(Intent.ACTION_GET_CONTENT);
- pickIntent.putExtra(MediaStore.EXTRA_SIZE_LIMIT, (long) (1024 * 1024 * 1000));
+ pickIntent.putExtra(MediaStore.EXTRA_SIZE_LIMIT, (long) (1024 * 1024 * 1536));
Intent takeVideoIntent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
File video = Utilities.generateVideoPath();
if (video != null) {
if (Build.VERSION.SDK_INT >= 18) {
takeVideoIntent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(video));
}
- takeVideoIntent.putExtra(MediaStore.EXTRA_SIZE_LIMIT, (long) (1024 * 1024 * 1000));
+ takeVideoIntent.putExtra(MediaStore.EXTRA_SIZE_LIMIT, (long) (1024 * 1024 * 1536));
currentPicturePath = video.getAbsolutePath();
}
- Intent chooserIntent = Intent.createChooser(pickIntent, "");
+ Intent chooserIntent = Intent.createChooser(pickIntent, null);
chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[]{takeVideoIntent});
startActivityForResult(chooserIntent, 2);
} catch (Exception e) {
FileLog.e("tmessages", e);
}
+//PLUS
+ } else if (id == attach_music) {
+ try {
+ Intent pickIntent = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Audio.Media.EXTERNAL_CONTENT_URI);
+ startActivityForResult(pickIntent, 3);
+ } catch (Exception e) {
+ FileLog.e("tmessages", e);
+ }
} else if (id == attach_location) {
if (!isGoogleMapsInstalled()) {
return;
@@ -782,7 +762,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
CharSequence[] items = new CharSequence[]{
LocaleController.formatString("MuteFor", R.string.MuteFor, LocaleController.formatPluralString("Hours", 1)),
LocaleController.formatString("MuteFor", R.string.MuteFor, LocaleController.formatPluralString("Hours", 8)),
- LocaleController.formatString("MuteFor", R.string.MuteFor, LocaleController.formatPluralString("Days", 2))
+ LocaleController.formatString("MuteFor", R.string.MuteFor, LocaleController.formatPluralString("Days", 2)),
+ LocaleController.getString("MuteDisable", R.string.MuteDisable)
};
builder.setItems(items, new DialogInterface.OnClickListener() {
@Override
@@ -794,13 +775,21 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
untilTime += 60 * 60 * 8;
} else if (i == 2) {
untilTime += 60 * 60 * 48;
+ } else if (i == 3) {
+ untilTime = Integer.MAX_VALUE;
}
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit();
+ long flags = 0;
+ if (i == 3) {
+ editor.putInt("notify2_" + dialog_id, 2);
+ flags = 1;
+ } else {
editor.putInt("notify2_" + dialog_id, 3);
editor.putInt("notifyuntil_" + dialog_id, untilTime);
- long flags = ((long)untilTime << 32) | 1;
+ flags = ((long)untilTime << 32) | 1;
+ }
MessagesStorage.getInstance().setDialogFlags(dialog_id, flags);
editor.commit();
TLRPC.TL_dialog dialog = MessagesController.getInstance().dialogs_dict.get(dialog_id);
@@ -973,6 +962,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
attachItem = menu.addItem(chat_menu_attach, R.drawable.ic_ab_other);
attachItem.addSubItem(attach_photo, LocaleController.getString("ChatTakePhoto", R.string.ChatTakePhoto), R.drawable.ic_attach_photo);
attachItem.addSubItem(attach_gallery, LocaleController.getString("ChatGallery", R.string.ChatGallery), R.drawable.ic_attach_gallery);
+ attachItem.addSubItem(attach_music, LocaleController.getString("ChatMusic", R.string.ChatMusic), R.drawable.ic_attach_music);
attachItem.addSubItem(attach_video, LocaleController.getString("ChatVideo", R.string.ChatVideo), R.drawable.ic_attach_video);
attachItem.addSubItem(attach_document, LocaleController.getString("ChatDocument", R.string.ChatDocument), R.drawable.ic_ab_doc);
attachItem.addSubItem(attach_location, LocaleController.getString("ChatLocation", R.string.ChatLocation), R.drawable.ic_attach_location);
@@ -981,6 +971,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
menuItem = menu.addItem(chat_menu_attach, R.drawable.ic_ab_attach);
menuItem.addSubItem(attach_photo, LocaleController.getString("ChatTakePhoto", R.string.ChatTakePhoto), R.drawable.ic_attach_photo);
menuItem.addSubItem(attach_gallery, LocaleController.getString("ChatGallery", R.string.ChatGallery), R.drawable.ic_attach_gallery);
+ menuItem.addSubItem(attach_music, LocaleController.getString("ChatMusic", R.string.ChatMusic), R.drawable.ic_attach_music);
menuItem.addSubItem(attach_video, LocaleController.getString("ChatVideo", R.string.ChatVideo), R.drawable.ic_attach_video);
menuItem.addSubItem(attach_document, LocaleController.getString("ChatDocument", R.string.ChatDocument), R.drawable.ic_ab_doc);
menuItem.addSubItem(attach_location, LocaleController.getString("ChatLocation", R.string.ChatLocation), R.drawable.ic_attach_location);
@@ -1025,92 +1016,170 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
actionMode.getItem(copy).setVisibility(selectedMessagesCanCopyIds.size() != 0 ? View.VISIBLE : View.GONE);
checkActionBarMenu();
- fragmentView = inflater.inflate(R.layout.chat_layout, container, false);
+ fragmentView = new SizeNotifierRelativeLayout(getParentActivity());
+ SizeNotifierRelativeLayout contentView = (SizeNotifierRelativeLayout) fragmentView;
- View contentView = fragmentView.findViewById(R.id.chat_layout);
- TextView emptyView = (TextView) fragmentView.findViewById(R.id.searchEmptyView);
- emptyViewContainer = fragmentView.findViewById(R.id.empty_view);
+ contentView.setBackgroundImage(ApplicationLoader.getCachedWallpaper());
+ isCustomTheme = ApplicationLoader.isCustomTheme();
+
+ emptyViewContainer = new FrameLayout(getParentActivity());
+ emptyViewContainer.setPadding(0, 0, 0, AndroidUtilities.dp(48));
emptyViewContainer.setVisibility(View.INVISIBLE);
+ contentView.addView(emptyViewContainer);
+ RelativeLayout.LayoutParams layoutParams3 = (RelativeLayout.LayoutParams) emptyViewContainer.getLayoutParams();
+ layoutParams3.width = RelativeLayout.LayoutParams.MATCH_PARENT;
+ layoutParams3.height = RelativeLayout.LayoutParams.MATCH_PARENT;
+ emptyViewContainer.setLayoutParams(layoutParams3);
emptyViewContainer.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
return true;
}
});
+
+ if (currentEncryptedChat == null) {
+ TextView emptyView = new TextView(getParentActivity());
+ if (currentUser != null && currentUser.id != 777000 && (currentUser.id / 1000 == 333 || currentUser.id % 1000 == 0)) {
+ emptyView.setText(LocaleController.getString("GotAQuestion", R.string.GotAQuestion));
+ } else {
emptyView.setText(LocaleController.getString("NoMessages", R.string.NoMessages));
- chatListView = (LayoutListView)fragmentView.findViewById(R.id.chat_list_view);
- chatListView.setAdapter(chatAdapter = new ChatAdapter(getParentActivity()));
- bottomOverlay = fragmentView.findViewById(R.id.bottom_overlay);
- bottomOverlayText = (TextView)fragmentView.findViewById(R.id.bottom_overlay_text);
- bottomOverlayChat = fragmentView.findViewById(R.id.bottom_overlay_chat);
- progressView = fragmentView.findViewById(R.id.progressLayout);
- pagedownButton = fragmentView.findViewById(R.id.pagedown_button);
- pagedownButton.setVisibility(View.GONE);
-
- View progressViewInner = progressView.findViewById(R.id.progressLayoutInner);
-
- updateContactStatus();
-
- SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
- int selectedBackground = preferences.getInt("selectedBackground", 1000001);
- int selectedColor = preferences.getInt("selectedColor", 0);
- if (selectedColor != 0) {
- contentView.setBackgroundColor(selectedColor);
- chatListView.setCacheColorHint(selectedColor);
+ }
+ emptyView.setPadding(AndroidUtilities.dp(7), AndroidUtilities.dp(1), AndroidUtilities.dp(7), AndroidUtilities.dp(1));
+ emptyView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
+ emptyView.setGravity(Gravity.CENTER);
+ emptyView.setTextColor(0xffffffff);
+ emptyView.setBackgroundResource(isCustomTheme ? R.drawable.system_black : R.drawable.system_blue);
+ emptyViewContainer.addView(emptyView);
+ layoutParams2 = (FrameLayout.LayoutParams) emptyView.getLayoutParams();
+ layoutParams2.width = FrameLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams2.height = FrameLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams2.gravity = Gravity.CENTER;
+ emptyView.setLayoutParams(layoutParams2);
} else {
- chatListView.setCacheColorHint(0);
- try {
- if (ApplicationLoader.cachedWallpaper != null) {
- isCustomTheme = selectedBackground != 1000001;
- ((SizeNotifierRelativeLayout) contentView).setBackgroundImage(ApplicationLoader.cachedWallpaper);
+ LinearLayout secretChatPlaceholder = new LinearLayout(getParentActivity());
+ secretChatPlaceholder.setBackgroundResource(isCustomTheme ? R.drawable.system_black : R.drawable.system_blue);
+ secretChatPlaceholder.setPadding(AndroidUtilities.dp(16), AndroidUtilities.dp(12), AndroidUtilities.dp(16), AndroidUtilities.dp(12));
+ secretChatPlaceholder.setOrientation(LinearLayout.VERTICAL);
+ emptyViewContainer.addView(secretChatPlaceholder);
+ layoutParams2 = (FrameLayout.LayoutParams) secretChatPlaceholder.getLayoutParams();
+ layoutParams2.width = FrameLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams2.height = FrameLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams2.gravity = Gravity.CENTER;
+ secretChatPlaceholder.setLayoutParams(layoutParams2);
+
+ secretViewStatusTextView = new TextView(getParentActivity());
+ secretViewStatusTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
+ secretViewStatusTextView.setTextColor(0xffffffff);
+ secretViewStatusTextView.setGravity(Gravity.CENTER_HORIZONTAL);
+ secretViewStatusTextView.setMaxWidth(AndroidUtilities.dp(210));
+ if (currentEncryptedChat.admin_id == UserConfig.getClientUserId()) {
+ if (currentUser.first_name.length() > 0) {
+ secretViewStatusTextView.setText(LocaleController.formatString("EncryptedPlaceholderTitleOutgoing", R.string.EncryptedPlaceholderTitleOutgoing, currentUser.first_name));
} else {
- if (selectedBackground == 1000001) {
- ((SizeNotifierRelativeLayout) contentView).setBackgroundImage(R.drawable.background_hd);
- ApplicationLoader.cachedWallpaper = ((SizeNotifierRelativeLayout) contentView).getBackgroundImage();
- } else {
- File toFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper.jpg");
- if (toFile.exists()) {
- Drawable drawable = Drawable.createFromPath(toFile.getAbsolutePath());
- if (drawable != null) {
- ((SizeNotifierRelativeLayout) contentView).setBackgroundImage(drawable);
- ApplicationLoader.cachedWallpaper = drawable;
- } else {
- contentView.setBackgroundColor(-2693905);
- chatListView.setCacheColorHint(-2693905);
- }
- isCustomTheme = true;
- } else {
- ((SizeNotifierRelativeLayout) contentView).setBackgroundImage(R.drawable.background_hd);
- ApplicationLoader.cachedWallpaper = ((SizeNotifierRelativeLayout) contentView).getBackgroundImage();
- isCustomTheme = false;
- }
- }
+ secretViewStatusTextView.setText(LocaleController.formatString("EncryptedPlaceholderTitleOutgoing", R.string.EncryptedPlaceholderTitleOutgoing, currentUser.last_name));
}
- } catch (Throwable e) {
- contentView.setBackgroundColor(-2693905);
- chatListView.setCacheColorHint(-2693905);
- FileLog.e("tmessages", e);
+ } else {
+ if (currentUser.first_name.length() > 0) {
+ secretViewStatusTextView.setText(LocaleController.formatString("EncryptedPlaceholderTitleIncoming", R.string.EncryptedPlaceholderTitleIncoming, currentUser.first_name));
+ } else {
+ secretViewStatusTextView.setText(LocaleController.formatString("EncryptedPlaceholderTitleIncoming", R.string.EncryptedPlaceholderTitleIncoming, currentUser.last_name));
+ }
+ }
+ secretChatPlaceholder.addView(secretViewStatusTextView);
+ layoutParams = (LinearLayout.LayoutParams) secretViewStatusTextView.getLayoutParams();
+ layoutParams.width = LinearLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams.gravity = Gravity.CENTER_HORIZONTAL;
+ secretViewStatusTextView.setLayoutParams(layoutParams);
+
+ TextView textView = new TextView(getParentActivity());
+ textView.setText(LocaleController.getString("EncryptedDescriptionTitle", R.string.EncryptedDescriptionTitle));
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
+ textView.setTextColor(0xffffffff);
+ textView.setGravity(Gravity.CENTER_HORIZONTAL);
+ textView.setMaxWidth(AndroidUtilities.dp(260));
+ secretChatPlaceholder.addView(textView);
+ layoutParams = (LinearLayout.LayoutParams) textView.getLayoutParams();
+ layoutParams.width = LinearLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams.topMargin = AndroidUtilities.dp(8);
+ layoutParams.gravity = LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT;
+ textView.setLayoutParams(layoutParams);
+
+ for (int a = 0; a < 4; a++) {
+ LinearLayout linearLayout = new LinearLayout(getParentActivity());
+ linearLayout.setOrientation(LinearLayout.HORIZONTAL);
+ secretChatPlaceholder.addView(linearLayout);
+ layoutParams = (LinearLayout.LayoutParams) linearLayout.getLayoutParams();
+ layoutParams.width = LinearLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams.topMargin = AndroidUtilities.dp(8);
+ layoutParams.gravity = LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT;
+ linearLayout.setLayoutParams(layoutParams);
+
+ ImageView imageView = new ImageView(getParentActivity());
+ imageView.setImageResource(R.drawable.ic_lock_white);
+
+ textView = new TextView(getParentActivity());
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
+ textView.setTextColor(0xffffffff);
+ textView.setGravity(Gravity.CENTER_VERTICAL | (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT));
+ textView.setMaxWidth(AndroidUtilities.dp(260));
+
+ switch (a) {
+ case 0:
+ textView.setText(LocaleController.getString("EncryptedDescription1", R.string.EncryptedDescription1));
+ break;
+ case 1:
+ textView.setText(LocaleController.getString("EncryptedDescription2", R.string.EncryptedDescription2));
+ break;
+ case 2:
+ textView.setText(LocaleController.getString("EncryptedDescription3", R.string.EncryptedDescription3));
+ break;
+ case 3:
+ textView.setText(LocaleController.getString("EncryptedDescription4", R.string.EncryptedDescription4));
+ break;
+ }
+
+ if (LocaleController.isRTL) {
+ linearLayout.addView(textView);
+ linearLayout.addView(imageView);
+ } else {
+ linearLayout.addView(imageView);
+ linearLayout.addView(textView);
+ }
+ layoutParams = (LinearLayout.LayoutParams) imageView.getLayoutParams();
+ layoutParams.width = LinearLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams.rightMargin = LocaleController.isRTL ? 0 : AndroidUtilities.dp(8);
+ layoutParams.leftMargin = LocaleController.isRTL ? AndroidUtilities.dp(8) : 0;
+ layoutParams.topMargin = AndroidUtilities.dp(LocaleController.isRTL ? 3 : 4);
+ imageView.setLayoutParams(layoutParams);
+
+ layoutParams = (LinearLayout.LayoutParams) textView.getLayoutParams();
+ layoutParams.width = LinearLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+ textView.setLayoutParams(layoutParams);
}
}
- if (isCustomTheme) {
- progressViewInner.setBackgroundResource(R.drawable.system_loader2);
- emptyView.setBackgroundResource(R.drawable.system_black);
- } else {
- progressViewInner.setBackgroundResource(R.drawable.system_loader1);
- emptyView.setBackgroundResource(R.drawable.system_blue);
- }
- emptyView.setPadding(AndroidUtilities.dp(7), AndroidUtilities.dp(1), AndroidUtilities.dp(7), AndroidUtilities.dp(1));
-
- if (currentUser != null && (currentUser.id / 1000 == 333 || currentUser.id % 1000 == 0)) {
- emptyView.setText(LocaleController.getString("GotAQuestion", R.string.GotAQuestion));
- }
-
+ chatListView = new LayoutListView(getParentActivity());
+ chatListView.setAdapter(chatAdapter = new ChatAdapter(getParentActivity()));
+ chatListView.setCacheColorHint(ApplicationLoader.getSelectedColor());
+ chatListView.setClipToPadding(false);
+ chatListView.setStackFromBottom(true);
+ chatListView.setPadding(0, AndroidUtilities.dp(4), 0, AndroidUtilities.dp(3));
+ chatListView.setDivider(null);
+ chatListView.setSelector(R.drawable.transparent);
chatListView.setOnItemLongClickListener(onItemLongClickListener);
chatListView.setOnItemClickListener(onItemClickListener);
-
- final Rect scrollRect = new Rect();
-
+ contentView.addView(chatListView);
+ layoutParams3 = (RelativeLayout.LayoutParams) chatListView.getLayoutParams();
+ layoutParams3.width = RelativeLayout.LayoutParams.MATCH_PARENT;
+ layoutParams3.height = RelativeLayout.LayoutParams.MATCH_PARENT;
+ layoutParams3.bottomMargin = -AndroidUtilities.dp(3);
+ layoutParams3.addRule(RelativeLayout.ABOVE, id_chat_compose_panel);
+ chatListView.setLayoutParams(layoutParams3);
chatListView.setOnInterceptTouchEventListener(new LayoutListView.OnInterceptTouchEventListener() {
@Override
public boolean onInterceptTouchEvent(MotionEvent event) {
@@ -1169,7 +1238,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
return false;
}
});
-
chatListView.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
@@ -1220,8 +1288,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
return false;
}
});
-
chatListView.setOnScrollListener(new AbsListView.OnScrollListener() {
+ Rect scrollRect = new Rect();
+
@Override
public void onScrollStateChanged(AbsListView absListView, int i) {
if (i == AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL || i == AbsListView.OnScrollListener.SCROLL_STATE_FLING && highlightMessageId != Integer.MAX_VALUE) {
@@ -1264,22 +1333,133 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
});
- stickersListView = (RecyclerListView) fragmentView.findViewById(R.id.stickers_listview);
+ progressView = new FrameLayout(getParentActivity());
+ progressView.setVisibility(View.INVISIBLE);
+ progressView.setBackgroundResource(isCustomTheme ? R.drawable.system_loader2 : R.drawable.system_loader1);
+ contentView.addView(progressView);
+ layoutParams3 = (RelativeLayout.LayoutParams) progressView.getLayoutParams();
+ layoutParams3.width = AndroidUtilities.dp(36);
+ layoutParams3.height = AndroidUtilities.dp(36);
+ layoutParams3.bottomMargin = AndroidUtilities.dp(48);
+ layoutParams3.addRule(RelativeLayout.CENTER_IN_PARENT);
+ progressView.setLayoutParams(layoutParams3);
+
+ ProgressBar progressBar = new ProgressBar(getParentActivity());
+ try {
+ progressBar.setIndeterminateDrawable(getParentActivity().getResources().getDrawable(R.drawable.loading_animation));
+ } catch (Exception e) {
+ //don't promt
+ }
+ progressBar.setIndeterminate(true);
+ AndroidUtilities.setProgressBarAnimationDuration(progressBar, 1500);
+ progressView.addView(progressBar);
+ layoutParams2 = (FrameLayout.LayoutParams) progressBar.getLayoutParams();
+ layoutParams2.width = AndroidUtilities.dp(32);
+ layoutParams2.height = AndroidUtilities.dp(32);
+ layoutParams2.gravity = Gravity.CENTER;
+ progressBar.setLayoutParams(layoutParams2);
+
+ if (chatActivityEnterView != null) {
+ chatActivityEnterView.onDestroy();
+ }
+ chatActivityEnterView = new ChatActivityEnterView(getParentActivity(), contentView, this, true);
+ chatActivityEnterView.setDialogId(dialog_id);
+ chatActivityEnterView.addToAttachLayout(menuItem);
+ chatActivityEnterView.setId(id_chat_compose_panel);
+ contentView.addView(chatActivityEnterView);
+ layoutParams3 = (RelativeLayout.LayoutParams) chatActivityEnterView.getLayoutParams();
+ layoutParams3.width = RelativeLayout.LayoutParams.MATCH_PARENT;
+ layoutParams3.height = RelativeLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams3.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
+ chatActivityEnterView.setLayoutParams(layoutParams3);
+ chatActivityEnterView.setDelegate(new ChatActivityEnterView.ChatActivityEnterViewDelegate() {
+ @Override
+ public void onMessageSend() {
+ chatListView.post(new Runnable() {
+ @Override
+ public void run() {
+ chatListView.setSelectionFromTop(messages.size() - 1, -100000 - chatListView.getPaddingTop());
+ }
+ });
+ }
+
+ @Override
+ public void onTextChanged(CharSequence text) {
+ if (stickersAdapter != null) {
+ stickersAdapter.loadStikersForEmoji(text);
+ }
+ }
+
+ @Override
+ public void needSendTyping() {
+ MessagesController.getInstance().sendTyping(dialog_id, classGuid);
+ }
+
+ @Override
+ public void onAttachButtonHidden() {
+ if (attachItem != null) {
+ attachItem.setVisibility(View.VISIBLE);
+ }
+ if (headerItem != null) {
+ headerItem.setVisibility(View.INVISIBLE);
+ }
+ }
+
+ @Override
+ public void onAttachButtonShow() {
+ if (attachItem != null) {
+ attachItem.setVisibility(View.INVISIBLE);
+ }
+ if (headerItem != null) {
+ headerItem.setVisibility(View.VISIBLE);
+ }
+ }
+
+ @Override
+ public void onWindowSizeChanged(int size) {
+ if (size < AndroidUtilities.dp(72) + AndroidUtilities.getCurrentActionBarHeight()) {
+ allowStickersPanel = false;
+ if (stickersPanel.getVisibility() == View.VISIBLE) {
+ stickersPanel.clearAnimation();
+ stickersPanel.setVisibility(View.INVISIBLE);
+ }
+ } else {
+ allowStickersPanel = true;
+ if (stickersPanel.getVisibility() == View.INVISIBLE) {
+ stickersPanel.clearAnimation();
+ stickersPanel.setVisibility(View.VISIBLE);
+ }
+ }
+ }
+ });
+
+ stickersPanel = new FrameLayout(getParentActivity());
+ stickersPanel.setVisibility(View.GONE);
+ contentView.addView(stickersPanel);
+ layoutParams3 = (RelativeLayout.LayoutParams) stickersPanel.getLayoutParams();
+ layoutParams3.width = RelativeLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams3.height = AndroidUtilities.dp(81.5f);
+ layoutParams3.bottomMargin = AndroidUtilities.dp(38);
+ layoutParams3.addRule(RelativeLayout.ALIGN_BOTTOM, id_chat_compose_panel);
+ stickersPanel.setLayoutParams(layoutParams3);
+
+ stickersListView = new RecyclerListView(getParentActivity());
LinearLayoutManager layoutManager = new LinearLayoutManager(getParentActivity());
layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
stickersListView.setLayoutManager(layoutManager);
- stickersPanel = fragmentView.findViewById(R.id.stickers_panel);
- stickersPanel.setVisibility(View.GONE);
stickersListView.setClipToPadding(false);
if (Build.VERSION.SDK_INT >= 9) {
stickersListView.setOverScrollMode(RecyclerListView.OVER_SCROLL_NEVER);
}
-
+ stickersPanel.addView(stickersListView);
+ layoutParams2 = (FrameLayout.LayoutParams) stickersListView.getLayoutParams();
+ layoutParams2.width = FrameLayout.LayoutParams.MATCH_PARENT;
+ layoutParams2.height = AndroidUtilities.dp(78);
+ stickersListView.setLayoutParams(layoutParams2);
+ if (currentEncryptedChat == null || currentEncryptedChat != null && AndroidUtilities.getPeerLayerVersion(currentEncryptedChat.layer) >= 23) {
if (stickersAdapter != null) {
stickersAdapter.destroy();
}
-
- if (currentEncryptedChat == null || currentEncryptedChat != null && AndroidUtilities.getPeerLayerVersion(currentEncryptedChat.layer) >= 23) {
stickersListView.setPadding(AndroidUtilities.dp(18), 0, AndroidUtilities.dp(18), 0);
stickersListView.setAdapter(stickersAdapter = new StickersAdapter(getParentActivity(), new StickersAdapter.StickersAdapterDelegate() {
@Override
@@ -1363,33 +1543,48 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}));
}
- bottomOverlayChatText = (TextView)fragmentView.findViewById(R.id.bottom_overlay_chat_text);
- TextView textView = (TextView)fragmentView.findViewById(R.id.secret_title);
- textView.setText(LocaleController.getString("EncryptedDescriptionTitle", R.string.EncryptedDescriptionTitle));
- textView = (TextView)fragmentView.findViewById(R.id.secret_description1);
- textView.setText(LocaleController.getString("EncryptedDescription1", R.string.EncryptedDescription1));
- textView = (TextView)fragmentView.findViewById(R.id.secret_description2);
- textView.setText(LocaleController.getString("EncryptedDescription2", R.string.EncryptedDescription2));
- textView = (TextView)fragmentView.findViewById(R.id.secret_description3);
- textView.setText(LocaleController.getString("EncryptedDescription3", R.string.EncryptedDescription3));
- textView = (TextView)fragmentView.findViewById(R.id.secret_description4);
- textView.setText(LocaleController.getString("EncryptedDescription4", R.string.EncryptedDescription4));
+ ImageView imageView = new ImageView(getParentActivity());
+ imageView.setImageResource(R.drawable.stickers_back_arrow);
+ stickersPanel.addView(imageView);
+ layoutParams2 = (FrameLayout.LayoutParams) imageView.getLayoutParams();
+ layoutParams2.width = FrameLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams2.height = FrameLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams2.gravity = Gravity.BOTTOM;
+ layoutParams2.leftMargin = AndroidUtilities.dp(53);
+ imageView.setLayoutParams(layoutParams2);
- if (loading && messages.isEmpty()) {
- progressView.setVisibility(View.VISIBLE);
- chatListView.setEmptyView(null);
- } else {
- progressView.setVisibility(View.INVISIBLE);
- chatListView.setEmptyView(emptyViewContainer);
- }
+ bottomOverlay = new FrameLayout(getParentActivity());
+ bottomOverlay.setBackgroundColor(0xffffffff);
+ bottomOverlay.setVisibility(View.INVISIBLE);
+ bottomOverlay.setFocusable(true);
+ bottomOverlay.setFocusableInTouchMode(true);
+ bottomOverlay.setClickable(true);
+ contentView.addView(bottomOverlay);
+ layoutParams3 = (RelativeLayout.LayoutParams) bottomOverlay.getLayoutParams();
+ layoutParams3.width = RelativeLayout.LayoutParams.MATCH_PARENT;
+ layoutParams3.height = AndroidUtilities.dp(48);
+ layoutParams3.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
+ bottomOverlay.setLayoutParams(layoutParams3);
- pagedownButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- scrollToLastMessage();
- }
- });
+ bottomOverlayText = new TextView(getParentActivity());
+ bottomOverlayText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
+ bottomOverlayText.setTextColor(0xff7f7f7f);
+ bottomOverlay.addView(bottomOverlayText);
+ layoutParams2 = (FrameLayout.LayoutParams) bottomOverlayText.getLayoutParams();
+ layoutParams2.width = FrameLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams2.height = FrameLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams2.gravity = Gravity.CENTER;
+ bottomOverlayText.setLayoutParams(layoutParams2);
+ bottomOverlayChat = new FrameLayout(getParentActivity());
+ bottomOverlayChat.setBackgroundColor(0xfffbfcfd);
+ bottomOverlayChat.setVisibility(View.INVISIBLE);
+ contentView.addView(bottomOverlayChat);
+ layoutParams3 = (RelativeLayout.LayoutParams) bottomOverlayChat.getLayoutParams();
+ layoutParams3.width = RelativeLayout.LayoutParams.MATCH_PARENT;
+ layoutParams3.height = AndroidUtilities.dp(48);
+ layoutParams3.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
+ bottomOverlayChat.setLayoutParams(layoutParams3);
bottomOverlayChat.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -1421,42 +1616,46 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
});
- updateBottomOverlay();
+ bottomOverlayChatText = new TextView(getParentActivity());
+ bottomOverlayChatText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 18);
+ bottomOverlayChatText.setTextColor(0xff3e6fa1);
+ bottomOverlayChat.addView(bottomOverlayChatText);
+ layoutParams2 = (FrameLayout.LayoutParams) bottomOverlayChatText.getLayoutParams();
+ layoutParams2.width = FrameLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams2.height = FrameLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams2.gravity = Gravity.CENTER;
+ bottomOverlayChatText.setLayoutParams(layoutParams2);
- chatActivityEnterView.setContainerView(getParentActivity(), fragmentView);
- chatActivityEnterView.addToAttachLayout(menuItem);
-
- if (currentEncryptedChat != null) {
- emptyView.setVisibility(View.INVISIBLE);
- View secretChatPlaceholder = contentView.findViewById(R.id.secret_placeholder);
- secretChatPlaceholder.setVisibility(View.VISIBLE);
- if (isCustomTheme) {
- secretChatPlaceholder.setBackgroundResource(R.drawable.system_black);
- } else {
- secretChatPlaceholder.setBackgroundResource(R.drawable.system_blue);
+ pagedownButton = new ImageView(getParentActivity());
+ pagedownButton.setVisibility(View.INVISIBLE);
+ pagedownButton.setImageResource(R.drawable.pagedown);
+ contentView.addView(pagedownButton);
+ layoutParams3 = (RelativeLayout.LayoutParams) pagedownButton.getLayoutParams();
+ layoutParams3.width = RelativeLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams3.height = RelativeLayout.LayoutParams.WRAP_CONTENT;
+ layoutParams3.rightMargin = AndroidUtilities.dp(6);
+ layoutParams3.bottomMargin = AndroidUtilities.dp(4);
+ layoutParams3.addRule(RelativeLayout.ABOVE, id_chat_compose_panel);
+ layoutParams3.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+ pagedownButton.setLayoutParams(layoutParams3);
+ pagedownButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ scrollToLastMessage();
}
- secretViewStatusTextView = (TextView) contentView.findViewById(R.id.invite_text);
- secretChatPlaceholder.setPadding(AndroidUtilities.dp(16), AndroidUtilities.dp(12), AndroidUtilities.dp(16), AndroidUtilities.dp(12));
+ });
- View v = contentView.findViewById(R.id.secret_placeholder);
- v.setVisibility(View.VISIBLE);
-
- if (currentEncryptedChat.admin_id == UserConfig.getClientUserId()) {
- if (currentUser.first_name.length() > 0) {
- secretViewStatusTextView.setText(LocaleController.formatString("EncryptedPlaceholderTitleOutgoing", R.string.EncryptedPlaceholderTitleOutgoing, currentUser.first_name));
- } else {
- secretViewStatusTextView.setText(LocaleController.formatString("EncryptedPlaceholderTitleOutgoing", R.string.EncryptedPlaceholderTitleOutgoing, currentUser.last_name));
- }
- } else {
- if (currentUser.first_name.length() > 0) {
- secretViewStatusTextView.setText(LocaleController.formatString("EncryptedPlaceholderTitleIncoming", R.string.EncryptedPlaceholderTitleIncoming, currentUser.first_name));
- } else {
- secretViewStatusTextView.setText(LocaleController.formatString("EncryptedPlaceholderTitleIncoming", R.string.EncryptedPlaceholderTitleIncoming, currentUser.last_name));
- }
- }
-
- updateSecretStatus();
+ if (loading && messages.isEmpty()) {
+ progressView.setVisibility(View.VISIBLE);
+ chatListView.setEmptyView(null);
+ } else {
+ progressView.setVisibility(View.INVISIBLE);
+ chatListView.setEmptyView(emptyViewContainer);
}
+
+ updateContactStatus();
+ updateBottomOverlay();
+ updateSecretStatus();
} else {
ViewGroup parent = (ViewGroup)fragmentView.getParent();
if (parent != null) {
@@ -1506,7 +1705,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
return;
}
if (show) {
- if (pagedownButton.getVisibility() == View.GONE) {
+ if (pagedownButton.getVisibility() == View.INVISIBLE) {
if (animated) {
pagedownButton.setVisibility(View.VISIBLE);
ViewProxy.setAlpha(pagedownButton, 0);
@@ -1521,11 +1720,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
ObjectAnimatorProxy.ofFloatProxy(pagedownButton, "alpha", 0.0f).setDuration(200).addListener(new AnimatorListenerAdapterProxy() {
@Override
public void onAnimationEnd(Object animation) {
- pagedownButton.setVisibility(View.GONE);
+ pagedownButton.setVisibility(View.INVISIBLE);
}
}).start();
} else {
- pagedownButton.setVisibility(View.GONE);
+ pagedownButton.setVisibility(View.INVISIBLE);
}
}
}
@@ -1536,7 +1735,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
return;
}
if (currentEncryptedChat == null || secretViewStatusTextView == null) {
- bottomOverlay.setVisibility(View.GONE);
+ bottomOverlay.setVisibility(View.INVISIBLE);
return;
}
boolean hideKeyboard = false;
@@ -1556,12 +1755,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
preferences.edit().remove("dialog_" + dialog_id).commit();
hideKeyboard = true;
} else if (currentEncryptedChat instanceof TLRPC.TL_encryptedChat) {
- bottomOverlay.setVisibility(View.GONE);
+ bottomOverlay.setVisibility(View.INVISIBLE);
}
if (hideKeyboard) {
chatActivityEnterView.hideEmojiPopup();
+ if (getParentActivity() != null) {
AndroidUtilities.hideKeyboard(getParentActivity().getCurrentFocus());
}
+ }
checkActionBarMenu();
}
@@ -1624,7 +1825,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (!(messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) {
return 0;
} else {
- return 6;
+ return 7;
}
} else {
return -1;
@@ -1658,8 +1859,12 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (canSave) {
if (messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaDocument) {
String mime = messageObject.messageOwner.media.document.mime_type;
- if (mime != null && mime.endsWith("/xml")) {
- return 5;
+ if (mime != null) {
+ if (mime.endsWith("/xml")) {
+ return 5;
+ } else if (mime.endsWith("/png") || mime.endsWith("/jpg") || mime.endsWith("/jpeg")) {
+ return 6;
+ }
}
}
return 4;
@@ -1681,7 +1886,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (!(messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) {
return 0;
} else {
- return 6;
+ return 7;
}
} else if (messageObject.type == 10 || messageObject.type == 11) {
if (messageObject.isSending()) {
@@ -1757,7 +1962,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
int type = getMessageType(message);
- if (type < 2 || type == 6) {
+ if (type < 2 || type == 7) {
return;
}
addToSelectedMessages(message);
@@ -1795,12 +2000,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
nameTextView.setText(ContactsController.formatName(currentUser.first_name, currentUser.last_name));
}
}
- TLRPC.TL_dialog dialog = MessagesController.getInstance().dialogs_dict.get(dialog_id);
- if (dialog != null && dialog.notify_settings != null) {
-
- } else {
- nameTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.mute_blue, 0);
- }
}
private void updateTitleIcons() {
@@ -1960,8 +2159,40 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
public void onActivityResultFragment(int requestCode, int resultCode, Intent data) {
if (resultCode == Activity.RESULT_OK) {
if (requestCode == 0) {
+ PhotoViewer.getInstance().setParentActivity(getParentActivity());
+ final ArrayList