From 90d8e8a370fba504eadf40f410781c6f4085967b Mon Sep 17 00:00:00 2001 From: DrKLO Date: Mon, 4 Nov 2013 16:31:01 +0400 Subject: [PATCH] update to 1.2.7 --- TMessagesProj/build.gradle | 12 +- ...ockeySDK-3.0.0.jar => HockeySDK-3.0.1.jar} | Bin 104219 -> 105133 bytes TMessagesProj/src/main/AndroidManifest.xml | 8 +- TMessagesProj/src/main/assets/countries.txt | 1 - .../org/telegram/PhoneFormat/PhoneFormat.java | 4 +- .../messenger/ConnectionsManager.java | 6 +- .../java/org/telegram/messenger/Emoji.java | 16 +- .../org/telegram/messenger/FileLoader.java | 3 +- .../messenger/GcmBroadcastReceiver.java | 2 +- .../messenger/MessagesController.java | 343 +++++++++--------- .../telegram/messenger/MessagesStorage.java | 101 +++++- .../org/telegram/messenger/UserConfig.java | 102 +++--- .../org/telegram/messenger/Utilities.java | 72 ++-- .../org/telegram/objects/MessageObject.java | 43 +-- .../org/telegram/ui/ApplicationActivity.java | 10 +- .../org/telegram/ui/ApplicationLoader.java | 24 +- .../java/org/telegram/ui/ChatActivity.java | 66 ++-- .../org/telegram/ui/ChatProfileActivity.java | 12 +- .../ui/ChatProfileChangeNameActivity.java | 4 +- .../org/telegram/ui/ContactAddActivity.java | 4 +- .../org/telegram/ui/ContactsActivity.java | 13 +- .../org/telegram/ui/GalleryImageViewer.java | 2 +- .../org/telegram/ui/GroupCreateActivity.java | 8 +- .../telegram/ui/GroupCreateFinalActivity.java | 2 +- .../org/telegram/ui/IdenticonActivity.java | 4 +- .../java/org/telegram/ui/IntroActivity.java | 2 +- .../java/org/telegram/ui/LaunchActivity.java | 16 +- .../org/telegram/ui/LocationActivity.java | 20 +- .../java/org/telegram/ui/LoginActivity.java | 4 +- .../java/org/telegram/ui/MediaActivity.java | 2 +- .../org/telegram/ui/MessagesActivity.java | 14 +- .../ui/ScreenSlidePageFragmentPhone.java | 16 +- .../ui/ScreenSlidePageFragmentRegister.java | 12 +- .../ui/ScreenSlidePageFragmentSms.java | 16 +- .../org/telegram/ui/SettingsActivity.java | 12 +- .../org/telegram/ui/SettingsBlockedUsers.java | 2 +- .../ui/SettingsChangeNameActivity.java | 6 +- .../ui/SettingsNotificationsActivity.java | 26 +- .../ui/SettingsWallpapersActivity.java | 14 +- .../org/telegram/ui/UserProfileActivity.java | 4 +- .../org/telegram/ui/Views/AvatarUpdater.java | 15 +- .../org/telegram/ui/Views/BaseFragment.java | 5 +- .../telegram/ui/Views/NotificationView.java | 30 +- .../res/layout-ar/notification_layout.xml | 2 - .../res/layout-ar/settings_name_layout.xml | 1 + .../chat_group_incoming_forward_layout.xml | 2 +- .../chat_group_incoming_text_layout.xml | 2 +- .../layout/chat_incoming_forward_layout.xml | 2 +- .../res/layout/chat_incoming_text_layout.xml | 2 +- .../layout/chat_outgoing_forward_layout.xml | 2 +- .../res/layout/chat_outgoing_text_layout.xml | 2 +- .../main/res/layout/notification_layout.xml | 2 - .../main/res/layout/settings_name_layout.xml | 1 + .../src/main/res/values-ar/strings.xml | 1 + TMessagesProj/src/main/res/values/strings.xml | 3 +- 55 files changed, 632 insertions(+), 468 deletions(-) rename TMessagesProj/libs/{HockeySDK-3.0.0.jar => HockeySDK-3.0.1.jar} (58%) diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 93a80ca2b..690626178 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -32,18 +32,18 @@ tasks.withType(Compile) { dependencies { compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar' - compile 'com.google.android.gms:play-services:3.1.+' - compile 'net.hockeyapp.android:HockeySDK:3.0.0' - compile 'com.android.support:support-v4:18.0.+' + compile 'com.google.android.gms:play-services:4.0.+' + compile 'net.hockeyapp.android:HockeySDK:3.0.1' + compile 'com.android.support:support-v4:19.0.+' compile fileTree(dir: "$buildDir/native-libs", include: '*.jar') } android { - compileSdkVersion 18 - buildToolsVersion "17.0.0" + compileSdkVersion 19 + buildToolsVersion "19.0.0" defaultConfig { minSdkVersion 8 - targetSdkVersion 18 + targetSdkVersion 19 } } diff --git a/TMessagesProj/libs/HockeySDK-3.0.0.jar b/TMessagesProj/libs/HockeySDK-3.0.1.jar similarity index 58% rename from TMessagesProj/libs/HockeySDK-3.0.0.jar rename to TMessagesProj/libs/HockeySDK-3.0.1.jar index 5d22fa5effc7ef76e44664cdf1dcb53d49ba1112..7b7d60379028acd168776769067481ae628aaf2e 100644 GIT binary patch delta 36545 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 qLGh9_&~RO0$wur0E5ADCKO%6b4d6 delta 35721 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İ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 + android:versionCode="98" + android:versionName="1.2.7"> - + @@ -19,6 +19,8 @@ + + diff --git a/TMessagesProj/src/main/assets/countries.txt b/TMessagesProj/src/main/assets/countries.txt index 27e56e5d4..6daf64385 100644 --- a/TMessagesProj/src/main/assets/countries.txt +++ b/TMessagesProj/src/main/assets/countries.txt @@ -228,7 +228,6 @@ 31;NL;Netherlands 30;GR;Greece 27;ZA;South Africa -21;DZ;Algeria 20;EG;Egypt 7;KZ;Kazakhstan 7;RU;Russia diff --git a/TMessagesProj/src/main/java/org/telegram/PhoneFormat/PhoneFormat.java b/TMessagesProj/src/main/java/org/telegram/PhoneFormat/PhoneFormat.java index d76bea8aa..dc0e4fe60 100644 --- a/TMessagesProj/src/main/java/org/telegram/PhoneFormat/PhoneFormat.java +++ b/TMessagesProj/src/main/java/org/telegram/PhoneFormat/PhoneFormat.java @@ -24,7 +24,7 @@ package org.telegram.PhoneFormat; -import org.telegram.messenger.Utilities; +import org.telegram.ui.ApplicationLoader; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -78,7 +78,7 @@ public class PhoneFormat { public void init(String countryCode) { try { - InputStream stream = Utilities.applicationContext.getAssets().open("PhoneFormats.dat"); + InputStream stream = ApplicationLoader.applicationContext.getAssets().open("PhoneFormats.dat"); ByteArrayOutputStream bos = new ByteArrayOutputStream(); byte[] buf = new byte[1024]; int len; diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java b/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java index 07cad788b..84eec7054 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/ConnectionsManager.java @@ -150,7 +150,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. Utilities.stageQueue.postRunnable(new Runnable() { @Override public void run() { - File configFile = new File(Utilities.applicationContext.getFilesDir(), "config.dat"); + File configFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "config.dat"); if (configFile.exists()) { try { SerializedData data = new SerializedData(configFile); @@ -235,7 +235,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. data.writeInt32(0); } try { - File configFile = new File(Utilities.applicationContext.getFilesDir(), "config.dat"); + File configFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "config.dat"); if (!configFile.exists()) { configFile.createNewFile(); } @@ -491,7 +491,7 @@ public class ConnectionsManager implements Action.ActionDelegate, TcpConnection. public static boolean isNetworkOnline() { boolean status = false; try { - ConnectivityManager cm = (ConnectivityManager)Utilities.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE); + ConnectivityManager cm = (ConnectivityManager)ApplicationLoader.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo netInfo = cm.getNetworkInfo(0); if (netInfo != null && netInfo.getState() == NetworkInfo.State.CONNECTED) { status = true; diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java b/TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java index f8ce2f36e..84569877d 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/Emoji.java @@ -27,6 +27,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import org.telegram.ui.ApplicationLoader; + public class Emoji { private static final int[] ROW_SIZES = {27, 29, 33, 34, 34}; private static HashMap rects = new HashMap(); @@ -287,7 +289,7 @@ public class Emoji { 0x00000000D83DDD34L, 0x00000000D83DDD35L, 0x00000000D83DDD3BL, 0x00000000D83DDD36L, 0x00000000D83DDD37L, 0x00000000D83DDD38L, 0x00000000D83DDD39L}}; static { - imgSize = Math.min(scale(30), Utilities.applicationContext.getResources().getDisplayMetrics().density < 1.5f ? 28 : 56); + imgSize = Math.min(scale(30), ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density < 1.5f ? 28 : 56); drawImgSize = scale(20); bigImgSize = scale(30); if(Math.abs(imgSize - bigImgSize) < 5) { @@ -306,7 +308,7 @@ public class Emoji { } public static int scale(float value) { - return (int)(Utilities.applicationContext.getResources().getDisplayMetrics().density * value); + return (int)(ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density * value); } private static Bitmap loadPage(final int page){ @@ -317,13 +319,13 @@ public class Emoji { opts.inPreferredConfig = Bitmap.Config.ARGB_8888; opts.inDither = false; - if (Utilities.applicationContext.getResources().getDisplayMetrics().density < 1.5f) { + if (ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density < 1.5f) { opts.inSampleSize = 2; } int iw, ih; - InputStream is = Utilities.applicationContext.getAssets().open("emojisprite_" + page + ".png"); + InputStream is = ApplicationLoader.applicationContext.getAssets().open("emojisprite_" + page + ".png"); Bitmap color = BitmapFactory.decodeStream(is, null, opts); is.close(); @@ -559,8 +561,8 @@ public class Emoji { int sz = super.getSize(paint, text, start, end, fm); - int offset = (int)(8 * Utilities.applicationContext.getResources().getDisplayMetrics().density); - int w = (int)(20 * Utilities.applicationContext.getResources().getDisplayMetrics().density / 2); + int offset = (int)(8 * ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density); + int w = (int)(20 * ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density / 2); fm.top = -w - offset; fm.bottom = w - offset; fm.ascent = -w - offset; @@ -586,7 +588,7 @@ public class Emoji { int sz = super.getSize(paint, text, start, end, fm); - int offset = (int)(6 * Utilities.applicationContext.getResources().getDisplayMetrics().density); + int offset = (int)(6 * ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density); int w = (fm.bottom - fm.top) / 2; fm.top = -w - offset; fm.bottom = w - offset; diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java b/TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java index e25f02d47..46aff8135 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java @@ -18,6 +18,7 @@ import android.view.View; import android.widget.ImageView; import org.telegram.TL.TLRPC; +import org.telegram.ui.ApplicationLoader; import org.telegram.ui.Views.BackupImageView; import java.io.ByteArrayOutputStream; @@ -247,7 +248,7 @@ public class FileLoader { public FileLoader() { int maxMemory = (int)Runtime.getRuntime().maxMemory(); int cacheSize = maxMemory / 10; - density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (Build.VERSION.SDK_INT < 11) { runtimeHack = new VMRuntimeHack(); cacheSize = 1024 * 1024 * 3; diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/GcmBroadcastReceiver.java b/TMessagesProj/src/main/java/org/telegram/messenger/GcmBroadcastReceiver.java index 30be10a40..d44559827 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/GcmBroadcastReceiver.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/GcmBroadcastReceiver.java @@ -198,7 +198,7 @@ public class GcmBroadcastReceiver extends BroadcastReceiver { PendingIntent contentIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_ONE_SHOT); NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context) - .setContentTitle(Utilities.applicationContext.getString(R.string.AppName)) + .setContentTitle(ApplicationLoader.applicationContext.getString(R.string.AppName)) .setSmallIcon(R.drawable.notification) .setStyle(new NotificationCompat.BigTextStyle() .bigText(msg)) diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java index 9e02fa7a4..23fe7ed0d 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java @@ -39,6 +39,7 @@ import android.util.SparseArray; import com.actionbarsherlock.app.SherlockFragmentActivity; +import org.telegram.PhoneFormat.PhoneFormat; import org.telegram.TL.TLClassStore; import org.telegram.TL.TLObject; import org.telegram.TL.TLRPC; @@ -197,7 +198,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter try { soundPool = new SoundPool(1, AudioManager.STREAM_NOTIFICATION, 0); - sound = soundPool.load(Utilities.applicationContext, R.raw.sound_a, 1); + sound = soundPool.load(ApplicationLoader.applicationContext, R.raw.sound_a, 1); } catch (Exception e) { e.printStackTrace(); } @@ -364,7 +365,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter } public void checkAppAccount() { - AccountManager am = AccountManager.get(Utilities.applicationContext); + AccountManager am = AccountManager.get(ApplicationLoader.applicationContext); Account[] accounts = am.getAccountsByType("org.telegram.messenger.account"); boolean recreateAccount = false; if (UserConfig.currentUser != null) { @@ -460,7 +461,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter req.peer = new TLRPC.TL_inputPeerChat(); req.peer.chat_id = -lower_part; } else { - TLRPC.User user = MessagesController.Instance.users.get(uid); + TLRPC.User user = users.get(lower_part); if (user instanceof TLRPC.TL_userForeign || user instanceof TLRPC.TL_userRequest) { req.peer = new TLRPC.TL_inputPeerForeign(); req.peer.access_hash = user.access_hash; @@ -518,7 +519,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter req.peer = new TLRPC.TL_inputPeerChat(); req.peer.chat_id = -lower_part; } else { - TLRPC.User user = MessagesController.Instance.users.get(uid); + TLRPC.User user = users.get(lower_part); if (user instanceof TLRPC.TL_userForeign || user instanceof TLRPC.TL_userRequest) { req.peer = new TLRPC.TL_inputPeerForeign(); req.peer.access_hash = user.access_hash; @@ -562,7 +563,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter final HashMap> sectionsDict = new HashMap>(); final ArrayList sortedSectionsArray = new ArrayList(); - ContentResolver cr = Utilities.applicationContext.getContentResolver(); + ContentResolver cr = ApplicationLoader.applicationContext.getContentResolver(); String[] projectioPhones = { ContactsContract.CommonDataKinds.Phone.CONTACT_ID, @@ -594,23 +595,20 @@ public class MessagesController implements NotificationCenter.NotificationCenter contactsMap.put(id, contact); contact.id = id; } - number = number.replace(" ", "").replace("(", "").replace(")", "").replace("-", "").replace("+", ""); - if (number.startsWith("8")) { - number = "7" + number.substring(1); - } + contact.phones.add(number); if (type == ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM) { contact.phoneTypes.add(pCur.getString(3)); } else if (type == ContactsContract.CommonDataKinds.Phone.TYPE_HOME) { - contact.phoneTypes.add(Utilities.applicationContext.getString(R.string.PhoneHome)); + contact.phoneTypes.add(ApplicationLoader.applicationContext.getString(R.string.PhoneHome)); } else if (type == ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE) { - contact.phoneTypes.add(Utilities.applicationContext.getString(R.string.PhoneMobile)); + contact.phoneTypes.add(ApplicationLoader.applicationContext.getString(R.string.PhoneMobile)); } else if (type == ContactsContract.CommonDataKinds.Phone.TYPE_WORK) { - contact.phoneTypes.add(Utilities.applicationContext.getString(R.string.PhoneWork)); + contact.phoneTypes.add(ApplicationLoader.applicationContext.getString(R.string.PhoneWork)); } else if (type == ContactsContract.CommonDataKinds.Phone.TYPE_MAIN) { - contact.phoneTypes.add(Utilities.applicationContext.getString(R.string.PhoneMain)); + contact.phoneTypes.add(ApplicationLoader.applicationContext.getString(R.string.PhoneMain)); } else { - contact.phoneTypes.add(Utilities.applicationContext.getString(R.string.PhoneOther)); + contact.phoneTypes.add(ApplicationLoader.applicationContext.getString(R.string.PhoneOther)); } } } @@ -676,7 +674,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter imp.client_id = id; imp.first_name = value.first_name; imp.last_name = value.last_name; - imp.phone = value.phones.get(a); + imp.phone = PhoneFormat.stripExceptNumbers(value.phones.get(a)); toImport.add(imp); String str = imp.client_id + imp.first_name + imp.last_name + imp.phone; if (mdEnc != null) { @@ -747,7 +745,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter if (!toImport.isEmpty() && !UserConfig.importHash.equals(importHash)) { UserConfig.importHash = importHash; - UserConfig.saveConfig(); + UserConfig.saveConfig(false); importContacts(toImport); } else { loadContacts(true); @@ -774,7 +772,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter 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 = Utilities.applicationContext.getContentResolver().query(rawContactUri, new String[]{BaseColumns._ID, ContactsContract.RawContacts.SYNC2}, null, null, null); + Cursor c1 = ApplicationLoader.applicationContext.getContentResolver().query(rawContactUri, new String[]{BaseColumns._ID, ContactsContract.RawContacts.SYNC2}, null, null, null); HashMap bookContacts = new HashMap(); if (c1 != null) { while (c1.moveToNext()) { @@ -832,7 +830,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter builder.withValue(ContactsContract.Data.DATA4, user.id); query.add(builder.build()); try { - ContentProviderResult[] result = Utilities.applicationContext.getContentResolver().applyBatch(ContactsContract.AUTHORITY, query); + ContentProviderResult[] result = ApplicationLoader.applicationContext.getContentResolver().applyBatch(ContactsContract.AUTHORITY, query); return Long.parseLong(result[0].uri.getLastPathSegment()); } catch (Exception e) { e.printStackTrace(); @@ -894,7 +892,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter req.peer = new TLRPC.TL_inputPeerChat(); req.peer.chat_id = -lower_part; } else { - TLRPC.User user = MessagesController.Instance.users.get(did); + TLRPC.User user = users.get(lower_part); if (user instanceof TLRPC.TL_userForeign || user instanceof TLRPC.TL_userRequest) { req.peer = new TLRPC.TL_inputPeerForeign(); req.peer.access_hash = user.access_hash; @@ -911,11 +909,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter if (res.offset > 0) { deleteDialog(did, res.offset, onlyHistory); } - if (UserConfig.lastSeqValue + 1 == res.seq) { - UserConfig.lastSeqValue = res.seq; - UserConfig.lastPtsValue = res.pts; - UserConfig.saveConfig(); - } else if (UserConfig.lastSeqValue != res.seq) { + if (MessagesStorage.lastSeqValue + 1 == res.seq) { + MessagesStorage.lastSeqValue = res.seq; + MessagesStorage.lastPtsValue = res.pts; + MessagesStorage.Instance.saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); + } else if (MessagesStorage.lastSeqValue != res.seq) { getDifference(); } } @@ -1057,13 +1055,13 @@ public class MessagesController implements NotificationCenter.NotificationCenter ArrayList keys = new ArrayList(printingUsers.keySet()); for (Long key : keys) { if (key > 0) { - newPrintingStrings.put(key, Html.fromHtml(String.format("%s", Utilities.applicationContext.getString(R.string.Typing)))); + newPrintingStrings.put(key, Html.fromHtml(String.format("%s", ApplicationLoader.applicationContext.getString(R.string.Typing)))); } else { ArrayList arr = printingUsers.get(key); int count = 0; String label = ""; for (PrintingUser pu : arr) { - TLRPC.User user = MessagesController.Instance.users.get(pu.userId); + TLRPC.User user = users.get(pu.userId); if (user != null) { if (label.length() != 0) { label += ", "; @@ -1078,12 +1076,12 @@ public class MessagesController implements NotificationCenter.NotificationCenter if (label.length() != 0) { if (count > 1) { if (arr.size() > 2) { - newPrintingStrings.put(key, Html.fromHtml(String.format("%s %s %s", label, String.format(Utilities.applicationContext.getString(R.string.AndMoreTyping), arr.size() - 2), Utilities.applicationContext.getString(R.string.AreTyping)))); + newPrintingStrings.put(key, Html.fromHtml(String.format("%s %s %s", label, String.format(ApplicationLoader.applicationContext.getString(R.string.AndMoreTyping), arr.size() - 2), ApplicationLoader.applicationContext.getString(R.string.AreTyping)))); } else { - newPrintingStrings.put(key, Html.fromHtml(String.format("%s %s", label, Utilities.applicationContext.getString(R.string.AreTyping)))); + newPrintingStrings.put(key, Html.fromHtml(String.format("%s %s", label, ApplicationLoader.applicationContext.getString(R.string.AreTyping)))); } } else { - newPrintingStrings.put(key, Html.fromHtml(String.format("%s %s", label, Utilities.applicationContext.getString(R.string.IsTyping)))); + newPrintingStrings.put(key, Html.fromHtml(String.format("%s %s", label, ApplicationLoader.applicationContext.getString(R.string.IsTyping)))); } } } @@ -1127,7 +1125,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter ids += aContactsArr.user_id; } UserConfig.contactsHash = Utilities.MD5(ids); - UserConfig.saveConfig(); + UserConfig.saveConfig(false); if (from == 2) { loadContacts(false); } @@ -1414,7 +1412,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter public void run() { for (TLRPC.User u : messagesRes.users) { if (isCache) { - users.putIfAbsent(u.id, u); + if (u.id == UserConfig.clientUserId || u.id == 333000) { + users.put(u.id, u); + } else { + users.putIfAbsent(u.id, u); + } } else { users.put(u.id, u); if (u.id == UserConfig.clientUserId) { @@ -1568,7 +1570,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter public void run() { for (TLRPC.User u : dialogsRes.users) { if (isCache) { - users.putIfAbsent(u.id, u); + if (u.id == UserConfig.clientUserId || u.id == 333000) { + users.put(u.id, u); + } else { + users.putIfAbsent(u.id, u); + } } else { users.put(u.id, u); if (u.id == UserConfig.clientUserId) { @@ -1632,7 +1638,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter public void run() { for (TLRPC.User u : dialogsRes.users) { if (isCache) { - users.putIfAbsent(u.id, u); + if (u.id == UserConfig.clientUserId || u.id == 333000) { + users.put(u.id, u); + } else { + users.putIfAbsent(u.id, u); + } } else { users.put(u.id, u); if (u.id == UserConfig.clientUserId) { @@ -1737,7 +1747,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter if (sizes.isEmpty()) { return null; } else { - UserConfig.saveConfig(); + UserConfig.saveConfig(false); TLRPC.TL_photo photo = new TLRPC.TL_photo(); photo.user_id = UserConfig.clientUserId; photo.date = ConnectionsManager.Instance.getCurrentTime(); @@ -1784,11 +1794,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter markDialogAsRead(dialog_id, 0, res.offset, max_date, was); } - if (UserConfig.lastSeqValue + 1 == res.seq) { - UserConfig.lastSeqValue = res.seq; - UserConfig.lastPtsValue = res.pts; - UserConfig.saveConfig(); - } else if (UserConfig.lastSeqValue != res.seq) { + if (MessagesStorage.lastSeqValue + 1 == res.seq) { + MessagesStorage.lastSeqValue = res.seq; + MessagesStorage.lastPtsValue = res.pts; + MessagesStorage.Instance.saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); + } else if (MessagesStorage.lastSeqValue != res.seq) { getDifference(); } } @@ -1914,7 +1924,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter newMsg.out = true; newMsg.date = ConnectionsManager.Instance.getCurrentTime(); newMsg.random_id = getNextRandomId(); - UserConfig.saveConfig(); + UserConfig.saveConfig(false); final MessageObject newMsgObj = new MessageObject(newMsg, users); newMsgObj.messageOwner.send_state = MESSAGE_SEND_STATE_SENDING; @@ -2048,7 +2058,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter newMsg.out = true; newMsg.date = ConnectionsManager.Instance.getCurrentTime(); newMsg.random_id = getNextRandomId(); - UserConfig.saveConfig(); + UserConfig.saveConfig(false); final MessageObject newMsgObj = new MessageObject(newMsg, null); newMsgObj.messageOwner.send_state = MESSAGE_SEND_STATE_SENDING; @@ -2284,6 +2294,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter } private void performSendEncryptedRequest(final TLRPC.DecryptedMessage req, final MessageObject newMsgObj, final TLRPC.EncryptedChat chat, final TLRPC.InputEncryptedFile encryptedFile) { + if (req == null) { + return; + } //TLRPC.decryptedMessageLayer messageLayer = new TLRPC.decryptedMessageLayer(); //messageLayer.layer = 8; //messageLayer.message = req; @@ -2377,11 +2390,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter if (response instanceof TLRPC.TL_messages_sentMessage) { TLRPC.TL_messages_sentMessage res = (TLRPC.TL_messages_sentMessage)response; newMsgObj.messageOwner.id = res.id; - if(UserConfig.lastSeqValue + 1 == res.seq) { - UserConfig.lastSeqValue = res.seq; - UserConfig.lastDateValue = res.date; - UserConfig.lastPtsValue = res.pts; - UserConfig.saveConfig(); + if(MessagesStorage.lastSeqValue + 1 == res.seq) { + MessagesStorage.lastSeqValue = res.seq; + MessagesStorage.lastDateValue = res.date; + MessagesStorage.lastPtsValue = res.pts; + MessagesStorage.Instance.saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); } else { getDifference(); } @@ -2390,11 +2403,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter sendedMessages.add(res.message); newMsgObj.messageOwner.id = res.message.id; processSendedMessage(newMsgObj.messageOwner, res.message, null, null); - if(UserConfig.lastSeqValue + 1 == res.seq) { - UserConfig.lastSeqValue = res.seq; - UserConfig.lastPtsValue = res.pts; - UserConfig.lastDateValue = res.message.date; - UserConfig.saveConfig(); + if(MessagesStorage.lastSeqValue + 1 == res.seq) { + MessagesStorage.lastSeqValue = res.seq; + MessagesStorage.lastPtsValue = res.pts; + MessagesStorage.lastDateValue = res.message.date; + MessagesStorage.Instance.saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); } else { getDifference(); } @@ -2406,10 +2419,10 @@ public class MessagesController implements NotificationCenter.NotificationCenter sendedMessages.add(message); processSendedMessage(newMsgObj.messageOwner, message, null, null); } - if(UserConfig.lastSeqValue + 1 == res.seq) { - UserConfig.lastSeqValue = res.seq; - UserConfig.lastPtsValue = res.pts; - UserConfig.saveConfig(); + if(MessagesStorage.lastSeqValue + 1 == res.seq) { + MessagesStorage.lastSeqValue = res.seq; + MessagesStorage.lastPtsValue = res.pts; + MessagesStorage.Instance.saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); } else { getDifference(); } @@ -2524,7 +2537,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter newContactBook.phones = new ArrayList(); newContactBook.phones.add(user.phone); newContactBook.phoneTypes = new ArrayList(); - newContactBook.phoneTypes.add(Utilities.applicationContext.getString(R.string.PhoneMobile)); + newContactBook.phoneTypes.add(ApplicationLoader.applicationContext.getString(R.string.PhoneMobile)); contactsMapBook.put((int)bookId, newContactBook); String contactsImportHash = ""; @@ -2715,7 +2728,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter } UserConfig.contactsHash = Utilities.MD5(ids); UserConfig.importHash = importHash; - UserConfig.saveConfig(); + UserConfig.saveConfig(false); MessagesStorage.Instance.putContacts(contactsArr, true); ArrayList users = new ArrayList(); @@ -2816,7 +2829,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter TLRPC.TL_messages_createChat req = new TLRPC.TL_messages_createChat(); req.title = title; for (Integer uid : selectedContacts) { - TLRPC.User user = MessagesController.Instance.users.get(uid); + TLRPC.User user = users.get(uid); TLRPC.InputUser inputUser; if (user instanceof TLRPC.TL_userForeign || user instanceof TLRPC.TL_userRequest) { inputUser = new TLRPC.TL_inputUserForeign(); @@ -2845,11 +2858,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter final ArrayList messages = new ArrayList(); messages.add(res.message); MessagesStorage.Instance.putMessages(messages, true, true); - if (UserConfig.lastSeqValue + 1 == res.seq) { - UserConfig.lastSeqValue = res.seq; - UserConfig.lastPtsValue = res.pts; - UserConfig.saveConfig(); - } else if (UserConfig.lastSeqValue != res.seq) { + if (MessagesStorage.lastSeqValue + 1 == res.seq) { + MessagesStorage.lastSeqValue = res.seq; + MessagesStorage.lastPtsValue = res.pts; + MessagesStorage.Instance.saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); + } else if (MessagesStorage.lastSeqValue != res.seq) { getDifference(); } Utilities.RunOnUIThread(new Runnable() { @@ -2883,7 +2896,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter TLRPC.TL_messages_addChatUser req = new TLRPC.TL_messages_addChatUser(); req.chat_id = chat_id; req.fwd_limit = 50; - TLRPC.User user = MessagesController.Instance.users.get(user_id); + TLRPC.User user = users.get(user_id); if (user instanceof TLRPC.TL_userForeign || user instanceof TLRPC.TL_userRequest) { req.user_id = new TLRPC.TL_inputUserForeign(); req.user_id.user_id = user.id; @@ -2904,11 +2917,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter final ArrayList messages = new ArrayList(); messages.add(res.message); MessagesStorage.Instance.putMessages(messages, true, true); - if (UserConfig.lastSeqValue + 1 == res.seq) { - UserConfig.lastSeqValue = res.seq; - UserConfig.lastPtsValue = res.pts; - UserConfig.saveConfig(); - } else if (UserConfig.lastSeqValue != res.seq) { + if (MessagesStorage.lastSeqValue + 1 == res.seq) { + MessagesStorage.lastSeqValue = res.seq; + MessagesStorage.lastPtsValue = res.pts; + MessagesStorage.Instance.saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); + } else if (MessagesStorage.lastSeqValue != res.seq) { getDifference(); } @@ -2954,7 +2967,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter public void deleteUserFromChat(int chat_id, final int user_id, final TLRPC.ChatParticipants info) { TLRPC.TL_messages_deleteChatUser req = new TLRPC.TL_messages_deleteChatUser(); req.chat_id = chat_id; - TLRPC.User user = MessagesController.Instance.users.get(user_id); + TLRPC.User user = users.get(user_id); if (user instanceof TLRPC.TL_userForeign || user instanceof TLRPC.TL_userRequest) { req.user_id = new TLRPC.TL_inputUserForeign(); req.user_id.user_id = user.id; @@ -2978,11 +2991,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter messages.add(res.message); MessagesStorage.Instance.putMessages(messages, true, true); } - if (UserConfig.lastSeqValue + 1 == res.seq) { - UserConfig.lastSeqValue = res.seq; - UserConfig.lastPtsValue = res.pts; - UserConfig.saveConfig(); - } else if (UserConfig.lastSeqValue != res.seq) { + if (MessagesStorage.lastSeqValue + 1 == res.seq) { + MessagesStorage.lastSeqValue = res.seq; + MessagesStorage.lastPtsValue = res.pts; + MessagesStorage.Instance.saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); + } else if (MessagesStorage.lastSeqValue != res.seq) { getDifference(); } @@ -3042,11 +3055,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter final ArrayList messages = new ArrayList(); messages.add(res.message); MessagesStorage.Instance.putMessages(messages, true, true); - if (UserConfig.lastSeqValue + 1 == res.seq) { - UserConfig.lastSeqValue = res.seq; - UserConfig.lastPtsValue = res.pts; - UserConfig.saveConfig(); - } else if (UserConfig.lastSeqValue != res.seq) { + if (MessagesStorage.lastSeqValue + 1 == res.seq) { + MessagesStorage.lastSeqValue = res.seq; + MessagesStorage.lastPtsValue = res.pts; + MessagesStorage.Instance.saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); + } else if (MessagesStorage.lastSeqValue != res.seq) { getDifference(); } @@ -3095,11 +3108,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter final ArrayList messages = new ArrayList(); messages.add(res.message); MessagesStorage.Instance.putMessages(messages, true, true); - if (UserConfig.lastSeqValue + 1 == res.seq) { - UserConfig.lastSeqValue = res.seq; - UserConfig.lastPtsValue = res.pts; - UserConfig.saveConfig(); - } else if (UserConfig.lastSeqValue != res.seq) { + if (MessagesStorage.lastSeqValue + 1 == res.seq) { + MessagesStorage.lastSeqValue = res.seq; + MessagesStorage.lastPtsValue = res.pts; + MessagesStorage.Instance.saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); + } else if (MessagesStorage.lastSeqValue != res.seq) { getDifference(); } @@ -3168,7 +3181,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter req.device_model = "Android unknown"; } req.system_version = "SDK " + Build.VERSION.SDK_INT; - PackageInfo pInfo = Utilities.applicationContext.getPackageManager().getPackageInfo(Utilities.applicationContext.getPackageName(), 0); + PackageInfo pInfo = ApplicationLoader.applicationContext.getPackageManager().getPackageInfo(ApplicationLoader.applicationContext.getPackageName(), 0); req.app_version = pInfo.versionName; if (req.app_version == null) { req.app_version = "App version unknown"; @@ -3186,7 +3199,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter Log.e("tmessages", "registered for push"); UserConfig.registeredForPush = true; UserConfig.pushString = regid; - UserConfig.saveConfig(); + UserConfig.saveConfig(false); } Utilities.RunOnUIThread(new Runnable() { @Override @@ -3211,11 +3224,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter updatingState = false; if (error == null) { TLRPC.TL_updates_state res = (TLRPC.TL_updates_state)response; - UserConfig.lastDateValue = res.date; - UserConfig.lastPtsValue = res.pts; - UserConfig.lastSeqValue = res.seq; - UserConfig.lastQtsValue = res.qts; - UserConfig.saveConfig(); + MessagesStorage.lastDateValue = res.date; + MessagesStorage.lastPtsValue = res.pts; + MessagesStorage.lastSeqValue = res.seq; + MessagesStorage.lastQtsValue = res.qts; + MessagesStorage.Instance.saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); } else { loadCurrentState(); } @@ -3225,7 +3238,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter public void getDifference() { registerForPush(UserConfig.pushString); - if (UserConfig.lastDateValue == 0) { + if (MessagesStorage.lastDateValue == 0) { loadCurrentState(); return; } @@ -3238,9 +3251,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter } gettingDifference = true; TLRPC.TL_updates_getDifference req = new TLRPC.TL_updates_getDifference(); - req.pts = UserConfig.lastPtsValue; - req.date = UserConfig.lastDateValue; - req.qts = UserConfig.lastQtsValue; + req.pts = MessagesStorage.lastPtsValue; + req.date = MessagesStorage.lastDateValue; + req.qts = MessagesStorage.lastQtsValue; if (ConnectionsManager.Instance.connectionState == 0) { ConnectionsManager.Instance.connectionState = 3; final int stateCopy = ConnectionsManager.Instance.connectionState; @@ -3373,10 +3386,10 @@ public class MessagesController implements NotificationCenter.NotificationCenter } if (res instanceof TLRPC.TL_updates_difference) { - UserConfig.lastSeqValue = res.state.seq; - UserConfig.lastDateValue = res.state.date; - UserConfig.lastPtsValue = res.state.pts; - UserConfig.lastQtsValue = res.state.qts; + MessagesStorage.lastSeqValue = res.state.seq; + MessagesStorage.lastDateValue = res.state.date; + MessagesStorage.lastPtsValue = res.state.pts; + MessagesStorage.lastQtsValue = res.state.qts; ConnectionsManager.Instance.connectionState = 0; final int stateCopy = ConnectionsManager.Instance.connectionState; Utilities.RunOnUIThread(new Runnable() { @@ -3386,14 +3399,14 @@ public class MessagesController implements NotificationCenter.NotificationCenter } }); } else if (res instanceof TLRPC.TL_updates_differenceSlice) { - UserConfig.lastSeqValue = res.intermediate_state.seq; - UserConfig.lastDateValue = res.intermediate_state.date; - UserConfig.lastPtsValue = res.intermediate_state.pts; - UserConfig.lastQtsValue = res.intermediate_state.qts; + MessagesStorage.lastSeqValue = res.intermediate_state.seq; + MessagesStorage.lastDateValue = res.intermediate_state.date; + MessagesStorage.lastPtsValue = res.intermediate_state.pts; + MessagesStorage.lastQtsValue = res.intermediate_state.qts; getDifference(); } else if (res instanceof TLRPC.TL_updates_differenceEmpty) { - UserConfig.lastSeqValue = res.seq; - UserConfig.lastDateValue = res.date; + MessagesStorage.lastSeqValue = res.seq; + MessagesStorage.lastDateValue = res.date; ConnectionsManager.Instance.connectionState = 0; final int stateCopy = ConnectionsManager.Instance.connectionState; Utilities.RunOnUIThread(new Runnable() { @@ -3403,14 +3416,14 @@ public class MessagesController implements NotificationCenter.NotificationCenter } }); } - UserConfig.saveConfig(); + MessagesStorage.Instance.saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); } }); } }); if (ConnectionsManager.DEBUG_VERSION) { - Log.e("tmessages", "received defference with date = " + UserConfig.lastDateValue + " pts = " + UserConfig.lastPtsValue + " seq = " + UserConfig.lastSeqValue); + Log.e("tmessages", "received defference with date = " + MessagesStorage.lastDateValue + " pts = " + MessagesStorage.lastPtsValue + " seq = " + MessagesStorage.lastSeqValue); Log.e("tmessages", "messages = " + res.new_messages.size() + " users = " + res.users.size() + " chats = " + res.chats.size() + " other updates = " + res.other_updates.size()); } } else { @@ -3429,7 +3442,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter arr.add(updates.update); processUpdateArray(arr, null, null); } else if (updates instanceof TLRPC.TL_updateShortChatMessage) { - if (UserConfig.lastSeqValue + 1 == updates.seq && chats.get(updates.chat_id) != null && users.get(updates.from_id) != null) { + if (MessagesStorage.lastSeqValue + 1 == updates.seq && chats.get(updates.chat_id) != null && users.get(updates.from_id) != null) { TLRPC.TL_message message = new TLRPC.TL_message(); message.from_id = updates.from_id; message.id = updates.id; @@ -3439,8 +3452,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter message.date = updates.date; message.unread = true; message.media = new TLRPC.TL_messageMediaEmpty(); - UserConfig.lastSeqValue = updates.seq; - UserConfig.lastPtsValue = updates.pts; + MessagesStorage.lastSeqValue = updates.seq; + MessagesStorage.lastPtsValue = updates.pts; final MessageObject obj = new MessageObject(message, null); final ArrayList objArr = new ArrayList(); objArr.add(obj); @@ -3477,7 +3490,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter needGetDiff = true; } } else if (updates instanceof TLRPC.TL_updateShortMessage) { - if (UserConfig.lastSeqValue + 1 == updates.seq && users.get(updates.from_id) != null) { + if (MessagesStorage.lastSeqValue + 1 == updates.seq && users.get(updates.from_id) != null) { TLRPC.TL_message message = new TLRPC.TL_message(); message.from_id = updates.from_id; message.id = updates.id; @@ -3487,9 +3500,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter message.date = updates.date; message.unread = true; message.media = new TLRPC.TL_messageMediaEmpty(); - UserConfig.lastSeqValue = updates.seq; - UserConfig.lastPtsValue = updates.pts; - UserConfig.lastDateValue = updates.date; + MessagesStorage.lastSeqValue = updates.seq; + MessagesStorage.lastPtsValue = updates.pts; + MessagesStorage.lastDateValue = updates.date; final MessageObject obj = new MessageObject(message, null); final ArrayList objArr = new ArrayList(); objArr.add(obj); @@ -3526,18 +3539,18 @@ public class MessagesController implements NotificationCenter.NotificationCenter needGetDiff = true; } } else if (updates instanceof TLRPC.TL_updatesCombined) { - if (UserConfig.lastSeqValue + 1 == updates.seq_start || updates.seq_start == 0 || UserConfig.lastSeqValue == updates.seq_start) { + if (MessagesStorage.lastSeqValue + 1 == updates.seq_start || updates.seq_start == 0 || MessagesStorage.lastSeqValue == updates.seq_start) { MessagesStorage.Instance.putUsersAndChats(updates.users, updates.chats, true, true); - int lastPtsValue = UserConfig.lastPtsValue; - int lastQtsValue = UserConfig.lastQtsValue; + int lastPtsValue = MessagesStorage.lastPtsValue; + int lastQtsValue = MessagesStorage.lastQtsValue; if (!processUpdateArray(updates.updates, updates.users, updates.chats)) { - UserConfig.lastPtsValue = lastPtsValue; - UserConfig.lastQtsValue = lastQtsValue; + MessagesStorage.lastPtsValue = lastPtsValue; + MessagesStorage.lastQtsValue = lastQtsValue; needGetDiff = true; } else { - UserConfig.lastDateValue = updates.date; - UserConfig.lastSeqValue = updates.seq; - if (UserConfig.lastQtsValue != lastQtsValue) { + MessagesStorage.lastDateValue = updates.date; + MessagesStorage.lastSeqValue = updates.seq; + if (MessagesStorage.lastQtsValue != lastQtsValue) { needReceivedQueue = true; } } @@ -3545,18 +3558,18 @@ public class MessagesController implements NotificationCenter.NotificationCenter needGetDiff = true; } } else if (updates instanceof TLRPC.TL_updates) { - if (UserConfig.lastSeqValue + 1 == updates.seq || updates.seq == 0 || updates.seq == UserConfig.lastSeqValue) { + if (MessagesStorage.lastSeqValue + 1 == updates.seq || updates.seq == 0 || updates.seq == MessagesStorage.lastSeqValue) { MessagesStorage.Instance.putUsersAndChats(updates.users, updates.chats, true, true); - int lastPtsValue = UserConfig.lastPtsValue; - int lastQtsValue = UserConfig.lastQtsValue; + int lastPtsValue = MessagesStorage.lastPtsValue; + int lastQtsValue = MessagesStorage.lastQtsValue; if (!processUpdateArray(updates.updates, updates.users, updates.chats)) { needGetDiff = true; - UserConfig.lastPtsValue = lastPtsValue; - UserConfig.lastQtsValue = lastQtsValue; + MessagesStorage.lastPtsValue = lastPtsValue; + MessagesStorage.lastQtsValue = lastQtsValue; } else { - UserConfig.lastDateValue = updates.date; - UserConfig.lastSeqValue = updates.seq; - if (UserConfig.lastQtsValue != lastQtsValue) { + MessagesStorage.lastDateValue = updates.date; + MessagesStorage.lastSeqValue = updates.seq; + if (MessagesStorage.lastQtsValue != lastQtsValue) { needReceivedQueue = true; } } @@ -3571,7 +3584,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter } if (needReceivedQueue) { TLRPC.TL_messages_receivedQueue req = new TLRPC.TL_messages_receivedQueue(); - req.max_qts = UserConfig.lastQtsValue; + req.max_qts = MessagesStorage.lastQtsValue; ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() { @Override public void run(TLObject response, TLRPC.TL_error error) { @@ -3579,7 +3592,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter } }, null, true, RPCRequest.RPCRequestClassGeneric); } - UserConfig.saveConfig(); + MessagesStorage.Instance.saveDiffParams(MessagesStorage.lastSeqValue, MessagesStorage.lastPtsValue, MessagesStorage.lastDateValue, MessagesStorage.lastQtsValue); } public boolean processUpdateArray(ArrayList updates, final ArrayList usersArr, final ArrayList chatsArr) { @@ -3653,7 +3666,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter messages.put(uid, arr); } arr.add(obj); - UserConfig.lastPtsValue = update.pts; + MessagesStorage.lastPtsValue = update.pts; if (upd.message.from_id != UserConfig.clientUserId && upd.message.to_id != null) { if (uid != openned_dialog_id) { lastMessage = obj; @@ -3663,12 +3676,12 @@ public class MessagesController implements NotificationCenter.NotificationCenter //can't be here } else if (update instanceof TLRPC.TL_updateReadMessages) { markAsReadMessages.addAll(update.messages); - UserConfig.lastPtsValue = update.pts; + MessagesStorage.lastPtsValue = update.pts; } else if (update instanceof TLRPC.TL_updateDeleteMessages) { deletedMessages.addAll(update.messages); - UserConfig.lastPtsValue = update.pts; + MessagesStorage.lastPtsValue = update.pts; } else if (update instanceof TLRPC.TL_updateRestoreMessages) { - UserConfig.lastPtsValue = update.pts; + MessagesStorage.lastPtsValue = update.pts; } else if (update instanceof TLRPC.TL_updateUserTyping || update instanceof TLRPC.TL_updateChatUserTyping) { if (update.user_id != UserConfig.clientUserId) { long uid = -update.chat_id; @@ -3727,7 +3740,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter } else if (update instanceof TLRPC.TL_updateNewGeoChatMessage) { //TODO } else if (update instanceof TLRPC.TL_updateNewEncryptedMessage) { - UserConfig.lastQtsValue = update.qts; + MessagesStorage.lastQtsValue = update.qts; TLRPC.Message message = decryptMessage(((TLRPC.TL_updateNewEncryptedMessage)update).message); if (message != null) { int cid = ((TLRPC.TL_updateNewEncryptedMessage)update).message.chat_id; @@ -3852,7 +3865,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter } }); MessagesStorage.Instance.putEncryptedChat(newChat, user, dialog); - MessagesController.Instance.acceptSecretChat(newChat); + acceptSecretChat(newChat); } else if (newChat instanceof TLRPC.TL_encryptedChat) { if (existingChat != null && existingChat instanceof TLRPC.TL_encryptedChatWaiting && (existingChat.auth_key == null || existingChat.auth_key.length == 1)) { newChat.a_or_b = existingChat.a_or_b; @@ -4101,7 +4114,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter } private void showInAppNotification(MessageObject messageObject) { - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Context.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Context.MODE_PRIVATE); boolean globalEnabled = preferences.getBoolean("EnableAll", true); if (!globalEnabled) { return; @@ -4157,7 +4170,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter NotificationCenter.Instance.postNotificationName(701, messageObject); } if (inAppVibrate) { - Vibrator v = (Vibrator)Utilities.applicationContext.getSystemService(Context.VIBRATOR_SERVICE); + Vibrator v = (Vibrator)ApplicationLoader.applicationContext.getSystemService(Context.VIBRATOR_SERVICE); v.vibrate(100); } if (inAppSounds) { @@ -4206,8 +4219,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter String userSoundPath = null; String chatSoundPath = null; - NotificationManager mNotificationManager = (NotificationManager)Utilities.applicationContext.getSystemService(Context.NOTIFICATION_SERVICE); - Intent intent = new Intent(Utilities.applicationContext, LaunchActivity.class); + NotificationManager mNotificationManager = (NotificationManager)ApplicationLoader.applicationContext.getSystemService(Context.NOTIFICATION_SERVICE); + Intent intent = new Intent(ApplicationLoader.applicationContext, LaunchActivity.class); String msg; if ((int)dialog_id != 0) { @@ -4219,7 +4232,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter } msg = messageObject.messageOwner.message; } else { - msg = Utilities.applicationContext.getString(R.string.YouHaveNewMessage); + msg = ApplicationLoader.applicationContext.getString(R.string.YouHaveNewMessage); } boolean needVibrate = false; @@ -4253,10 +4266,10 @@ public class MessagesController implements NotificationCenter.NotificationCenter intent.setAction("com.tmessages.openchat" + Math.random() + Integer.MAX_VALUE); intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); - PendingIntent contentIntent = PendingIntent.getActivity(Utilities.applicationContext, 0, intent, PendingIntent.FLAG_ONE_SHOT); + PendingIntent contentIntent = PendingIntent.getActivity(ApplicationLoader.applicationContext, 0, intent, PendingIntent.FLAG_ONE_SHOT); - NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(Utilities.applicationContext) - .setContentTitle(Utilities.applicationContext.getString(R.string.AppName)) + NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(ApplicationLoader.applicationContext) + .setContentTitle(ApplicationLoader.applicationContext.getString(R.string.AppName)) .setSmallIcon(R.drawable.notification) .setStyle(new NotificationCompat.BigTextStyle() .bigText(msg)) @@ -4486,7 +4499,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter public void processAcceptedSecretChat(final TLRPC.EncryptedChat encryptedChat) { BigInteger i_authKey = new BigInteger(1, encryptedChat.g_a_or_b); - i_authKey = i_authKey.modPow(new BigInteger(1, encryptedChat.a_or_b), new BigInteger(1, UserConfig.secretPBytes)); + i_authKey = i_authKey.modPow(new BigInteger(1, encryptedChat.a_or_b), new BigInteger(1, MessagesStorage.secretPBytes)); byte[] authKey = i_authKey.toByteArray(); if (authKey.length > 256) { @@ -4553,25 +4566,25 @@ public class MessagesController implements NotificationCenter.NotificationCenter acceptingChats.put(encryptedChat.id, encryptedChat); TLRPC.TL_messages_getDhConfig req = new TLRPC.TL_messages_getDhConfig(); req.random_length = 256; - req.version = UserConfig.lastSecretVersion; + req.version = MessagesStorage.lastSecretVersion; ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() { @Override public void run(TLObject response, TLRPC.TL_error error) { if (error == null) { TLRPC.messages_DhConfig res = (TLRPC.messages_DhConfig)response; if (response instanceof TLRPC.TL_messages_dhConfig) { - UserConfig.secretPBytes = res.p; - UserConfig.secretG = res.g; - UserConfig.lastSecretVersion = res.version; - UserConfig.saveConfig(); + MessagesStorage.secretPBytes = res.p; + MessagesStorage.secretG = res.g; + MessagesStorage.lastSecretVersion = res.version; + MessagesStorage.Instance.saveSecretParams(MessagesStorage.lastSecretVersion, MessagesStorage.secretG, MessagesStorage.secretPBytes); } byte[] salt = new byte[256]; for (int a = 0; a < 256; a++) { salt[a] = (byte)((byte)(random.nextDouble() * 255) ^ res.random[a]); } encryptedChat.a_or_b = salt; - BigInteger i_g_b = BigInteger.valueOf(UserConfig.secretG); - i_g_b = i_g_b.modPow(new BigInteger(1, salt), new BigInteger(1, UserConfig.secretPBytes)); + BigInteger i_g_b = BigInteger.valueOf(MessagesStorage.secretG); + i_g_b = i_g_b.modPow(new BigInteger(1, salt), new BigInteger(1, MessagesStorage.secretPBytes)); byte[] g_b = i_g_b.toByteArray(); if (g_b.length > 256) { byte[] correctedAuth = new byte[256]; @@ -4580,7 +4593,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter } BigInteger i_authKey = new BigInteger(1, encryptedChat.g_a); - i_authKey = i_authKey.modPow(new BigInteger(1, salt), new BigInteger(1, UserConfig.secretPBytes)); + i_authKey = i_authKey.modPow(new BigInteger(1, salt), new BigInteger(1, MessagesStorage.secretPBytes)); byte[] authKey = i_authKey.toByteArray(); if (authKey.length > 256) { @@ -4643,24 +4656,24 @@ public class MessagesController implements NotificationCenter.NotificationCenter progressDialog.show(); TLRPC.TL_messages_getDhConfig req = new TLRPC.TL_messages_getDhConfig(); req.random_length = 256; - req.version = UserConfig.lastSecretVersion; + req.version = MessagesStorage.lastSecretVersion; ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() { @Override public void run(TLObject response, TLRPC.TL_error error) { if (error == null) { TLRPC.messages_DhConfig res = (TLRPC.messages_DhConfig)response; if (response instanceof TLRPC.TL_messages_dhConfig) { - UserConfig.secretPBytes = res.p; - UserConfig.secretG = res.g; - UserConfig.lastSecretVersion = res.version; - UserConfig.saveConfig(); + MessagesStorage.secretPBytes = res.p; + MessagesStorage.secretG = res.g; + MessagesStorage.lastSecretVersion = res.version; + MessagesStorage.Instance.saveSecretParams(MessagesStorage.lastSecretVersion, MessagesStorage.secretG, MessagesStorage.secretPBytes); } final byte[] salt = new byte[256]; for (int a = 0; a < 256; a++) { salt[a] = (byte)((byte)(random.nextDouble() * 255) ^ res.random[a]); } - BigInteger i_g_a = BigInteger.valueOf(UserConfig.secretG); - i_g_a = i_g_a.modPow(new BigInteger(1, salt), new BigInteger(1, UserConfig.secretPBytes)); + BigInteger i_g_a = BigInteger.valueOf(MessagesStorage.secretG); + i_g_a = i_g_a.modPow(new BigInteger(1, salt), new BigInteger(1, MessagesStorage.secretPBytes)); byte[] g_a = i_g_a.toByteArray(); if (g_a.length > 256) { byte[] correctedAuth = new byte[256]; @@ -4668,7 +4681,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter g_a = correctedAuth; } - final TLRPC.User user = MessagesController.Instance.users.get(user_id); + final TLRPC.User user = users.get(user_id); TLRPC.InputUser inputUser; if (user instanceof TLRPC.TL_userForeign || user instanceof TLRPC.TL_userRequest) { inputUser = new TLRPC.TL_inputUserForeign(); @@ -4735,7 +4748,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter AlertDialog.Builder builder = new AlertDialog.Builder(context); builder.setTitle(context.getString(R.string.AppName)); builder.setMessage(String.format(context.getString(R.string.CreateEncryptedChatOutdatedError), user.first_name, user.first_name)); - builder.setPositiveButton(Utilities.applicationContext.getString(R.string.OK), null); + builder.setPositiveButton(ApplicationLoader.applicationContext.getString(R.string.OK), null); builder.show().setCanceledOnTouchOutside(true); } } diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java index ed4896ebf..bf0ffb5aa 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java @@ -17,6 +17,7 @@ import org.telegram.SQLite.SQLitePreparedStatement; import org.telegram.TL.TLClassStore; import org.telegram.TL.TLObject; import org.telegram.TL.TLRPC; +import org.telegram.ui.ApplicationLoader; import java.io.File; import java.util.ArrayList; @@ -28,6 +29,13 @@ public class MessagesStorage { public DispatchQueue storageQueue = new DispatchQueue("storageQueue"); private SQLiteDatabase database; private File cacheFile; + public static int lastDateValue = 0; + public static int lastPtsValue = 0; + public static int lastQtsValue = 0; + public static int lastSeqValue = 0; + public static int lastSecretVersion = 0; + public static byte[] secretPBytes = null; + public static int secretG = 0; public static final int wallpapersDidLoaded = 171; public static MessagesStorage Instance = new MessagesStorage(); @@ -38,7 +46,7 @@ public class MessagesStorage { } public void openDatabase() { - cacheFile = new File(Utilities.applicationContext.getFilesDir(), "cache4.db"); + cacheFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "cache4.db"); boolean createTable = false; //cacheFile.delete(); if (!cacheFile.exists()) { @@ -60,6 +68,8 @@ public class MessagesStorage { database.executeFast("CREATE TABLE wallpapers(uid INTEGER PRIMARY KEY, data BLOB)").stepThis().dispose(); database.executeFast("CREATE TABLE randoms(random_id INTEGER PRIMARY KEY, mid INTEGER)").stepThis().dispose(); database.executeFast("CREATE TABLE enc_tasks(date INTEGER, data BLOB)").stepThis().dispose(); + database.executeFast("CREATE TABLE params(id INTEGER PRIMARY KEY, seq INTEGER, pts INTEGER, date INTEGER, qts INTEGER, lsv INTEGER, sg INTEGER, pbytes BLOB)").stepThis().dispose(); + database.executeFast("INSERT INTO params VALUES(1, 0, 0, 0, 0, 0, 0, NULL)").stepThis().dispose(); database.executeFast("CREATE INDEX IF NOT EXISTS date_idx_dialogs ON dialogs(date);").stepThis().dispose(); database.executeFast("CREATE INDEX IF NOT EXISTS date_idx_enc_tasks ON enc_tasks(date);").stepThis().dispose(); @@ -69,6 +79,41 @@ public class MessagesStorage { database.executeFast("CREATE INDEX IF NOT EXISTS uid_mid_idx_media ON media(uid, mid);").stepThis().dispose(); database.executeFast("CREATE INDEX IF NOT EXISTS ttl_idx_messages ON messages(ttl);").stepThis().dispose(); database.executeFast("CREATE INDEX IF NOT EXISTS read_state_out_idx_messages ON messages(read_state, out);").stepThis().dispose(); + } else { + SQLiteCursor cursor = database.queryFinalized("SELECT count(*) FROM sqlite_master WHERE type='table' AND name='params'"); + boolean create = false; + if (cursor.next()) { + int count = cursor.intValue(0); + if (count == 0) { + create = true; + } + } else { + create = true; + } + cursor.dispose(); + if (create) { + database.executeFast("CREATE TABLE params(id INTEGER PRIMARY KEY, seq INTEGER, pts INTEGER, date INTEGER, qts INTEGER, lsv INTEGER, sg INTEGER, pbytes BLOB)").stepThis().dispose(); + database.executeFast("INSERT INTO params VALUES(1, 0, 0, 0, 0, 0, 0, NULL)").stepThis().dispose(); + } else { + cursor = database.queryFinalized("SELECT seq, pts, date, qts, lsv, sg, pbytes FROM params WHERE id = 1"); + if (cursor.next()) { + lastSeqValue = cursor.intValue(0); + lastPtsValue = cursor.intValue(1); + lastDateValue = cursor.intValue(2); + lastQtsValue = cursor.intValue(3); + lastSecretVersion = cursor.intValue(4); + secretG = cursor.intValue(5); + if (cursor.isNull(6)) { + secretPBytes = null; + } else { + secretPBytes = cursor.byteArrayValue(6); + if (secretPBytes != null && secretPBytes.length == 1) { + secretPBytes = null; + } + } + } + cursor.dispose(); + } } } catch (Exception e) { e.printStackTrace(); @@ -79,6 +124,13 @@ public class MessagesStorage { storageQueue.postRunnable(new Runnable() { @Override public void run() { + lastDateValue = 0; + lastSeqValue = 0; + lastPtsValue = 0; + lastQtsValue = 0; + lastSecretVersion = 0; + secretPBytes = null; + secretG = 0; if (database != null) { database.close(); database = null; @@ -88,15 +140,15 @@ public class MessagesStorage { cacheFile = null; } try { - File old = new File(Utilities.applicationContext.getFilesDir(), "cache.db"); + File old = new File(ApplicationLoader.applicationContext.getFilesDir(), "cache.db"); if (old.exists()) { old.delete(); } - old = new File(Utilities.applicationContext.getFilesDir(), "cache2.db"); + old = new File(ApplicationLoader.applicationContext.getFilesDir(), "cache2.db"); if (old.exists()) { old.delete(); } - old = new File(Utilities.applicationContext.getFilesDir(), "cache3.db"); + old = new File(ApplicationLoader.applicationContext.getFilesDir(), "cache3.db"); if (old.exists()) { old.delete(); } @@ -108,6 +160,47 @@ public class MessagesStorage { }); } + public void saveSecretParams(final int lsv, final int sg, final byte[] pbytes) { + storageQueue.postRunnable(new Runnable() { + @Override + public void run() { + try { + SQLitePreparedStatement state = database.executeFast("UPDATE params SET lsv = ?, sg = ?, pbytes = ? WHERE id = 1"); + state.bindInteger(1, lsv); + state.bindInteger(2, sg); + if (pbytes != null) { + state.bindByteArray(3, pbytes); + } else { + state.bindByteArray(3, new byte[1]); + } + state.step(); + state.dispose(); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } + + public void saveDiffParams(final int seq, final int pts, final int date, final int qts) { + storageQueue.postRunnable(new Runnable() { + @Override + public void run() { + try { + SQLitePreparedStatement state = database.executeFast("UPDATE params SET seq = ?, pts = ?, date = ?, qts = ? WHERE id = 1"); + state.bindInteger(1, seq); + state.bindInteger(2, pts); + state.bindInteger(3, date); + state.bindInteger(4, qts); + state.step(); + state.dispose(); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } + public void putWallpapers(final ArrayList wallPapers) { storageQueue.postRunnable(new Runnable() { @Override diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java b/TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java index 1c5b14a34..17f9e5196 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java @@ -8,8 +8,12 @@ package org.telegram.messenger; +import android.content.Context; +import android.content.SharedPreferences; + import org.telegram.TL.TLClassStore; import org.telegram.TL.TLRPC; +import org.telegram.ui.ApplicationLoader; import java.io.File; import java.io.FileOutputStream; @@ -18,17 +22,10 @@ public class UserConfig { public static TLRPC.User currentUser; public static int clientUserId = 0; public static boolean clientActivated = false; - public static int lastDateValue = 0; - public static int lastPtsValue = 0; - public static int lastQtsValue = 0; - public static int lastSeqValue = 0; public static boolean registeredForPush = false; public static String pushString = ""; public static int lastSendMessageId = -1; public static int lastLocalId = -1; - public static int lastSecretVersion = 0; - public static byte[] secretPBytes = null; - public static int secretG = 0; public static String contactsHash = ""; public static String importHash = ""; private final static Integer sync = 1; @@ -43,64 +40,58 @@ public class UserConfig { return id; } - public static void saveConfig() { + public static void saveConfig(boolean withFile) { synchronized (sync) { SerializedData data = new SerializedData(); if (currentUser != null) { - data.writeInt32(1); + data.writeInt32(2); currentUser.serializeToStream(data); clientUserId = currentUser.id; clientActivated = true; - data.writeInt32(lastDateValue); - data.writeInt32(lastPtsValue); - data.writeInt32(lastSeqValue); - data.writeBool(registeredForPush); - data.writeString(pushString); - data.writeInt32(lastSendMessageId); - data.writeInt32(lastLocalId); - data.writeString(contactsHash); - data.writeString(importHash); - data.writeBool(saveIncomingPhotos); - data.writeInt32(lastQtsValue); - data.writeInt32(lastSecretVersion); - if (secretPBytes != null) { - data.writeInt32(1); - data.writeByteArray(secretPBytes); - } else { - data.writeInt32(0); - } - data.writeInt32(secretG); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("userconfing", Context.MODE_PRIVATE); + SharedPreferences.Editor editor = preferences.edit(); + editor.putBoolean("registeredForPush", registeredForPush); + editor.putString("pushString", pushString); + editor.putInt("lastSendMessageId", lastSendMessageId); + editor.putInt("lastLocalId", lastLocalId); + editor.putString("contactsHash", contactsHash); + editor.putString("importHash", importHash); + editor.putBoolean("saveIncomingPhotos", saveIncomingPhotos); + editor.commit(); } else { data.writeInt32(0); } - try { - File configFile = new File(Utilities.applicationContext.getFilesDir(), "user.dat"); - if (!configFile.exists()) { - configFile.createNewFile(); + if (withFile) { + try { + File configFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "user.dat"); + if (!configFile.exists()) { + configFile.createNewFile(); + } + FileOutputStream stream = new FileOutputStream(configFile); + stream.write(data.toByteArray()); + stream.close(); + } catch (Exception e) { + e.printStackTrace(); } - FileOutputStream stream = new FileOutputStream(configFile); - stream.write(data.toByteArray()); - stream.close(); - } catch (Exception e) { - e.printStackTrace(); } } } public static void loadConfig() { synchronized (sync) { - File configFile = new File(Utilities.applicationContext.getFilesDir(), "user.dat"); + File configFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "user.dat"); if (configFile.exists()) { try { SerializedData data = new SerializedData(configFile); - if (data.readInt32() != 0) { + int ver = data.readInt32(); + if (ver == 1) { int constructor = data.readInt32(); currentUser = (TLRPC.TL_userSelf)TLClassStore.Instance().TLdeserialize(data, constructor); clientUserId = currentUser.id; clientActivated = true; - lastDateValue = data.readInt32(); - lastPtsValue = data.readInt32(); - lastSeqValue = data.readInt32(); + MessagesStorage.lastDateValue = data.readInt32(); + MessagesStorage.lastPtsValue = data.readInt32(); + MessagesStorage.lastSeqValue = data.readInt32(); registeredForPush = data.readBool(); pushString = data.readString(); lastSendMessageId = data.readInt32(); @@ -115,13 +106,27 @@ public class UserConfig { currentUser.status.expires = currentUser.status.was_online; } } - lastQtsValue = data.readInt32(); - lastSecretVersion = data.readInt32(); + MessagesStorage.lastQtsValue = data.readInt32(); + MessagesStorage.lastSecretVersion = data.readInt32(); int val = data.readInt32(); if (val == 1) { - secretPBytes = data.readByteArray(); + MessagesStorage.secretPBytes = data.readByteArray(); } - secretG = data.readInt32(); + MessagesStorage.secretG = data.readInt32(); + } else if (ver == 2) { + int constructor = data.readInt32(); + currentUser = (TLRPC.TL_userSelf)TLClassStore.Instance().TLdeserialize(data, constructor); + clientUserId = currentUser.id; + clientActivated = true; + + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("userconfing", Context.MODE_PRIVATE); + registeredForPush = preferences.getBoolean("registeredForPush", false); + pushString = preferences.getString("pushString", ""); + lastSendMessageId = preferences.getInt("lastSendMessageId", -1); + lastLocalId = preferences.getInt("lastLocalId", -1); + contactsHash = preferences.getString("contactsHash", ""); + importHash = preferences.getString("importHash", ""); + saveIncomingPhotos = preferences.getBoolean("saveIncomingPhotos", false); } } catch (Exception e) { e.printStackTrace(); @@ -134,15 +139,12 @@ public class UserConfig { clientUserId = 0; clientActivated = false; currentUser = null; - lastDateValue = 0; - lastSeqValue = 0; - lastPtsValue = 0; registeredForPush = false; contactsHash = ""; lastLocalId = -1; importHash = ""; lastSendMessageId = -1; saveIncomingPhotos = false; - saveConfig(); + 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 85559499a..5918636a2 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/Utilities.java @@ -18,6 +18,7 @@ import android.os.Environment; import android.os.Handler; import android.text.Html; import android.text.SpannableStringBuilder; +import android.text.format.DateFormat; import android.util.AttributeSet; import android.util.Log; import android.view.View; @@ -25,6 +26,7 @@ import android.view.inputmethod.InputMethodManager; import org.telegram.TL.TLClassStore; import org.telegram.TL.TLObject; +import org.telegram.ui.ApplicationLoader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -50,7 +52,6 @@ import java.util.zip.GZIPInputStream; import javax.crypto.Cipher; public class Utilities { - public static Context applicationContext; public static Handler applicationHandler; private final static Integer lock = 1; @@ -77,10 +78,10 @@ public class Utilities { public static File getCacheDir() { if (externalCacheNotAvailableState == 1 || externalCacheNotAvailableState == 0 && Environment.getExternalStorageState().startsWith(Environment.MEDIA_MOUNTED)) { externalCacheNotAvailableState = 1; - return applicationContext.getExternalCacheDir(); + return ApplicationLoader.applicationContext.getExternalCacheDir(); } externalCacheNotAvailableState = 2; - return applicationContext.getCacheDir(); + return ApplicationLoader.applicationContext.getCacheDir(); } public static TPFactorizedValue getFactorizedValue(long what) { @@ -230,7 +231,7 @@ public class Utilities { synchronized (cache) { if (!cache.containsKey(assetPath)) { try { - Typeface t = Typeface.createFromAsset(applicationContext.getAssets(), + Typeface t = Typeface.createFromAsset(ApplicationLoader.applicationContext.getAssets(), assetPath); cache.put(assetPath, t); } catch (Exception e) { @@ -304,11 +305,19 @@ public class Utilities { formatterYearMax = FastDateFormat.getInstance("dd.MM.yyyy", locale); chatDate = FastDateFormat.getInstance("d MMMM", locale); chatFullDate = FastDateFormat.getInstance("d MMMM yyyy", locale); - if (lang != null && lang.toLowerCase().equals("ar")) { - formatterDay = FastDateFormat.getInstance("h:mm a", locale); + if (lang != null) { + if (DateFormat.is24HourFormat(ApplicationLoader.applicationContext)) { + formatterDay = FastDateFormat.getInstance("HH:mm", locale); + } else { + if (lang.toLowerCase().equals("ar")) { + formatterDay = FastDateFormat.getInstance("h:mm a", locale); + } else { + formatterDay = FastDateFormat.getInstance("h:mm a", Locale.US); + } + } } else { - formatterDay = FastDateFormat.getInstance("h:mm a", Locale.US);} - + formatterDay = FastDateFormat.getInstance("h:mm a", Locale.US); + } } public static String formatDateChat(long date) { @@ -335,7 +344,7 @@ public class Utilities { if (dateDay == day && year == dateYear) { return formatterDay.format(new Date(date * 1000)); } else if (dateDay + 1 == day && year == dateYear) { - return applicationContext.getResources().getString(R.string.Yesterday); + return ApplicationLoader.applicationContext.getResources().getString(R.string.Yesterday); } else if (year == dateYear) { return formatterMonth.format(new Date(date * 1000)); } else { @@ -352,13 +361,13 @@ public class Utilities { int dateYear = rightNow.get(Calendar.YEAR); if (dateDay == day && year == dateYear) { - return String.format("%s %s", applicationContext.getResources().getString(R.string.TodayAt), formatterDay.format(new Date(date * 1000))); + return String.format("%s %s", ApplicationLoader.applicationContext.getResources().getString(R.string.TodayAt), formatterDay.format(new Date(date * 1000))); } else if (dateDay + 1 == day && year == dateYear) { - return String.format("%s %s", applicationContext.getResources().getString(R.string.YesterdayAt), formatterDay.format(new Date(date * 1000))); + return String.format("%s %s", ApplicationLoader.applicationContext.getResources().getString(R.string.YesterdayAt), formatterDay.format(new Date(date * 1000))); } else if (year == dateYear) { - return String.format("%s %s %s", formatterMonth.format(new Date(date * 1000)), applicationContext.getResources().getString(R.string.OtherAt), formatterDay.format(new Date(date * 1000))); + return String.format("%s %s %s", formatterMonth.format(new Date(date * 1000)), ApplicationLoader.applicationContext.getResources().getString(R.string.OtherAt), formatterDay.format(new Date(date * 1000))); } else { - return String.format("%s %s %s", formatterYear.format(new Date(date * 1000)), applicationContext.getResources().getString(R.string.OtherAt), formatterDay.format(new Date(date * 1000))); + return String.format("%s %s %s", formatterYear.format(new Date(date * 1000)), ApplicationLoader.applicationContext.getResources().getString(R.string.OtherAt), formatterDay.format(new Date(date * 1000))); } } @@ -401,7 +410,7 @@ public class Utilities { public static void RunOnUIThread(Runnable runnable) { synchronized (lock) { if (applicationHandler == null) { - applicationHandler = new Handler(applicationContext.getMainLooper()); + applicationHandler = new Handler(ApplicationLoader.applicationContext.getMainLooper()); } applicationHandler.post(runnable); } @@ -419,18 +428,25 @@ public class Utilities { R.drawable.user_placeholder_orange}; public static int[] arrGroupsAvatars = { - R.drawable.group_placeholder_red, R.drawable.group_placeholder_green, - R.drawable.group_placeholder_yellow, + R.drawable.group_placeholder_red, R.drawable.group_placeholder_blue, - R.drawable.group_placeholder_purple, - R.drawable.group_placeholder_pink, - R.drawable.group_placeholder_cyan, - R.drawable.group_placeholder_orange}; + R.drawable.group_placeholder_yellow}; public static int getColorIndex(int id) { + int[] arr; + if (id >= 0) { + arr = arrUsersAvatars; + } else { + arr = arrGroupsAvatars; + } try { - String str = String.format(Locale.US, "%d%d", id, UserConfig.clientUserId); + String str; + if (id >= 0) { + str = String.format(Locale.US, "%d%d", id, UserConfig.clientUserId); + } else { + str = String.format(Locale.US, "%d", id); + } if (str.length() > 15) { str = str.substring(0, 15); } @@ -440,11 +456,11 @@ public class Utilities { if (b < 0) { b += 256; } - return Math.abs(b) % arrColors.length; + return Math.abs(b) % arr.length; } catch (Exception e) { e.printStackTrace(); } - return id % arrColors.length; + return id % arr.length; } public static int getColorForId(int id) { @@ -462,7 +478,7 @@ public class Utilities { } public static int getGroupAvatarForId(int id) { - return arrGroupsAvatars[getColorIndex(id)]; + return arrGroupsAvatars[getColorIndex(-id)]; } public static String MD5(String md5) { @@ -488,7 +504,7 @@ public class Utilities { File f = new File(fromPath); Uri contentUri = Uri.fromFile(f); mediaScanIntent.setData(contentUri); - applicationContext.sendBroadcast(mediaScanIntent); + ApplicationLoader.applicationContext.sendBroadcast(mediaScanIntent); } public static void addMediaToGallery(Uri uri) { @@ -497,13 +513,13 @@ public class Utilities { } Intent mediaScanIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE); mediaScanIntent.setData(uri); - applicationContext.sendBroadcast(mediaScanIntent); + ApplicationLoader.applicationContext.sendBroadcast(mediaScanIntent); } private static File getAlbumDir() { File storageDir = null; if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) { - storageDir = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), applicationContext.getResources().getString(R.string.AppName)); + storageDir = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), ApplicationLoader.applicationContext.getResources().getString(R.string.AppName)); if (storageDir != null) { if (! storageDir.mkdirs()) { if (! storageDir.exists()){ @@ -578,7 +594,7 @@ public class Utilities { /* String fileName = "VID" + id + ".mp4"; - return new File(Utilities.applicationContext.getCacheDir(), fileName); + return new File(ApplicationLoader.applicationContext.getCacheDir(), fileName); */ } catch (Exception e) { e.printStackTrace(); diff --git a/TMessagesProj/src/main/java/org/telegram/objects/MessageObject.java b/TMessagesProj/src/main/java/org/telegram/objects/MessageObject.java index 7e662b9eb..d54d201bf 100644 --- a/TMessagesProj/src/main/java/org/telegram/objects/MessageObject.java +++ b/TMessagesProj/src/main/java/org/telegram/objects/MessageObject.java @@ -16,6 +16,7 @@ import org.telegram.messenger.MessagesController; import org.telegram.messenger.R; import org.telegram.messenger.UserConfig; import org.telegram.messenger.Utilities; +import org.telegram.ui.ApplicationLoader; import java.util.AbstractMap; import java.util.ArrayList; @@ -42,57 +43,57 @@ public class MessageObject { fromUser = MessagesController.Instance.users.get(message.from_id); } if (message.action instanceof TLRPC.TL_messageActionChatCreate) { - messageText = Utilities.applicationContext.getResources().getString(R.string.ActionCreateGroup).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); + messageText = ApplicationLoader.applicationContext.getResources().getString(R.string.ActionCreateGroup).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); } else if (message.action instanceof TLRPC.TL_messageActionChatDeleteUser) { if (message.action.user_id == message.from_id) { - messageText = Utilities.applicationContext.getResources().getString(R.string.ActionLeftUser).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); + messageText = ApplicationLoader.applicationContext.getResources().getString(R.string.ActionLeftUser).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); } else { TLRPC.User who = users.get(message.action.user_id); - String str = Utilities.applicationContext.getResources().getString(R.string.ActionKickUser); + String str = ApplicationLoader.applicationContext.getResources().getString(R.string.ActionKickUser); messageText = str.replace("un2", Utilities.formatName(who.first_name, who.last_name)).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); } } else if (message.action instanceof TLRPC.TL_messageActionChatAddUser) { TLRPC.User whoUser = users.get(message.action.user_id); - String str = Utilities.applicationContext.getResources().getString(R.string.ActionAddUser); + String str = ApplicationLoader.applicationContext.getResources().getString(R.string.ActionAddUser); messageText = str.replace("un2", Utilities.formatName(whoUser.first_name, whoUser.last_name)).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); } else if (message.action instanceof TLRPC.TL_messageActionChatEditPhoto) { photoThumbs = new ArrayList(); for (TLRPC.PhotoSize size : message.action.photo.sizes) { photoThumbs.add(new PhotoObject(size)); } - messageText = Utilities.applicationContext.getResources().getString(R.string.ActionChangedPhoto).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); + messageText = ApplicationLoader.applicationContext.getResources().getString(R.string.ActionChangedPhoto).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); } else if (message.action instanceof TLRPC.TL_messageActionChatEditTitle) { - messageText = Utilities.applicationContext.getResources().getString(R.string.ActionChangedTitle).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)).replace("un2", message.action.title); + messageText = ApplicationLoader.applicationContext.getResources().getString(R.string.ActionChangedTitle).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)).replace("un2", message.action.title); } else if (message.action instanceof TLRPC.TL_messageActionChatDeletePhoto) { - messageText = Utilities.applicationContext.getResources().getString(R.string.ActionRemovedPhoto).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); + messageText = ApplicationLoader.applicationContext.getResources().getString(R.string.ActionRemovedPhoto).replace("un1", Utilities.formatName(fromUser.first_name, fromUser.last_name)); } else if (message.action instanceof TLRPC.TL_messageActionTTLChange) { if (message.action.ttl != 0) { String timeString; if (message.action.ttl == 2) { - timeString = Utilities.applicationContext.getResources().getString(R.string.MessageLifetime2s); + timeString = ApplicationLoader.applicationContext.getResources().getString(R.string.MessageLifetime2s); } else if (message.action.ttl == 5) { - timeString = Utilities.applicationContext.getResources().getString(R.string.MessageLifetime5s); + timeString = ApplicationLoader.applicationContext.getResources().getString(R.string.MessageLifetime5s); } else if (message.action.ttl == 60) { - timeString = Utilities.applicationContext.getResources().getString(R.string.MessageLifetime1m); + timeString = ApplicationLoader.applicationContext.getResources().getString(R.string.MessageLifetime1m); } else if (message.action.ttl == 60 * 60) { - timeString = Utilities.applicationContext.getResources().getString(R.string.MessageLifetime1h); + timeString = ApplicationLoader.applicationContext.getResources().getString(R.string.MessageLifetime1h); } else if (message.action.ttl == 60 * 60 * 24) { - timeString = Utilities.applicationContext.getResources().getString(R.string.MessageLifetime1d); + timeString = ApplicationLoader.applicationContext.getResources().getString(R.string.MessageLifetime1d); } else if (message.action.ttl == 60 * 60 * 24 * 7) { - timeString = Utilities.applicationContext.getResources().getString(R.string.MessageLifetime1w); + timeString = ApplicationLoader.applicationContext.getResources().getString(R.string.MessageLifetime1w); } else { timeString = String.format("%d", message.action.ttl); } if (message.from_id == UserConfig.clientUserId) { - messageText = String.format(Utilities.applicationContext.getResources().getString(R.string.MessageLifetimeChangedOutgoing), timeString); + messageText = String.format(ApplicationLoader.applicationContext.getResources().getString(R.string.MessageLifetimeChangedOutgoing), timeString); } else { - messageText = String.format(Utilities.applicationContext.getResources().getString(R.string.MessageLifetimeChanged), fromUser.first_name, timeString); + messageText = String.format(ApplicationLoader.applicationContext.getResources().getString(R.string.MessageLifetimeChanged), fromUser.first_name, timeString); } } else { if (message.from_id == UserConfig.clientUserId) { - messageText = String.format(Utilities.applicationContext.getResources().getString(R.string.MessageLifetimeRemoved), Utilities.applicationContext.getResources().getString(R.string.FromYou)); + messageText = String.format(ApplicationLoader.applicationContext.getResources().getString(R.string.MessageLifetimeRemoved), ApplicationLoader.applicationContext.getResources().getString(R.string.FromYou)); } else { - messageText = String.format(Utilities.applicationContext.getResources().getString(R.string.MessageLifetimeRemoved), fromUser.first_name); + messageText = String.format(ApplicationLoader.applicationContext.getResources().getString(R.string.MessageLifetimeRemoved), fromUser.first_name); } } } @@ -107,7 +108,7 @@ public class MessageObject { imagePreview = obj.image; } } - messageText = Utilities.applicationContext.getResources().getString(R.string.AttachPhoto); + messageText = ApplicationLoader.applicationContext.getResources().getString(R.string.AttachPhoto); } else if (message.media instanceof TLRPC.TL_messageMediaVideo) { photoThumbs = new ArrayList(); PhotoObject obj = new PhotoObject(message.media.video.thumb); @@ -115,11 +116,11 @@ public class MessageObject { if (imagePreview == null && obj.image != null) { imagePreview = obj.image; } - messageText = Utilities.applicationContext.getResources().getString(R.string.AttachVideo); + messageText = ApplicationLoader.applicationContext.getResources().getString(R.string.AttachVideo); } else if (message.media instanceof TLRPC.TL_messageMediaGeo) { - messageText = Utilities.applicationContext.getResources().getString(R.string.AttachLocation); + messageText = ApplicationLoader.applicationContext.getResources().getString(R.string.AttachLocation); } else if (message.media instanceof TLRPC.TL_messageMediaContact) { - messageText = Utilities.applicationContext.getResources().getString(R.string.AttachContact); + messageText = ApplicationLoader.applicationContext.getResources().getString(R.string.AttachContact); } } else { messageText = message.message; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ApplicationActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ApplicationActivity.java index 627eed72b..cb32f2043 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ApplicationActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ApplicationActivity.java @@ -76,7 +76,6 @@ public class ApplicationActivity extends SherlockFragmentActivity implements Not } } setContentView(R.layout.application_layout); - notificationView = (NotificationView) getLayoutInflater().inflate(R.layout.notification_layout, null); shadowView = findViewById(R.id.shadow); NotificationCenter.Instance.addObserver(this, 1234); NotificationCenter.Instance.addObserver(this, 658); @@ -342,6 +341,9 @@ public class ApplicationActivity extends SherlockFragmentActivity implements Not @Override protected void onResume() { super.onResume(); + if (notificationView == null && getLayoutInflater() != null) { + notificationView = (NotificationView) getLayoutInflater().inflate(R.layout.notification_layout, null); + } fixLayout(); checkForCrashes(); checkForUpdates(); @@ -389,7 +391,7 @@ public class ApplicationActivity extends SherlockFragmentActivity implements Not WindowManager manager = (WindowManager) getSystemService(WINDOW_SERVICE); Display display = manager.getDefaultDisplay(); int rotation = display.getRotation(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; int height; int currentActionBarHeight = getSupportActionBar().getHeight(); @@ -575,7 +577,7 @@ public class ApplicationActivity extends SherlockFragmentActivity implements Not ApplicationLoader.fragmentsStack.remove(ApplicationLoader.fragmentsStack.size() - 1); current.onFragmentDestroy(); } - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); boolean animations = preferences.getBoolean("view_animations", true); if (animations) { if (bySwipe) { @@ -614,7 +616,7 @@ public class ApplicationActivity extends SherlockFragmentActivity implements Not BaseFragment prev = ApplicationLoader.fragmentsStack.get(ApplicationLoader.fragmentsStack.size() - 2); FragmentManager fm = getSupportFragmentManager(); FragmentTransaction fTrans = fm.beginTransaction(); - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); boolean animations = preferences.getBoolean("view_animations", true); if (animations) { if (bySwipe) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ApplicationLoader.java b/TMessagesProj/src/main/java/org/telegram/ui/ApplicationLoader.java index 986b4c1a4..219b7e175 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ApplicationLoader.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ApplicationLoader.java @@ -47,6 +47,7 @@ public class ApplicationLoader extends Application { private static final int PLAY_SERVICES_RESOLUTION_REQUEST = 9000; public static long lastPauseTime; public static Bitmap cachedWallpaper = null; + public static Context applicationContext; public static ApplicationLoader Instance = null; @@ -60,18 +61,19 @@ public class ApplicationLoader extends Application { java.lang.System.setProperty("java.net.preferIPv4Stack", "true"); java.lang.System.setProperty("java.net.preferIPv6Addresses", "false"); - Utilities.applicationContext = getApplicationContext(); + applicationContext = getApplicationContext(); + Utilities.getTypeface("fonts/rlight.ttf"); UserConfig.loadConfig(); SharedPreferences preferences = getSharedPreferences("Notifications", MODE_PRIVATE); if (UserConfig.currentUser != null) { int value = preferences.getInt("version", 0); if (value != 15) { UserConfig.contactsHash = ""; - UserConfig.lastDateValue = 0; - UserConfig.lastPtsValue = 0; - UserConfig.lastSeqValue = 0; - UserConfig.lastQtsValue = 0; - UserConfig.saveConfig(); + MessagesStorage.lastDateValue = 0; + MessagesStorage.lastPtsValue = 0; + MessagesStorage.lastSeqValue = 0; + MessagesStorage.lastQtsValue = 0; + UserConfig.saveConfig(false); MessagesStorage.Instance.cleanUp(); ArrayList users = new ArrayList(); users.add(UserConfig.currentUser); @@ -80,6 +82,8 @@ public class ApplicationLoader extends Application { SharedPreferences.Editor editor = preferences.edit(); editor.putInt("version", 15); editor.commit(); + } else { + MessagesStorage init = MessagesStorage.Instance; } MessagesController.Instance.users.put(UserConfig.clientUserId, UserConfig.currentUser); } else { @@ -102,7 +106,7 @@ public class ApplicationLoader extends Application { if (checkPlayServices()) { gcm = GoogleCloudMessaging.getInstance(this); - regid = getRegistrationId(Utilities.applicationContext); + regid = getRegistrationId(applicationContext); if (regid.length() == 0) { registerInBackground(); @@ -171,11 +175,11 @@ public class ApplicationLoader extends Application { String msg; try { if (gcm == null) { - gcm = GoogleCloudMessaging.getInstance(Utilities.applicationContext); + gcm = GoogleCloudMessaging.getInstance(applicationContext); } regid = gcm.register(SENDER_ID); sendRegistrationIdToBackend(true); - storeRegistrationId(Utilities.applicationContext, regid); + storeRegistrationId(applicationContext, regid); return true; } catch (IOException ex) { ex.printStackTrace(); @@ -191,7 +195,7 @@ public class ApplicationLoader extends Application { public void run() { UserConfig.pushString = regid; UserConfig.registeredForPush = !isNew; - UserConfig.saveConfig(); + UserConfig.saveConfig(false); MessagesController.Instance.registerForPush(regid); } }); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 15e67bf3c..be1a03948 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -281,7 +281,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa NotificationCenter.Instance.addObserver(this, 997); loading = true; MessagesController.Instance.loadMessages(dialog_id, 0, 30, 0, true, 0, classGuid); - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); fontSize = preferences.getInt("fons_size", 16); return true; } @@ -360,7 +360,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ImageView backgroundImage = (ImageView) fragmentView.findViewById(R.id.background_image); - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); int selectedBackground = preferences.getInt("selectedBackground", 1000001); int selectedColor = preferences.getInt("selectedColor", 0); if (selectedColor != 0) { @@ -371,7 +371,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa if (selectedBackground == 1000001) { backgroundImage.setImageResource(R.drawable.background_hd); } else { - File toFile = new File(Utilities.applicationContext.getFilesDir(), "wallpaper.jpg"); + File toFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper.jpg"); if (toFile.exists()) { if (ApplicationLoader.cachedWallpaper != null) { backgroundImage.setImageBitmap(ApplicationLoader.cachedWallpaper); @@ -419,11 +419,11 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa } if (isCustomTheme) { - centerProgress.setIndeterminateDrawable(Utilities.applicationContext.getResources().getDrawable(R.drawable.loading_custom_animation)); + centerProgress.setIndeterminateDrawable(ApplicationLoader.applicationContext.getResources().getDrawable(R.drawable.loading_custom_animation)); emptyView.setBackgroundResource(R.drawable.day_box_custom); } else { emptyView.setBackgroundResource(R.drawable.day_box); - centerProgress.setIndeterminateDrawable(Utilities.applicationContext.getResources().getDrawable(R.drawable.loading_animation)); + centerProgress.setIndeterminateDrawable(ApplicationLoader.applicationContext.getResources().getDrawable(R.drawable.loading_animation)); } emptyView.setPadding((int)(10 * displayDensity), (int)(26 * displayDensity), (int)(10 * displayDensity), 0); @@ -681,7 +681,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa Utilities.hideKeyboard(parentActivity.getCurrentFocus()); } } - parentActivity.invalidateOptionsMenu(); + if (parentActivity != null) { + parentActivity.invalidateOptionsMenu(); + } } private void addToLoadingFile(String path, ProgressBar bar) { @@ -833,15 +835,13 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa } if (currentChat != null) { - currentChat = MessagesController.Instance.chats.get(currentChat.id); actionBar.setTitle(Html.fromHtml("" + currentChat.title + "")); if (title != null) { title.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); title.setCompoundDrawablePadding(0); } } else if (currentUser != null) { - currentUser = MessagesController.Instance.users.get(currentUser.id); - if (currentUser.id != 333000 && !MessagesController.Instance.contactsByPhones.containsKey(currentUser.phone)) { + if (currentUser.id != 333000 && MessagesController.Instance.contactsDict.get(currentUser.id) == null) { if (currentUser.phone != null && currentUser.phone.length() != 0) { actionBar.setTitle(Html.fromHtml("" + PhoneFormat.Instance.format("+" + currentUser.phone) + "")); } else { @@ -1044,12 +1044,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa return; } Bitmap thumb = ThumbnailUtils.createVideoThumbnail(videoPath, MediaStore.Video.Thumbnails.MINI_KIND); - TLRPC.PhotoSize size; - if (currentEncryptedChat == null) { - size = FileLoader.scaleAndSaveImage(thumb, 320, 320, 87, false); - } else { - size = FileLoader.scaleAndSaveImage(thumb, 90, 90, 55, true); - } + TLRPC.PhotoSize size = FileLoader.scaleAndSaveImage(thumb, 90, 90, 55, currentEncryptedChat != null); if (size == null) { return; } @@ -1064,7 +1059,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa video.size = (int)temp.length(); } UserConfig.lastLocalId--; - UserConfig.saveConfig(); + UserConfig.saveConfig(false); MediaPlayer mp = MediaPlayer.create(parentActivity, Uri.fromFile(new File(videoPath))); video.duration = (int)Math.ceil(mp.getDuration() / 1000.0f); @@ -1293,7 +1288,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa } } } else if (id == MessagesController.closeChats) { - if (messsageEditText.isFocused()) { + if (messsageEditText != null && messsageEditText.isFocused()) { Utilities.hideKeyboard(messsageEditText); } removeSelfFromStack(); @@ -1481,7 +1476,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa if (currentUser == null) { topPanel.setVisibility(View.GONE); } else { - if (currentUser.phone != null && currentUser.phone.length() != 0 && MessagesController.Instance.contactsByPhones.get(currentUser.phone) != null) { + if (currentUser.phone != null && currentUser.phone.length() != 0 && MessagesController.Instance.contactsDict.get(currentUser.id) != null) { topPanel.setVisibility(View.GONE); } else { topPanel.setVisibility(View.VISIBLE); @@ -1657,7 +1652,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ((ApplicationActivity)parentActivity).showActionBar(); ((ApplicationActivity)parentActivity).updateActionBar(); fixLayout(); - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); String lastMessageText = preferences.getString("dialog_" + dialog_id, null); if (lastMessageText != null) { SharedPreferences.Editor editor = preferences.edit(); @@ -1708,7 +1703,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa MessagesController.Instance.openned_dialog_id = 0; if (messsageEditText != null && messsageEditText.length() != 0) { - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); editor.putString("dialog_" + dialog_id, messsageEditText.getText().toString()); editor.commit(); @@ -1725,12 +1720,12 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa chatListView.getViewTreeObserver().removeOnPreDrawListener(this); return false; } - WindowManager manager = (WindowManager) Utilities.applicationContext.getSystemService(Activity.WINDOW_SERVICE); + WindowManager manager = (WindowManager) ApplicationLoader.applicationContext.getSystemService(Activity.WINDOW_SERVICE); Display display = manager.getDefaultDisplay(); int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { @@ -2198,7 +2193,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa public boolean isGoogleMapsInstalled() { try { - ApplicationInfo info = Utilities.applicationContext.getPackageManager().getApplicationInfo("com.google.android.apps.maps", 0 ); + ApplicationInfo info = ApplicationLoader.applicationContext.getPackageManager().getApplicationInfo("com.google.android.apps.maps", 0 ); return true; } catch(PackageManager.NameNotFoundException e) { AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity); @@ -2216,9 +2211,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa } }); builder.setNegativeButton(R.string.Cancel, null); - AlertDialog dialog = builder.create(); - dialog.setCanceledOnTouchOutside(true); - dialog.show(); + visibleDialog = builder.create(); + visibleDialog.setCanceledOnTouchOutside(true); + visibleDialog.show(); return false; } } @@ -2417,9 +2412,9 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa ProgressBar progressBar = (ProgressBar)view.findViewById(R.id.progress); progressBar.setIndeterminate(true); if (isCustomTheme) { - progressBar.setIndeterminateDrawable(Utilities.applicationContext.getResources().getDrawable(R.drawable.loading_custom_animation)); + progressBar.setIndeterminateDrawable(ApplicationLoader.applicationContext.getResources().getDrawable(R.drawable.loading_custom_animation)); } else { - progressBar.setIndeterminateDrawable(Utilities.applicationContext.getResources().getDrawable(R.drawable.loading_animation)); + progressBar.setIndeterminateDrawable(ApplicationLoader.applicationContext.getResources().getDrawable(R.drawable.loading_animation)); } } return view; @@ -2755,7 +2750,7 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa } int placeHolderId = Utilities.getUserAvatarForId(contactUser.id); contactAvatar.setImage(photo, "50_50", placeHolderId); - if (contactUser.id != UserConfig.clientUserId && !MessagesController.Instance.contactsByPhones.containsKey(contactUser.phone)) { + if (contactUser.id != UserConfig.clientUserId && MessagesController.Instance.contactsDict.get(contactUser.id) == null) { addContactView.setVisibility(View.VISIBLE); } else { addContactView.setVisibility(View.GONE); @@ -3234,6 +3229,19 @@ public class ChatActivity extends BaseFragment implements SizeNotifierRelativeLa if (forwardedUserText != null) { forwardedUserText.setTypeface(typeface); + forwardedUserText.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + TLRPC.User fwdUser = MessagesController.Instance.users.get(message.messageOwner.fwd_from_id); + if (fwdUser != null && fwdUser.id != UserConfig.clientUserId) { + UserProfileActivity fragment = new UserProfileActivity(); + Bundle args = new Bundle(); + args.putInt("user_id", fwdUser.id); + fragment.setArguments(args); + ((ApplicationActivity)parentActivity).presentFragment(fragment, "user_" + fwdUser.id, false); + } + } + }); } if (videoTimeText != null) { videoTimeText.setTypeface(typeface); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java index 2e40ec340..655c09452 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java @@ -225,7 +225,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen ((ApplicationActivity)parentActivity).presentFragment(fragment, "user_" + user_id, false); } else { if (size + 7 == i) { - if (info.participants.size() < 100) { + if (info.participants.size() < 200) { openAddMenu(); } else { kickUser(null); @@ -375,7 +375,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { @@ -539,7 +539,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen int count = 6; if (info != null && !(info instanceof TLRPC.TL_chatParticipantsForbidden)) { count += info.participants.size() + 2; - if (info.participants.size() < 100) { + if (info.participants.size() < 200) { count++; } } @@ -673,7 +673,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen TextView textView = (TextView)view.findViewById(R.id.settings_row_text); View divider = view.findViewById(R.id.settings_row_divider); if (i == 2) { - SharedPreferences preferences = parentActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = mContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); String key = "notify_" + (-chat_id); boolean value = preferences.getBoolean(key, true); ImageView checkButton = (ImageView)view.findViewById(R.id.settings_row_check_button); @@ -696,7 +696,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen detailTextView.setTypeface(typeface); View divider = view.findViewById(R.id.settings_row_divider); if (i == 3) { - SharedPreferences preferences = parentActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = mContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); String name = preferences.getString("sound_chat_" + chat_id, getStringEntry(R.string.Default)); if (name.equals("NoSound")) { detailTextView.setText(getStringEntry(R.string.NoSound)); @@ -836,7 +836,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen return 4; } else { if (size + 7 == i) { - if (info != null && info.participants.size() < 100) { + if (info != null && info.participants.size() < 200) { return 5; } else { return 6; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java index e44f54629..b03d157aa 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileChangeNameActivity.java @@ -111,7 +111,7 @@ public class ChatProfileChangeNameActivity extends BaseFragment { int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { @@ -173,7 +173,7 @@ public class ChatProfileChangeNameActivity extends BaseFragment { } ((ApplicationActivity)parentActivity).updateActionBar(); fixLayout(); - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); boolean animations = preferences.getBoolean("view_animations", true); if (!animations) { firstNameField.requestFocus(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java index b81d94587..1cb3181df 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ContactAddActivity.java @@ -219,7 +219,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent ((ApplicationActivity)parentActivity).updateActionBar(); fixLayout(); - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); boolean animations = preferences.getBoolean("view_animations", true); if (!animations) { firstNameField.requestFocus(); @@ -245,7 +245,7 @@ public class ContactAddActivity extends BaseFragment implements NotificationCent int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java index aeccad8ce..4bc7be29a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java @@ -34,6 +34,8 @@ import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.widget.SearchView; + +import org.telegram.PhoneFormat.PhoneFormat; import org.telegram.TL.TLRPC; import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.MessagesController; @@ -231,7 +233,8 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter if (usePhone == null) { usePhone = phone; } - TLRPC.TL_contact cLocal = MessagesController.Instance.contactsByPhones.get(phone); + String cleanPhone = PhoneFormat.stripExceptNumbers(usePhone); + TLRPC.TL_contact cLocal = MessagesController.Instance.contactsByPhones.get(cleanPhone); if (cLocal != null) { if (cLocal.user_id == UserConfig.clientUserId) { return; @@ -257,7 +260,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter @Override public void onClick(DialogInterface dialogInterface, int i) { try { - String number = "+" + arg1; + String number = arg1; Intent intent = new Intent(Intent.ACTION_VIEW, Uri.fromParts("sms", number, null)); intent.putExtra("sms_body", getStringEntry(R.string.InviteText)); startActivity(intent); @@ -347,7 +350,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { @@ -529,7 +532,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter if (s.length() != 0) { searchWas = true; if (listView != null) { - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; listView.setPadding((int)(density * 16), listView.getPaddingTop(), (int)(density * 16), listView.getPaddingBottom()); listView.setAdapter(searchListViewAdapter); if(android.os.Build.VERSION.SDK_INT >= 11) { @@ -562,7 +565,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter searchWas = false; ViewGroup group = (ViewGroup)listView.getParent(); listView.setAdapter(listViewAdapter); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (!isRTL) { listView.setPadding((int)(density * 16), listView.getPaddingTop(), (int)(density * 30), listView.getPaddingBottom()); } else { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/GalleryImageViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/GalleryImageViewer.java index f97573f78..ca6dcc57d 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/GalleryImageViewer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/GalleryImageViewer.java @@ -179,7 +179,7 @@ public class GalleryImageViewer extends AbstractGalleryActivity implements Notif localPagerAdapter = new LocalPagerAdapter(imagesArr, imagesByIds); } - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; mViewPager.setPageMargin((int)(20 * density)); mViewPager.setOffscreenPageLimit(1); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java index 89834dfab..5ef20f1be 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java @@ -161,7 +161,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen } else { doneTextView.setText(getStringEntry(R.string.Done) + " (" + selectedContacts.size() + ")"); } - countTextView.setText(selectedContacts.size() + "/100"); + countTextView.setText(selectedContacts.size() + "/200"); listView.invalidateViews(); } else { search = true; @@ -219,7 +219,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen userSelectEditText.setSelection(text.length()); ignoreChange = false; } else { - if (selectedContacts.size() == 100) { + if (selectedContacts.size() == 200) { return; } ignoreChange = true; @@ -232,7 +232,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen } else { doneTextView.setText(getStringEntry(R.string.Done) + " (" + selectedContacts.size() + ")"); } - countTextView.setText(selectedContacts.size() + "/100"); + countTextView.setText(selectedContacts.size() + "/200"); if (searching || searchWas) { searching = false; searchWas = false; @@ -280,7 +280,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java index 1bf9c03c1..1a49035a2 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java @@ -156,7 +156,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/IdenticonActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/IdenticonActivity.java index 38168c439..4e28d1ec2 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/IdenticonActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/IdenticonActivity.java @@ -133,7 +133,7 @@ public class IdenticonActivity extends BaseFragment { int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { @@ -154,7 +154,7 @@ public class IdenticonActivity extends BaseFragment { TextView title = (TextView)parentActivity.findViewById(R.id.abs__action_bar_title); if (title == null) { - final int subtitleId = Utilities.applicationContext.getResources().getIdentifier("action_bar_title", "id", "android"); + final int subtitleId = ApplicationLoader.applicationContext.getResources().getIdentifier("action_bar_title", "id", "android"); title = (TextView)parentActivity.findViewById(subtitleId); } if (title != null) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/IntroActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/IntroActivity.java index 3fcfbfc62..6a002bfe6 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/IntroActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/IntroActivity.java @@ -261,7 +261,7 @@ public class IntroActivity extends SherlockFragmentActivity { WindowManager manager = (WindowManager)getSystemService(Context.WINDOW_SERVICE); Display display = manager.getDefaultDisplay(); int rotation = display.getRotation(); - density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; FrameLayout.LayoutParams params = (FrameLayout.LayoutParams)parentSlidingView.getLayoutParams(); FrameLayout.LayoutParams buttonParams = (FrameLayout.LayoutParams)startMessagingButton.getLayoutParams(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java index 6d7c49da3..ca7819af1 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java @@ -54,10 +54,12 @@ public class LaunchActivity extends PausableActivity { cursor.close(); } } - if (path.startsWith("file:")) { - path = path.replace("file://", ""); + if (path != null) { + if (path.startsWith("file:")) { + path = path.replace("file://", ""); + } + NotificationCenter.Instance.addToMemCache(533, path); } - NotificationCenter.Instance.addToMemCache(533, path); } else if (intent.getType().startsWith("video/")) { String path = intent.getParcelableExtra(Intent.EXTRA_STREAM).toString(); if (path.startsWith("content:")) { @@ -68,10 +70,12 @@ public class LaunchActivity extends PausableActivity { cursor.close(); } } - if (path.startsWith("file:")) { - path = path.replace("file://", ""); + if (path != null) { + if (path.startsWith("file:")) { + path = path.replace("file://", ""); + } + NotificationCenter.Instance.addToMemCache(534, path); } - NotificationCenter.Instance.addToMemCache(534, path); } else if (intent.getType().equals("text/plain")) { String text = intent.getStringExtra(Intent.EXTRA_TEXT); if (text.length() != 0) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java index 738831f1c..dfb0b040b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java @@ -227,7 +227,7 @@ public class LocationActivity extends BaseFragment implements LocationListener, bottomView = fragmentView.findViewById(R.id.location_bottom_view); sendButton = (TextView)fragmentView.findViewById(R.id.location_send_button); - getFragmentManager().beginTransaction().replace(R.id.map_view, mapFragment).commit(); + getChildFragmentManager().beginTransaction().replace(R.id.map_view, mapFragment).commit(); } else { ViewGroup parent = (ViewGroup)fragmentView.getParent(); if (parent != null) { @@ -305,14 +305,13 @@ public class LocationActivity extends BaseFragment implements LocationListener, if (isGPSEnabled || isNetworkEnabled) { if (isGPSEnabled) { - locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000 * 3 * 1, 0, this); + locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000 * 3 * 1, 1, this); if (locationManager != null) { location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER); } } if (location == null && isNetworkEnabled) { - long MIN_DISTANCE_CHANGE_FOR_UPDATES = 10; - locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 1000 * 3 * 1, 0, this); + locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 1000 * 3 * 1, 1, this); if (locationManager != null) { location = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER); } @@ -341,9 +340,9 @@ public class LocationActivity extends BaseFragment implements LocationListener, if (userLocation != null && distanceTextView != null) { float distance = location.distanceTo(userLocation); if (distance < 1000) { - distanceTextView.setText(String.format("%d %s", (int)(distance), Utilities.applicationContext.getString(R.string.MetersAway))); + distanceTextView.setText(String.format("%d %s", (int)(distance), ApplicationLoader.applicationContext.getString(R.string.MetersAway))); } else { - distanceTextView.setText(String.format("%.2f %s", distance / 1000.0f, Utilities.applicationContext.getString(R.string.KMetersAway))); + distanceTextView.setText(String.format("%.2f %s", distance / 1000.0f, ApplicationLoader.applicationContext.getString(R.string.KMetersAway))); } } } else { @@ -365,8 +364,13 @@ public class LocationActivity extends BaseFragment implements LocationListener, } @Override - public void onLocationChanged(Location location) { - positionMarker(location); + public void onLocationChanged(final Location location) { + Utilities.RunOnUIThread(new Runnable() { + @Override + public void run() { + positionMarker(location); + } + }); } @Override diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java index b17d99539..10a8c9f82 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java @@ -76,7 +76,7 @@ public class LoginActivity extends SherlockFragmentActivity implements NonSwipea AlertDialog.Builder builder = new AlertDialog.Builder(activity); builder.setTitle(LoginActivity.this.getString(R.string.AppName)); builder.setMessage(message); - builder.setPositiveButton(Utilities.applicationContext.getString(R.string.OK), null); + builder.setPositiveButton(ApplicationLoader.applicationContext.getString(R.string.OK), null); builder.show().setCanceledOnTouchOutside(true); } } @@ -160,7 +160,7 @@ public class LoginActivity extends SherlockFragmentActivity implements NonSwipea super.onCreate(savedInstanceState); setContentView(R.layout.login_layout); - Utilities.applicationContext = this.getApplicationContext(); + ApplicationLoader.applicationContext = this.getApplicationContext(); ConnectionsManager inst = ConnectionsManager.Instance; Typeface typeface = Utilities.getTypeface("fonts/rlight.ttf"); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java index c69dcf664..765428095 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java @@ -296,7 +296,7 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java index c7bff81cd..a86fe1f1c 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java @@ -92,6 +92,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter NotificationCenter.Instance.addObserver(this, MessagesController.reloadSearchResults); NotificationCenter.Instance.addObserver(this, MessagesController.userPrintUpdateAll); NotificationCenter.Instance.addObserver(this, MessagesController.encryptedChatUpdated); + NotificationCenter.Instance.addObserver(this, MessagesController.contactsDidLoaded); NotificationCenter.Instance.addObserver(this, 1234); if (getArguments() != null) { onlySelect = getArguments().getBoolean("onlySelect", false); @@ -109,6 +110,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter NotificationCenter.Instance.removeObserver(this, MessagesController.reloadSearchResults); NotificationCenter.Instance.removeObserver(this, MessagesController.userPrintUpdateAll); NotificationCenter.Instance.removeObserver(this, MessagesController.encryptedChatUpdated); + NotificationCenter.Instance.removeObserver(this, MessagesController.contactsDidLoaded); NotificationCenter.Instance.removeObserver(this, 1234); delegate = null; } @@ -328,7 +330,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter view = (ImageView)parentActivity.findViewById(com.actionbarsherlock.R.id.abs__home); } if (view != null) { - view.setPadding((int)(Utilities.applicationContext.getResources().getDisplayMetrics().density * 6), 0, (int)(Utilities.applicationContext.getResources().getDisplayMetrics().density * 6), 0); + view.setPadding((int)(ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density * 6), 0, (int)(ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density * 6), 0); } actionBar.setHomeButtonEnabled(false); actionBar.setDisplayShowTitleEnabled(true); @@ -420,6 +422,10 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter if (messagesListView != null) { updateVisibleRows(); } + } else if (id == MessagesController.contactsDidLoaded) { + if (messagesListView != null) { + updateVisibleRows(); + } } } @@ -453,7 +459,7 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter WindowManager manager = (WindowManager) parentActivity.getSystemService(Context.WINDOW_SERVICE); Display display = manager.getDefaultDisplay(); int rotation = display.getRotation(); - density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); @@ -1043,8 +1049,8 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter nameTextView.setText(chat.title); nameTextView.setTextColor(0xff000000); } else if (user != null) { - if (user.id != 333000 && !MessagesController.Instance.contactsByPhones.containsKey(user.phone)) { - if (MessagesController.Instance.contactsByPhones.isEmpty() && MessagesController.Instance.loadingContacts) { + if (user.id != 333000 && MessagesController.Instance.contactsDict.get(user.id) == null) { + if (MessagesController.Instance.contactsDict.size() == 0 && MessagesController.Instance.loadingContacts) { nameTextView.setTextColor(0xff000000); nameTextView.setText(Utilities.formatName(user.first_name, user.last_name)); } else { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ScreenSlidePageFragmentPhone.java b/TMessagesProj/src/main/java/org/telegram/ui/ScreenSlidePageFragmentPhone.java index 6a0db6311..0f178d454 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ScreenSlidePageFragmentPhone.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ScreenSlidePageFragmentPhone.java @@ -183,7 +183,7 @@ public class ScreenSlidePageFragmentPhone extends SlideFragment implements Adapt } }); - ArrayAdapter dataAdapter = new ArrayAdapter(Utilities.applicationContext, R.layout.login_country_textview, countriesArray); + ArrayAdapter dataAdapter = new ArrayAdapter(ApplicationLoader.applicationContext, R.layout.login_country_textview, countriesArray); dataAdapter.setDropDownViewResource(R.layout.login_country_dropdown); countrySpinner.setAdapter(dataAdapter); @@ -205,7 +205,7 @@ public class ScreenSlidePageFragmentPhone extends SlideFragment implements Adapt String country = "RU"; try { - TelephonyManager telephonyManager = (TelephonyManager)Utilities.applicationContext.getSystemService(Context.TELEPHONY_SERVICE); + TelephonyManager telephonyManager = (TelephonyManager)ApplicationLoader.applicationContext.getSystemService(Context.TELEPHONY_SERVICE); if (telephonyManager != null) { country = telephonyManager.getSimCountryIso().toUpperCase(); } @@ -215,7 +215,7 @@ public class ScreenSlidePageFragmentPhone extends SlideFragment implements Adapt if (country == null || country.length() == 0) { try { - Locale current = Utilities.applicationContext.getResources().getConfiguration().locale; + Locale current = ApplicationLoader.applicationContext.getResources().getConfiguration().locale; country = current.getCountry().toUpperCase(); } catch (Exception e) { e.printStackTrace(); @@ -299,8 +299,8 @@ public class ScreenSlidePageFragmentPhone extends SlideFragment implements Adapt TLRPC.TL_auth_sendCode req = new TLRPC.TL_auth_sendCode(); String phone = "" + codeField.getText() + phoneField.getText(); phone = phone.replace("+", ""); - req.api_hash = "5bce48dc7d331e62c955669eb7233217"; - req.api_id = 2458; + req.api_hash = "eb06d4abfb49dc3eeb1aeb98ae0f581e"; + req.api_id = 6; req.sms_type = 0; req.phone_number = phone; req.lang_code = Locale.getDefault().getCountry(); @@ -330,11 +330,11 @@ public class ScreenSlidePageFragmentPhone extends SlideFragment implements Adapt } else { if (error.text != null) { if (error.text.contains("PHONE_NUMBER_INVALID")) { - delegate.needShowAlert(Utilities.applicationContext.getString(R.string.InvalidPhoneNumber)); + delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.InvalidPhoneNumber)); } else if (error.text.contains("PHONE_CODE_EMPTY") || error.text.contains("PHONE_CODE_INVALID")) { - delegate.needShowAlert(Utilities.applicationContext.getString(R.string.InvalidCode)); + delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.InvalidCode)); } else if (error.text.contains("PHONE_CODE_EXPIRED")) { - delegate.needShowAlert(Utilities.applicationContext.getString(R.string.CodeExpired)); + delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.CodeExpired)); } else { delegate.needShowAlert(error.text); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ScreenSlidePageFragmentRegister.java b/TMessagesProj/src/main/java/org/telegram/ui/ScreenSlidePageFragmentRegister.java index 40ce8e9bf..7ecefe530 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ScreenSlidePageFragmentRegister.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ScreenSlidePageFragmentRegister.java @@ -196,7 +196,7 @@ public class ScreenSlidePageFragmentRegister extends SlideFragment { UserConfig.currentUser = user; UserConfig.clientActivated = true; UserConfig.clientUserId = user.id; - UserConfig.saveConfig(); + UserConfig.saveConfig(true); ArrayList users = new ArrayList(); users.add(user); MessagesStorage.Instance.putUsersAndChats(users, null, true, true); @@ -208,15 +208,15 @@ public class ScreenSlidePageFragmentRegister extends SlideFragment { }); } else { if (error.text.contains("PHONE_NUMBER_INVALID")) { - delegate.needShowAlert(Utilities.applicationContext.getString(R.string.InvalidPhoneNumber)); + delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.InvalidPhoneNumber)); } else if (error.text.contains("PHONE_CODE_EMPTY") || error.text.contains("PHONE_CODE_INVALID")) { - delegate.needShowAlert(Utilities.applicationContext.getString(R.string.InvalidCode)); + delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.InvalidCode)); } else if (error.text.contains("PHONE_CODE_EXPIRED")) { - delegate.needShowAlert(Utilities.applicationContext.getString(R.string.CodeExpired)); + delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.CodeExpired)); } else if (error.text.contains("FIRSTNAME_INVALID")) { - delegate.needShowAlert(Utilities.applicationContext.getString(R.string.FirstName)); + delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.FirstName)); } else if (error.text.contains("LASTNAME_INVALID")) { - delegate.needShowAlert(Utilities.applicationContext.getString(R.string.LastName)); + delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.LastName)); } else { delegate.needShowAlert(error.text); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ScreenSlidePageFragmentSms.java b/TMessagesProj/src/main/java/org/telegram/ui/ScreenSlidePageFragmentSms.java index f27535451..3fc0bf55a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ScreenSlidePageFragmentSms.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ScreenSlidePageFragmentSms.java @@ -119,7 +119,7 @@ public class ScreenSlidePageFragmentSms extends SlideFragment implements Notific registered = params.get("registered"); String number = PhoneFormat.Instance.format(phone); - confirmTextView.setText(Html.fromHtml(String.format(Utilities.applicationContext.getResources().getString(R.string.SentSmsCode) + " %s", number))); + confirmTextView.setText(Html.fromHtml(String.format(ApplicationLoader.applicationContext.getResources().getString(R.string.SentSmsCode) + " %s", number))); Utilities.showKeyboard(codeField); codeField.requestFocus(); @@ -129,7 +129,7 @@ public class ScreenSlidePageFragmentSms extends SlideFragment implements Notific timeTimer.cancel(); timeTimer = null; } - timeText.setText(String.format("%s 1:00", Utilities.applicationContext.getResources().getString(R.string.CallText))); + timeText.setText(String.format("%s 1:00", ApplicationLoader.applicationContext.getResources().getString(R.string.CallText))); lastCurrentTime = System.currentTimeMillis(); timeTimer = new Timer(); timeTimer.schedule(new TimerTask() { @@ -145,9 +145,9 @@ public class ScreenSlidePageFragmentSms extends SlideFragment implements Notific if (time >= 1000) { int minutes = time / 1000 / 60; int seconds = time / 1000 - minutes * 60; - timeText.setText(String.format("%s %d:%02d", Utilities.applicationContext.getResources().getString(R.string.CallText), minutes, seconds)); + timeText.setText(String.format("%s %d:%02d", ApplicationLoader.applicationContext.getResources().getString(R.string.CallText), minutes, seconds)); } else { - timeText.setText(Utilities.applicationContext.getResources().getString(R.string.Calling)); + timeText.setText(ApplicationLoader.applicationContext.getResources().getString(R.string.Calling)); if (timeTimer != null) { timeTimer.cancel(); timeTimer = null; @@ -201,7 +201,7 @@ public class ScreenSlidePageFragmentSms extends SlideFragment implements Notific UserConfig.currentUser = res.user; UserConfig.clientActivated = true; UserConfig.clientUserId = res.user.id; - UserConfig.saveConfig(); + UserConfig.saveConfig(true); ArrayList users = new ArrayList(); users.add(UserConfig.currentUser); MessagesStorage.Instance.putUsersAndChats(users, null, true, true); @@ -229,11 +229,11 @@ public class ScreenSlidePageFragmentSms extends SlideFragment implements Notific }); } else { if (error.text.contains("PHONE_NUMBER_INVALID")) { - delegate.needShowAlert(Utilities.applicationContext.getString(R.string.InvalidPhoneNumber)); + delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.InvalidPhoneNumber)); } else if (error.text.contains("PHONE_CODE_EMPTY") || error.text.contains("PHONE_CODE_INVALID")) { - delegate.needShowAlert(Utilities.applicationContext.getString(R.string.InvalidCode)); + delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.InvalidCode)); } else if (error.text.contains("PHONE_CODE_EXPIRED")) { - delegate.needShowAlert(Utilities.applicationContext.getString(R.string.CodeExpired)); + delegate.needShowAlert(ApplicationLoader.applicationContext.getString(R.string.CodeExpired)); } else { delegate.needShowAlert(error.text); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java index 661f0c50c..f4c77af26 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java @@ -140,7 +140,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter builder.setItems(new CharSequence[]{String.format("%d", 16), String.format("%d", 17), String.format("%d", 18), String.format("%d", 19), String.format("%d", 20)}, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); editor.putInt("fons_size", 16 + which); editor.commit(); @@ -152,7 +152,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter builder.setNegativeButton(getStringEntry(R.string.Cancel), null); builder.show().setCanceledOnTouchOutside(true); } else if (i == enableAnimationsRow) { - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); boolean animations = preferences.getBoolean("view_animations", true); SharedPreferences.Editor editor = preferences.edit(); editor.putBoolean("view_animations", !animations); @@ -270,7 +270,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { @@ -504,7 +504,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter divider.setVisibility(View.VISIBLE); ImageView checkButton = (ImageView)view.findViewById(R.id.settings_row_check_button); - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); boolean animations = preferences.getBoolean("view_animations", true); if (animations) { checkButton.setImageResource(R.drawable.btn_check_on); @@ -559,10 +559,10 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter detailTextView.setTypeface(typeface); View divider = view.findViewById(R.id.settings_row_divider); if (i == textSizeRow) { - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); int size = preferences.getInt("fons_size", 16); detailTextView.setText(String.format("%d", size)); - textView.setText(Utilities.applicationContext.getString(R.string.TextSize)); + textView.setText(ApplicationLoader.applicationContext.getString(R.string.TextSize)); divider.setVisibility(View.VISIBLE); } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsers.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsers.java index 17fd49a0e..8d7bb912d 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsers.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsBlockedUsers.java @@ -305,7 +305,7 @@ public class SettingsBlockedUsers extends BaseFragment implements NotificationCe int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeNameActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeNameActivity.java index 939966b83..0a66e6657 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeNameActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsChangeNameActivity.java @@ -73,7 +73,7 @@ public class SettingsChangeNameActivity extends BaseFragment { int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { @@ -130,7 +130,7 @@ public class SettingsChangeNameActivity extends BaseFragment { fixLayout(); - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); boolean animations = preferences.getBoolean("view_animations", true); if (!animations) { firstNameField.requestFocus(); @@ -226,7 +226,7 @@ public class SettingsChangeNameActivity extends BaseFragment { user.first_name = req.first_name; user.last_name = req.last_name; } - UserConfig.saveConfig(); + UserConfig.saveConfig(true); NotificationCenter.Instance.postNotificationName(MessagesController.updateInterfaces, MessagesController.UPDATE_MASK_ALL); ConnectionsManager.Instance.performRpc(req, new RPCRequest.RPCRequestDelegate() { @Override diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java index 7cdf37c5f..61911f70f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsNotificationsActivity.java @@ -65,7 +65,7 @@ public class SettingsNotificationsActivity extends BaseFragment { @Override public void onItemClick(AdapterView adapterView, View view, int i, long l) { if (i == 1 || i == 6) { - SharedPreferences preferences = parentActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); boolean enabled = false; if (i == 1) { @@ -96,7 +96,7 @@ public class SettingsNotificationsActivity extends BaseFragment { } ConnectionsManager.Instance.performRpc(req, null, null, true, RPCRequest.RPCRequestClassGeneric); } else if (i == 2 || i == 7) { - SharedPreferences preferences = parentActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); boolean enabledAll = true; boolean enabled = true; @@ -130,7 +130,7 @@ public class SettingsNotificationsActivity extends BaseFragment { } ConnectionsManager.Instance.performRpc(req, null, null, true, RPCRequest.RPCRequestClassGeneric); } else if (i == 3 || i == 8) { - SharedPreferences preferences = parentActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); boolean enabled; if (i == 3) { @@ -143,7 +143,7 @@ public class SettingsNotificationsActivity extends BaseFragment { editor.commit(); listView.invalidateViews(); } else if (i == 4 || i == 9) { - SharedPreferences preferences = parentActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); Intent tmpIntent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER); tmpIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION); tmpIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, false); @@ -196,7 +196,7 @@ public class SettingsNotificationsActivity extends BaseFragment { return; } reseting = false; - SharedPreferences preferences = inflaterActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); editor.clear(); editor.commit(); @@ -208,21 +208,21 @@ public class SettingsNotificationsActivity extends BaseFragment { } }, null, true, RPCRequest.RPCRequestClassGeneric); } else if (i == 11) { - SharedPreferences preferences = parentActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); boolean enabled = preferences.getBoolean("EnableInAppSounds", true); editor.putBoolean("EnableInAppSounds", !enabled); editor.commit(); listView.invalidateViews(); } else if (i == 12) { - SharedPreferences preferences = parentActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); boolean enabled = preferences.getBoolean("EnableInAppVibrate", true); editor.putBoolean("EnableInAppVibrate", !enabled); editor.commit(); listView.invalidateViews(); } else if (i == 13) { - SharedPreferences preferences = parentActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); boolean enabled = preferences.getBoolean("EnableInAppPreview", true); editor.putBoolean("EnableInAppPreview", !enabled); @@ -260,7 +260,7 @@ public class SettingsNotificationsActivity extends BaseFragment { } } - SharedPreferences preferences = parentActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); if (requestCode == 4) { @@ -342,7 +342,7 @@ public class SettingsNotificationsActivity extends BaseFragment { int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { @@ -387,7 +387,7 @@ public class SettingsNotificationsActivity extends BaseFragment { @Override public boolean isEnabled(int i) { - SharedPreferences preferences = parentActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); boolean enabledAll = preferences.getBoolean("EnableAll", true); return !(i != 1 && !enabledAll && i != 13) && (i > 0 && i < 5 || i > 5 && i < 10 || i > 10 && i < 14 || i == 15); } @@ -439,7 +439,7 @@ public class SettingsNotificationsActivity extends BaseFragment { View divider = view.findViewById(R.id.settings_row_divider); ImageView checkButton = (ImageView)view.findViewById(R.id.settings_row_check_button); - SharedPreferences preferences = parentActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); boolean enabled = false; boolean enabledAll = preferences.getBoolean("EnableAll", true); @@ -506,7 +506,7 @@ public class SettingsNotificationsActivity extends BaseFragment { TextView textView = (TextView)view.findViewById(R.id.settings_row_text); TextView textViewDetail = (TextView)view.findViewById(R.id.settings_row_text_detail); View divider = view.findViewById(R.id.settings_row_divider); - SharedPreferences preferences = parentActivity.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); boolean enabledAll = preferences.getBoolean("EnableAll", true); if (i == 4 || i == 9) { if (i == 4) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsWallpapersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsWallpapersActivity.java index ccfc14c40..643dc5a93 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsWallpapersActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsWallpapersActivity.java @@ -73,7 +73,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica NotificationCenter.Instance.addObserver(this, FileLoader.FileLoadProgressChanged); NotificationCenter.Instance.addObserver(this, MessagesStorage.wallpapersDidLoaded); - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); selectedBackground = preferences.getInt("selectedBackground", 1000001); selectedColor = preferences.getInt("selectedColor", 0); MessagesStorage.Instance.getWallpapers(); @@ -94,7 +94,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica if (fragmentView == null) { fragmentView = inflater.inflate(R.layout.settings_wallpapers_layout, container, false); listAdapter = new ListAdapter(parentActivity); - density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; progressBar = (ProgressBar)fragmentView.findViewById(R.id.action_progress); backgroundImage = (ImageView)fragmentView.findViewById(R.id.background_image); @@ -154,7 +154,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica TLRPC.PhotoSize size = PhotoObject.getClosestPhotoSizeWithSize(wallPaper.sizes, (int) (320 * density), (int) (480 * density)); String fileName = size.location.volume_id + "_" + size.location.local_id + ".jpg"; File f = new File(Utilities.getCacheDir(), fileName); - File toFile = new File(Utilities.applicationContext.getFilesDir(), "wallpaper.jpg"); + File toFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper.jpg"); try { done = Utilities.copyFile(f, toFile); } catch (Exception e) { @@ -166,7 +166,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica } if (done) { - SharedPreferences preferences = Utilities.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); + SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); editor.putInt("selectedBackground", selectedBackground); editor.putInt("selectedColor", selectedColor); @@ -195,7 +195,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica Utilities.addMediaToGallery(currentPicturePath); try { Bitmap bitmap = FileLoader.loadBitmap(currentPicturePath, (int)(320 * density), (int)(480 * density)); - File toFile = new File(Utilities.applicationContext.getFilesDir(), "wallpaper.jpg"); + File toFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper.jpg"); FileOutputStream stream = new FileOutputStream(toFile); bitmap.compress(Bitmap.CompressFormat.JPEG, 87, stream); selectedBackground = -1; @@ -218,7 +218,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica try { Bitmap bitmap = FileLoader.loadBitmap(imageFilePath, (int)(320 * density), (int)(480 * density)); - File toFile = new File(Utilities.applicationContext.getFilesDir(), "wallpaper.jpg"); + File toFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper.jpg"); FileOutputStream stream = new FileOutputStream(toFile); bitmap.compress(Bitmap.CompressFormat.JPEG, 87, stream); selectedBackground = -1; @@ -269,7 +269,7 @@ public class SettingsWallpapersActivity extends BaseFragment implements Notifica backgroundImage.setBackgroundColor(0); selectedColor = 0; } else if (selectedBackground == -1) { - File toFile = new File(Utilities.applicationContext.getFilesDir(), "wallpaper.jpg"); + File toFile = new File(ApplicationLoader.applicationContext.getFilesDir(), "wallpaper.jpg"); if (toFile.exists()) { backgroundImage.setImageURI(Uri.fromFile(toFile)); } else { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/UserProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/UserProfileActivity.java index 0291a2e9a..8b1ca36c4 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/UserProfileActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/UserProfileActivity.java @@ -399,7 +399,7 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen int rotation = display.getRotation(); int height; int currentActionBarHeight = parentActivity.getSupportActionBar().getHeight(); - float density = Utilities.applicationContext.getResources().getDisplayMetrics().density; + float density = ApplicationLoader.applicationContext.getResources().getDisplayMetrics().density; if (currentActionBarHeight != 48 * density && currentActionBarHeight != 40 * density) { height = currentActionBarHeight; } else { @@ -415,7 +415,7 @@ public class UserProfileActivity extends BaseFragment implements NotificationCen if (dialog_id != 0) { TextView title = (TextView)parentActivity.findViewById(R.id.abs__action_bar_title); if (title == null) { - final int subtitleId = Utilities.applicationContext.getResources().getIdentifier("action_bar_title", "id", "android"); + final int subtitleId = ApplicationLoader.applicationContext.getResources().getIdentifier("action_bar_title", "id", "android"); title = (TextView)parentActivity.findViewById(subtitleId); } if (title != null) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarUpdater.java b/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarUpdater.java index 259fbab95..9d6857aa6 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarUpdater.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarUpdater.java @@ -118,10 +118,15 @@ public class AvatarUpdater implements NotificationCenter.NotificationCenterDeleg } else if (requestCode == 1) { Uri imageUri = data.getData(); Cursor cursor = null; - if (parentFragment != null) { - cursor = parentFragment.getSherlockActivity().getContentResolver().query(imageUri, new String[]{android.provider.MediaStore.Images.ImageColumns.DATA}, null, null, null); - } else if (parentActivity != null) { - cursor = parentActivity.getContentResolver().query(imageUri, new String[]{android.provider.MediaStore.Images.ImageColumns.DATA}, null, null, null); + try { + if (parentFragment != null) { + cursor = parentFragment.getSherlockActivity().getContentResolver().query(imageUri, new String[]{android.provider.MediaStore.Images.ImageColumns.DATA}, null, null, null); + } else if (parentActivity != null) { + cursor = parentActivity.getContentResolver().query(imageUri, new String[]{android.provider.MediaStore.Images.ImageColumns.DATA}, null, null, null); + } + } catch (Exception e) { + e.printStackTrace(); + return; } if (cursor == null) { return; @@ -149,7 +154,7 @@ public class AvatarUpdater implements NotificationCenter.NotificationCenterDeleg delegate.didUploadedPhoto(null, smallPhoto, bigPhoto); } } else { - UserConfig.saveConfig(); + UserConfig.saveConfig(false); uploadingAvatar = Utilities.getCacheDir() + "/" + bigPhoto.location.volume_id + "_" + bigPhoto.location.local_id + ".jpg"; NotificationCenter.Instance.addObserver(AvatarUpdater.this, FileLoader.FileDidUpload); NotificationCenter.Instance.addObserver(AvatarUpdater.this, FileLoader.FileDidFailUpload); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/BaseFragment.java b/TMessagesProj/src/main/java/org/telegram/ui/Views/BaseFragment.java index d0768a129..3d5274cb6 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/BaseFragment.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Views/BaseFragment.java @@ -17,8 +17,8 @@ import android.view.animation.AnimationUtils; import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.app.SherlockFragmentActivity; import org.telegram.messenger.ConnectionsManager; -import org.telegram.messenger.Utilities; import org.telegram.ui.ApplicationActivity; +import org.telegram.ui.ApplicationLoader; public class BaseFragment extends SherlockFragment { public int animationType = 0; @@ -90,10 +90,11 @@ public class BaseFragment extends SherlockFragment { public void onFragmentDestroy() { ConnectionsManager.Instance.cancelRpcsForClassGuid(classGuid); removeParentOnDestroy = true; + isFinish = true; } public String getStringEntry(int res) { - return Utilities.applicationContext.getString(res); + return ApplicationLoader.applicationContext.getString(res); } public void onAnimationStart() { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/NotificationView.java b/TMessagesProj/src/main/java/org/telegram/ui/Views/NotificationView.java index 840422f33..d69a27c7a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/NotificationView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Views/NotificationView.java @@ -29,6 +29,7 @@ import org.telegram.messenger.NotificationCenter; import org.telegram.messenger.R; import org.telegram.messenger.Utilities; import org.telegram.objects.MessageObject; +import org.telegram.ui.ApplicationLoader; import java.util.Locale; import java.util.Timer; @@ -119,11 +120,11 @@ public class NotificationView extends LinearLayout { } }); - notificationParentView = new FrameLayout(Utilities.applicationContext); + notificationParentView = new FrameLayout(getContext()); notificationParentView.addView(this); notificationParentView.setFocusable(false); setFocusable(false); - WindowManager wm = (WindowManager)Utilities.applicationContext.getSystemService(Context.WINDOW_SERVICE); + final WindowManager wm = (WindowManager) ApplicationLoader.applicationContext.getSystemService(Context.WINDOW_SERVICE); notificationLayoutParams = new WindowManager.LayoutParams(); notificationLayoutParams.height = 90; notificationLayoutParams.format = PixelFormat.TRANSLUCENT; @@ -131,11 +132,11 @@ public class NotificationView extends LinearLayout { notificationLayoutParams.gravity = Gravity.CLIP_HORIZONTAL | Gravity.TOP; notificationLayoutParams.type = WindowManager.LayoutParams.TYPE_SYSTEM_ERROR; notificationLayoutParams.flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; - notificationLayoutParams.y = -300; isVisible = false; wm.addView(notificationParentView, notificationLayoutParams); + notificationParentView.setVisibility(View.INVISIBLE); - animHide = AnimationUtils.loadAnimation(Utilities.applicationContext, R.anim.slide_up); + animHide = AnimationUtils.loadAnimation(ApplicationLoader.applicationContext, R.anim.slide_up); animHide.setAnimationListener(new Animation.AnimationListener() { public void onAnimationStart(Animation animation) { onScreen = false; @@ -147,14 +148,13 @@ public class NotificationView extends LinearLayout { public void onAnimationEnd(Animation animation) { setVisibility(GONE); - WindowManager wm = (WindowManager)Utilities.applicationContext.getSystemService(Context.WINDOW_SERVICE); + WindowManager wm = (WindowManager)ApplicationLoader.applicationContext.getSystemService(Context.WINDOW_SERVICE); isVisible = false; - notificationLayoutParams.y = -300; - wm.updateViewLayout(notificationParentView, notificationLayoutParams); + notificationParentView.setVisibility(View.INVISIBLE); } }); - animShow = AnimationUtils.loadAnimation(Utilities.applicationContext, R.anim.slide_down); + animShow = AnimationUtils.loadAnimation(ApplicationLoader.applicationContext, R.anim.slide_down); animShow.setAnimationListener(new Animation.AnimationListener() { public void onAnimationStart(Animation animation) { setVisibility(VISIBLE); @@ -237,10 +237,9 @@ public class NotificationView extends LinearLayout { } if (!onScreen) { - WindowManager wm = (WindowManager)Utilities.applicationContext.getSystemService(Context.WINDOW_SERVICE); + WindowManager wm = (WindowManager)ApplicationLoader.applicationContext.getSystemService(Context.WINDOW_SERVICE); isVisible = true; - notificationLayoutParams.y = 0; - wm.updateViewLayout(notificationParentView, notificationLayoutParams); + notificationParentView.setVisibility(View.VISIBLE); startAnimation(animShow); } } @@ -261,10 +260,9 @@ public class NotificationView extends LinearLayout { onScreen = false; setVisibility(GONE); if (notificationParentView != null && notificationParentView.getParent() != null) { - WindowManager wm = (WindowManager)Utilities.applicationContext.getSystemService(Context.WINDOW_SERVICE); + WindowManager wm = (WindowManager)ApplicationLoader.applicationContext.getSystemService(Context.WINDOW_SERVICE); isVisible = false; - notificationLayoutParams.y = -300; - wm.updateViewLayout(notificationParentView, notificationLayoutParams); + notificationParentView.setVisibility(View.INVISIBLE); } } } @@ -276,7 +274,7 @@ public class NotificationView extends LinearLayout { notificationParentView.removeView(this); try { if (notificationParentView.getParent() != null) { - WindowManager wm = (WindowManager)Utilities.applicationContext.getSystemService(Context.WINDOW_SERVICE); + WindowManager wm = (WindowManager)ApplicationLoader.applicationContext.getSystemService(Context.WINDOW_SERVICE); wm.removeViewImmediate(notificationParentView); } } catch (Exception e) { @@ -322,7 +320,7 @@ public class NotificationView extends LinearLayout { if (notificationParentView != null) { notificationLayoutParams.height = height + (int)(2 * density); if (notificationParentView.getParent() != null) { - WindowManager wm = (WindowManager) Utilities.applicationContext.getSystemService(Context.WINDOW_SERVICE); + WindowManager wm = (WindowManager) ApplicationLoader.applicationContext.getSystemService(Context.WINDOW_SERVICE); wm.updateViewLayout(notificationParentView, notificationLayoutParams); } } diff --git a/TMessagesProj/src/main/res/layout-ar/notification_layout.xml b/TMessagesProj/src/main/res/layout-ar/notification_layout.xml index 010d4593e..ddd9fd6aa 100644 --- a/TMessagesProj/src/main/res/layout-ar/notification_layout.xml +++ b/TMessagesProj/src/main/res/layout-ar/notification_layout.xml @@ -29,7 +29,6 @@ android:gravity="right|center" android:textSize="15dp" android:textColor="#000000" - android:text="Nikolay Kudashov" android:id="@+id/name_text_view" android:paddingTop="4dp" android:ellipsize="end" @@ -41,7 +40,6 @@ android:gravity="right|center" android:textColor="#000000" android:textSize="15dp" - android:text="Hello" android:id="@+id/message_text_view" android:paddingTop="24dp" android:ellipsize="end" diff --git a/TMessagesProj/src/main/res/layout-ar/settings_name_layout.xml b/TMessagesProj/src/main/res/layout-ar/settings_name_layout.xml index fa4160441..af4e964a0 100644 --- a/TMessagesProj/src/main/res/layout-ar/settings_name_layout.xml +++ b/TMessagesProj/src/main/res/layout-ar/settings_name_layout.xml @@ -24,6 +24,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginRight="14dp" + android:layout_marginLeft="4dp" android:layout_marginTop="2dp" android:layout_weight="1.0" android:gravity="right"> diff --git a/TMessagesProj/src/main/res/layout/chat_group_incoming_forward_layout.xml b/TMessagesProj/src/main/res/layout/chat_group_incoming_forward_layout.xml index 6bf08628d..f05733eda 100644 --- a/TMessagesProj/src/main/res/layout/chat_group_incoming_forward_layout.xml +++ b/TMessagesProj/src/main/res/layout/chat_group_incoming_forward_layout.xml @@ -64,7 +64,7 @@ android:textSize="16dp" android:linksClickable="false" android:layout_marginBottom="8dp" - android:autoLink="web" + android:autoLink="web|email" android:descendantFocusability="afterDescendants" android:layout_marginTop="53dp" android:layout_gravity="top" diff --git a/TMessagesProj/src/main/res/layout/chat_group_incoming_text_layout.xml b/TMessagesProj/src/main/res/layout/chat_group_incoming_text_layout.xml index dedc4e34c..cb696cb01 100644 --- a/TMessagesProj/src/main/res/layout/chat_group_incoming_text_layout.xml +++ b/TMessagesProj/src/main/res/layout/chat_group_incoming_text_layout.xml @@ -42,7 +42,7 @@ android:layout_height="wrap_content" android:textSize="16dp" android:layout_marginBottom="8dp" - android:autoLink="web" + android:autoLink="web|email" android:linksClickable="false" android:layout_marginTop="18dp" android:textColor="#000000" diff --git a/TMessagesProj/src/main/res/layout/chat_incoming_forward_layout.xml b/TMessagesProj/src/main/res/layout/chat_incoming_forward_layout.xml index d807ec2ad..28e5c491c 100644 --- a/TMessagesProj/src/main/res/layout/chat_incoming_forward_layout.xml +++ b/TMessagesProj/src/main/res/layout/chat_incoming_forward_layout.xml @@ -42,7 +42,7 @@ android:layout_height="wrap_content" android:textSize="16dp" android:layout_marginBottom="8dp" - android:autoLink="web" + android:autoLink="web|email" android:linksClickable="false" android:layout_marginTop="34dp" android:descendantFocusability="afterDescendants" diff --git a/TMessagesProj/src/main/res/layout/chat_incoming_text_layout.xml b/TMessagesProj/src/main/res/layout/chat_incoming_text_layout.xml index b57ac9e10..140adbe06 100644 --- a/TMessagesProj/src/main/res/layout/chat_incoming_text_layout.xml +++ b/TMessagesProj/src/main/res/layout/chat_incoming_text_layout.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:textSize="16dp" android:layout_marginBottom="8dp" - android:autoLink="web" + android:autoLink="web|email" android:linksClickable="false" android:layout_gravity="top" android:textColor="#000000"/> diff --git a/TMessagesProj/src/main/res/layout/chat_outgoing_forward_layout.xml b/TMessagesProj/src/main/res/layout/chat_outgoing_forward_layout.xml index a47b7d28d..fb02429ee 100644 --- a/TMessagesProj/src/main/res/layout/chat_outgoing_forward_layout.xml +++ b/TMessagesProj/src/main/res/layout/chat_outgoing_forward_layout.xml @@ -43,7 +43,7 @@ android:linksClickable="false" android:layout_marginTop="34dp" android:layout_marginBottom="8dp" - android:autoLink="web" + android:autoLink="web|email" android:descendantFocusability="afterDescendants" android:layout_gravity="top" android:textColor="#000000"/> diff --git a/TMessagesProj/src/main/res/layout/chat_outgoing_text_layout.xml b/TMessagesProj/src/main/res/layout/chat_outgoing_text_layout.xml index 56acbbed9..8f2fa500c 100644 --- a/TMessagesProj/src/main/res/layout/chat_outgoing_text_layout.xml +++ b/TMessagesProj/src/main/res/layout/chat_outgoing_text_layout.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="16dp" - android:autoLink="web" + android:autoLink="web|email" android:linksClickable="false" android:layout_gravity="top" android:textColor="#000000" diff --git a/TMessagesProj/src/main/res/layout/notification_layout.xml b/TMessagesProj/src/main/res/layout/notification_layout.xml index 3cac90c0b..905f32723 100644 --- a/TMessagesProj/src/main/res/layout/notification_layout.xml +++ b/TMessagesProj/src/main/res/layout/notification_layout.xml @@ -28,7 +28,6 @@ android:gravity="left|center" android:textSize="15dp" android:textColor="#000000" - android:text="Nikolay Kudashov" android:id="@+id/name_text_view" android:paddingTop="4dp" android:ellipsize="end" @@ -39,7 +38,6 @@ android:gravity="left|center" android:textColor="#000000" android:textSize="15dp" - android:text="Hello" android:id="@+id/message_text_view" android:paddingTop="24dp" android:ellipsize="end" diff --git a/TMessagesProj/src/main/res/layout/settings_name_layout.xml b/TMessagesProj/src/main/res/layout/settings_name_layout.xml index 94c508626..7221e6c46 100644 --- a/TMessagesProj/src/main/res/layout/settings_name_layout.xml +++ b/TMessagesProj/src/main/res/layout/settings_name_layout.xml @@ -25,6 +25,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="14dp" android:layout_marginTop="2dp" + android:layout_marginRight="4dp" android:layout_weight="1.0"> ساعة يوم أسبوع + لديك رسالة جديدة إبحث عن جهات الاتصال diff --git a/TMessagesProj/src/main/res/values/strings.xml b/TMessagesProj/src/main/res/values/strings.xml index 2013b729f..b870f3850 100644 --- a/TMessagesProj/src/main/res/values/strings.xml +++ b/TMessagesProj/src/main/res/values/strings.xml @@ -89,6 +89,7 @@ 1 hour 1 day 1 week + You have a new message Search contacts @@ -265,4 +266,4 @@ CACHE_TAG - + \ No newline at end of file