diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index f8722ad66..da7e524df 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -3,8 +3,8 @@ import cn.hutool.core.util.RuntimeUtil
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
-def verName = "7.4.2"
-def verCode = 198
+def verName = "7.5.0-preview-2244"
+def verCode = 200
if (System.getenv("DEBUG_BUILD") == "true") {
verName += "-" + RuntimeUtil.execForStr("git log --pretty=format:'%h' -n 1)")
diff --git a/TMessagesProj/jni/voip/tgcalls/NetworkManager.cpp b/TMessagesProj/jni/voip/tgcalls/NetworkManager.cpp
index e1fd6624f..49b36e65e 100644
--- a/TMessagesProj/jni/voip/tgcalls/NetworkManager.cpp
+++ b/TMessagesProj/jni/voip/tgcalls/NetworkManager.cpp
@@ -136,6 +136,9 @@ void NetworkManager::start() {
if (!_enableP2P) {
flags |= cricket::PORTALLOCATOR_DISABLE_UDP;
flags |= cricket::PORTALLOCATOR_DISABLE_STUN;
+ uint32_t candidateFilter = _portAllocator->candidate_filter();
+ candidateFilter &= ~(cricket::CF_REFLEXIVE);
+ _portAllocator->SetCandidateFilter(candidateFilter);
}
if (_proxy) {
diff --git a/TMessagesProj/src/main/AndroidManifest.xml b/TMessagesProj/src/main/AndroidManifest.xml
index a42fd269c..086e68eb2 100644
--- a/TMessagesProj/src/main/AndroidManifest.xml
+++ b/TMessagesProj/src/main/AndroidManifest.xml
@@ -284,13 +284,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
diff --git a/TMessagesProj/src/main/java/com/google/zxing/qrcode/QRCodeWriter.java b/TMessagesProj/src/main/java/com/google/zxing/qrcode/QRCodeWriter.java
index 91bbd1f3b..3dad97212 100755
--- a/TMessagesProj/src/main/java/com/google/zxing/qrcode/QRCodeWriter.java
+++ b/TMessagesProj/src/main/java/com/google/zxing/qrcode/QRCodeWriter.java
@@ -26,16 +26,13 @@ import android.graphics.drawable.GradientDrawable;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.WriterException;
-import com.google.zxing.qrcode.encoder.ByteMatrix;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import com.google.zxing.qrcode.encoder.ByteMatrix;
import com.google.zxing.qrcode.encoder.Encoder;
import com.google.zxing.qrcode.encoder.QRCode;
import org.telegram.messenger.ApplicationLoader;
import org.telegram.messenger.R;
-import org.telegram.messenger.SvgHelper;
-import org.telegram.ui.ActionBar.Theme;
-import org.telegram.ui.Components.RLottieDrawable;
import java.util.Arrays;
import java.util.Map;
@@ -48,23 +45,25 @@ import java.util.function.Function;
*/
public final class QRCodeWriter {
- private static final int QUIET_ZONE_SIZE = 4;
- private ByteMatrix input;
- private float[] radii = new float[8];
- private int imageBloks;
- private int imageBlockX;
- private int sideQuadSize;
+ private static final int QUIET_ZONE_SIZE = 4;
+ private ByteMatrix input;
+ private float[] radii = new float[8];
+ private int imageBloks;
+ private int imageBlockX;
+ private int sideQuadSize;
- public Bitmap encode(String contents, BarcodeFormat format, int width, int height, Map hints, Bitmap bitmap, Context context) throws WriterException {
- return encode(contents, format, width, height, hints, bitmap, context, null);
+ private int imageSize;
+
+ public Bitmap encode(String contents, BarcodeFormat format, int width, int height, Map hints, Bitmap bitmap, Context context) throws WriterException {
+ return encode(contents, format, width, height, hints, bitmap, context, null);
+ }
+
+ public Bitmap encode(String contents, BarcodeFormat format, int width, int height, Map hints, Bitmap bitmap, Context context, Function iconF) throws WriterException {
+
+ if (contents.isEmpty()) {
+ throw new IllegalArgumentException("Found empty contents");
}
- public Bitmap encode(String contents, BarcodeFormat format, int width, int height, Map hints, Bitmap bitmap, Context context, Function iconF) throws WriterException {
-
- if (contents.isEmpty()) {
- throw new IllegalArgumentException("Found empty contents");
- }
-
if (width < 0 || height < 0) {
throw new IllegalArgumentException("Requested dimensions are too small: " + width + 'x' + height);
}
@@ -123,8 +122,8 @@ public final class QRCodeWriter {
if (imageBloks % 2 != inputWidth % 2) {
imageBloks++;
}
- imageBlockX = (inputWidth - imageBloks) / 2;
- int imageSize = imageBloks * multiple - 24;
+ imageBlockX = (inputWidth - imageBloks) / 2;
+ imageSize = imageBloks * multiple - 24;
int imageX = (size - imageSize) / 2;
for (int a = 0; a < 3; a++) {
@@ -233,14 +232,18 @@ public final class QRCodeWriter {
private boolean has(int x, int y) {
if (x >= imageBlockX && x < imageBlockX + imageBloks && y >= imageBlockX && y < imageBlockX + imageBloks) {
- return false;
+ return false;
}
- if ((x < sideQuadSize || x >= input.getWidth() - sideQuadSize) && y < sideQuadSize) {
- return false;
- }
- if (x < sideQuadSize && y >= input.getHeight() - sideQuadSize) {
- return false;
- }
- return x >= 0 && y >= 0 && x < input.getWidth() && y < input.getHeight() && input.get(x, y) == 1;
+ if ((x < sideQuadSize || x >= input.getWidth() - sideQuadSize) && y < sideQuadSize) {
+ return false;
+ }
+ if (x < sideQuadSize && y >= input.getHeight() - sideQuadSize) {
+ return false;
+ }
+ return x >= 0 && y >= 0 && x < input.getWidth() && y < input.getHeight() && input.get(x, y) == 1;
}
+
+ public int getImageSize() {
+ return imageSize;
+ }
}
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java b/TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java
index 21e63eb12..84e419183 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java
@@ -2188,22 +2188,13 @@ public class AndroidUtilities {
}*/
public static void startAppCenter(Activity context) {
+
}
private static long lastUpdateCheckTime;
public static void checkForUpdates() {
- /*try {
- if (BuildVars.DEBUG_VERSION) {
- if (SystemClock.elapsedRealtime() - lastUpdateCheckTime < 60 * 60 * 1000) {
- return;
- }
- lastUpdateCheckTime = SystemClock.elapsedRealtime();
- Distribute.checkForUpdate();
- }
- } catch (Throwable e) {
- FileLog.e(e);
- }*/
+
}
public static void addToClipboard(CharSequence str) {
@@ -4024,13 +4015,10 @@ public class AndroidUtilities {
}
}
- public static boolean shouldShowUrlInAlert(String url) {
+ public static boolean checkHostForPunycode(String url) {
boolean hasLatin = false;
boolean hasNonLatin = false;
try {
- Uri uri = Uri.parse(url);
- url = uri.getHost();
-
for (int a = 0, N = url.length(); a < N; a++) {
char ch = url.charAt(a);
if (ch == '.' || ch == '-' || ch == '/' || ch == '+' || ch >= '0' && ch <= '9') {
@@ -4045,13 +4033,23 @@ public class AndroidUtilities {
break;
}
}
-
} catch (Exception e) {
FileLog.e(e);
}
return hasLatin && hasNonLatin;
}
+ public static boolean shouldShowUrlInAlert(String url) {
+ try {
+ Uri uri = Uri.parse(url);
+ url = uri.getHost();
+ return checkHostForPunycode(url);
+ } catch (Exception e) {
+ FileLog.e(e);
+ }
+ return false;
+ }
+
public static void scrollToFragmentRow(ActionBarLayout parentLayout, String rowName) {
if (parentLayout == null || rowName == null) {
return;
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ChatObject.java b/TMessagesProj/src/main/java/org/telegram/messenger/ChatObject.java
index f6deaa620..48d8aca1a 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/ChatObject.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/ChatObject.java
@@ -813,7 +813,7 @@ public class ChatObject {
}
public static boolean canWriteToChat(TLRPC.Chat chat) {
- return !isChannel(chat) || chat.creator || chat.admin_rights != null && chat.admin_rights.post_messages || !chat.broadcast;
+ return !isChannel(chat) || chat.creator || chat.admin_rights != null && chat.admin_rights.post_messages || !chat.broadcast && !chat.gigagroup || chat.gigagroup && ChatObject.hasAdminRights(chat);
}
public static String getBannedRightsString(TLRPC.TL_chatBannedRights bannedRights) {
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ChatsWidgetProvider.java b/TMessagesProj/src/main/java/org/telegram/messenger/ChatsWidgetProvider.java
new file mode 100644
index 000000000..8c4ab1646
--- /dev/null
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/ChatsWidgetProvider.java
@@ -0,0 +1,114 @@
+package org.telegram.messenger;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.widget.RemoteViews;
+
+import org.telegram.ui.EditWidgetActivity;
+import org.telegram.ui.LaunchActivity;
+
+import java.util.ArrayList;
+
+public class ChatsWidgetProvider extends AppWidgetProvider {
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ super.onReceive(context, intent);
+ }
+
+ @Override
+ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+ super.onUpdate(context, appWidgetManager, appWidgetIds);
+ for (int i = 0; i < appWidgetIds.length; i++) {
+ int appWidgetId = appWidgetIds[i];
+ updateWidget(context, appWidgetManager, appWidgetId, false);
+ }
+ }
+
+ @Override
+ public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
+ updateWidget(context, appWidgetManager, appWidgetId, true);
+ super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions);
+ }
+
+ @Override
+ public void onDeleted(Context context, int[] appWidgetIds) {
+ super.onDeleted(context, appWidgetIds);
+ SharedPreferences preferences = context.getSharedPreferences("shortcut_widget", Activity.MODE_PRIVATE);
+ SharedPreferences.Editor editor = preferences.edit();
+ for (int a = 0; a < appWidgetIds.length; a++) {
+ int accountId = preferences.getInt("account" + appWidgetIds[a], -1);
+ if (accountId >= 0) {
+ AccountInstance accountInstance = AccountInstance.getInstance(accountId);
+ accountInstance.getMessagesStorage().clearWidgetDialogs(appWidgetIds[a]);
+ }
+ editor.remove("account" + appWidgetIds[a]);
+ editor.remove("type" + appWidgetIds[a]);
+ editor.remove("deleted" + appWidgetIds[a]);
+ }
+ editor.commit();
+ }
+
+ private static int getCellsForSize(int size) {
+ int n = 2;
+ while (70 * n - 30 < size) {
+ ++n;
+ }
+ return n - 1;
+ }
+
+ public static void updateWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId, boolean edit) {
+ Bundle options = appWidgetManager.getAppWidgetOptions(appWidgetId);
+ int minHeight = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT);
+ int rows = getCellsForSize(minHeight);
+
+ Intent intent2 = new Intent(context, ChatsWidgetService.class);
+ intent2.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+ intent2.setData(Uri.parse(intent2.toUri(Intent.URI_INTENT_SCHEME)));
+
+ SharedPreferences preferences = context.getSharedPreferences("shortcut_widget", Activity.MODE_PRIVATE);
+ boolean deleted = preferences.getBoolean("deleted" + appWidgetId, false);
+ int id;
+ if (!deleted) {
+ int accountId = preferences.getInt("account" + appWidgetId, -1);
+ ArrayList selectedDialogs = new ArrayList<>();
+ if (accountId >= 0) {
+ AccountInstance.getInstance(accountId).getMessagesStorage().getWidgetDialogIds(appWidgetId, EditWidgetActivity.TYPE_CHATS, selectedDialogs, null, null, false);
+ }
+
+ if (rows == 1 || selectedDialogs.size() <= 1) {
+ id = R.layout.shortcut_widget_layout_1;
+ } else if (rows == 2 || selectedDialogs.size() <= 2) {
+ id = R.layout.shortcut_widget_layout_2;
+ } else if (rows == 3 || selectedDialogs.size() <= 3) {
+ id = R.layout.shortcut_widget_layout_3;
+ } else {
+ id = R.layout.shortcut_widget_layout_4;
+ }
+ } else {
+ id = R.layout.shortcut_widget_layout_1;
+ }
+ RemoteViews rv = new RemoteViews(context.getPackageName(), id);
+ rv.setRemoteAdapter(appWidgetId, R.id.list_view, intent2);
+ rv.setEmptyView(R.id.list_view, R.id.empty_view);
+
+ Intent intent = new Intent(ApplicationLoader.applicationContext, LaunchActivity.class);
+ intent.setAction("com.tmessages.openchat" + Math.random() + Integer.MAX_VALUE);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ intent.addCategory(Intent.CATEGORY_LAUNCHER);
+ PendingIntent contentIntent = PendingIntent.getActivity(ApplicationLoader.applicationContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+ rv.setPendingIntentTemplate(R.id.list_view, contentIntent);
+ appWidgetManager.updateAppWidget(appWidgetId, rv);
+ if (edit) {
+ appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view);
+ }
+ }
+}
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ShortcutWidgetService.java b/TMessagesProj/src/main/java/org/telegram/messenger/ChatsWidgetService.java
similarity index 79%
rename from TMessagesProj/src/main/java/org/telegram/messenger/ShortcutWidgetService.java
rename to TMessagesProj/src/main/java/org/telegram/messenger/ChatsWidgetService.java
index 0841a7930..bf9e66af3 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/ShortcutWidgetService.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/ChatsWidgetService.java
@@ -27,20 +27,21 @@ import org.telegram.tgnet.TLRPC;
import org.telegram.ui.ActionBar.Theme;
import org.telegram.ui.Components.AvatarDrawable;
import org.telegram.ui.Components.ForegroundColorSpanThemable;
+import org.telegram.ui.EditWidgetActivity;
import java.io.File;
import java.util.ArrayList;
-public class ShortcutWidgetService extends RemoteViewsService {
+public class ChatsWidgetService extends RemoteViewsService {
@Override
public RemoteViewsFactory onGetViewFactory(Intent intent) {
- return new ShortcutRemoteViewsFactory(getApplicationContext(), intent);
+ return new ChatsRemoteViewsFactory(getApplicationContext(), intent);
}
}
-class ShortcutRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactory {
+class ChatsRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactory {
- private ArrayList dids = new ArrayList<>();
+ private ArrayList dids = new ArrayList<>();
private Context mContext;
private int appWidgetId;
private AccountInstance accountInstance;
@@ -48,8 +49,9 @@ class ShortcutRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
private RectF bitmapRect;
private LongSparseArray dialogs = new LongSparseArray<>();
private LongSparseArray messageObjects = new LongSparseArray<>();
+ private boolean deleted;
- public ShortcutRemoteViewsFactory(Context context, Intent intent) {
+ public ChatsRemoteViewsFactory(Context context, Intent intent) {
mContext = context;
Theme.createDialogsResources(context);
appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
@@ -58,6 +60,7 @@ class ShortcutRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
if (accountId >= 0) {
accountInstance = AccountInstance.getInstance(accountId);
}
+ deleted = preferences.getBoolean("deleted" + appWidgetId, false) || accountInstance == null;
}
public void onCreate() {
@@ -69,33 +72,58 @@ class ShortcutRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
}
public int getCount() {
- return dids.size();
+ if (deleted) {
+ return 1;
+ }
+ return dids.size() + 1;
}
public RemoteViews getViewAt(int position) {
- Integer id = dids.get(position);
- String name;
+ if (deleted) {
+ RemoteViews rv = new RemoteViews(mContext.getPackageName(), R.layout.widget_deleted);
+ rv.setTextViewText(R.id.widget_deleted_text, LocaleController.getString("WidgetLoggedOff", R.string.WidgetLoggedOff));
+ return rv;
+ } else if (position >= dids.size()) {
+ RemoteViews rv = new RemoteViews(mContext.getPackageName(), R.layout.widget_edititem);
+ rv.setTextViewText(R.id.widget_edititem_text, LocaleController.getString("TapToEditWidget", R.string.TapToEditWidget));
+ Bundle extras = new Bundle();
+ extras.putInt("appWidgetId", appWidgetId);
+ extras.putInt("appWidgetType", EditWidgetActivity.TYPE_CHATS);
+ extras.putInt("currentAccount", accountInstance.getCurrentAccount());
+ Intent fillInIntent = new Intent();
+ fillInIntent.putExtras(extras);
+ rv.setOnClickFillInIntent(R.id.widget_edititem, fillInIntent);
+ return rv;
+ }
+ Long id = dids.get(position);
+ String name = "";
TLRPC.FileLocation photoPath = null;
TLRPC.User user = null;
TLRPC.Chat chat = null;
if (id > 0) {
- user = accountInstance.getMessagesController().getUser(id);
- if (UserObject.isUserSelf(user)) {
- name = LocaleController.getString("SavedMessages", R.string.SavedMessages);
- } else if (UserObject.isReplyUser(user)) {
- name = LocaleController.getString("RepliesTitle", R.string.RepliesTitle);
- } else {
- name = ContactsController.formatName(user.first_name, user.last_name);
- }
- if (!UserObject.isReplyUser(user) && !UserObject.isUserSelf(user) && user.photo != null && user.photo.photo_small != null && user.photo.photo_small.volume_id != 0 && user.photo.photo_small.local_id != 0) {
- photoPath = user.photo.photo_small;
+ user = accountInstance.getMessagesController().getUser((int) (long) id);
+ if (user != null) {
+ if (UserObject.isUserSelf(user)) {
+ name = LocaleController.getString("SavedMessages", R.string.SavedMessages);
+ } else if (UserObject.isReplyUser(user)) {
+ name = LocaleController.getString("RepliesTitle", R.string.RepliesTitle);
+ } else if (UserObject.isDeleted(user)) {
+ name = LocaleController.getString("HiddenName", R.string.HiddenName);
+ } else {
+ name = ContactsController.formatName(user.first_name, user.last_name);
+ }
+ if (!UserObject.isReplyUser(user) && !UserObject.isUserSelf(user) && user != null && user.photo != null && user.photo.photo_small != null && user.photo.photo_small.volume_id != 0 && user.photo.photo_small.local_id != 0) {
+ photoPath = user.photo.photo_small;
+ }
}
} else {
- chat = accountInstance.getMessagesController().getChat(-id);
- name = chat.title;
- if (chat.photo != null && chat.photo.photo_small != null && chat.photo.photo_small.volume_id != 0 && chat.photo.photo_small.local_id != 0) {
- photoPath = chat.photo.photo_small;
+ chat = accountInstance.getMessagesController().getChat(-(int) (long) id);
+ if (chat != null) {
+ name = chat.title;
+ if (chat.photo != null && chat.photo.photo_small != null && chat.photo.photo_small.volume_id != 0 && chat.photo.photo_small.local_id != 0) {
+ photoPath = chat.photo.photo_small;
+ }
}
}
RemoteViews rv = new RemoteViews(mContext.getPackageName(), R.layout.shortcut_widget_item);
@@ -159,7 +187,7 @@ class ShortcutRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
}
CharSequence messageString;
CharSequence messageNameString;
- int textColor = 0xff212121;
+ int textColor = mContext.getResources().getColor(R.color.widget_text);
if (message.messageOwner instanceof TLRPC.TL_messageService) {
if (ChatObject.isChannel(chat) && (message.messageOwner.action instanceof TLRPC.TL_messageActionHistoryClear ||
message.messageOwner.action instanceof TLRPC.TL_messageActionChannelMigrateFrom)) {
@@ -167,7 +195,7 @@ class ShortcutRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
} else {
messageString = message.messageText;
}
- textColor = 0xff3c7eb0;
+ textColor = mContext.getResources().getColor(R.color.widget_action_text);
} else {
boolean needEmoji = true;
if (chat != null && chat.id > 0 && fromChat == null && (!ChatObject.isChannel(chat) || ChatObject.isMegagroup(chat))) {
@@ -199,7 +227,7 @@ class ShortcutRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
}
stringBuilder = SpannableStringBuilder.valueOf(String.format(messageFormat, emoji + mess.replace('\n', ' '), messageNameString));
} else if (message.messageOwner.media != null && !message.isMediaEmpty()) {
- textColor = 0xff3c7eb0;
+ textColor = mContext.getResources().getColor(R.color.widget_action_text);
String innerMessage;
if (message.messageOwner.media instanceof TLRPC.TL_messageMediaPoll) {
TLRPC.TL_messageMediaPoll mediaPoll = (TLRPC.TL_messageMediaPoll) message.messageOwner.media;
@@ -245,7 +273,7 @@ class ShortcutRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
} catch (Exception e) {
FileLog.e(e);
}
- messageString = stringBuilder;//Emoji.replaceEmoji(stringBuilder, Theme.dialogs_messagePaint[paintIndex].getFontMetricsInt(), AndroidUtilities.dp(20), false);
+ messageString = stringBuilder;
} else {
if (message.messageOwner.media instanceof TLRPC.TL_messageMediaPhoto && message.messageOwner.media.photo instanceof TLRPC.TL_photoEmpty && message.messageOwner.media.ttl_seconds != 0) {
messageString = LocaleController.getString("AttachPhotoExpired", R.string.AttachPhotoExpired);
@@ -278,23 +306,31 @@ class ShortcutRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
AndroidUtilities.highlightText(messageString, message.highlightedWords);
}
if (message.messageOwner.media != null && !message.isMediaEmpty()) {
- textColor = 0xff3c7eb0;
+ textColor = mContext.getResources().getColor(R.color.widget_action_text);
}
}
}
}
rv.setTextViewText(R.id.shortcut_widget_item_time, LocaleController.stringForMessageListDate(message.messageOwner.date));
- rv.setTextViewText(R.id.shortcut_widget_item_message, messageString);
+ rv.setTextViewText(R.id.shortcut_widget_item_message, messageString.toString());
rv.setTextColor(R.id.shortcut_widget_item_message, textColor);
} else {
- if (dialog != null) {
+ if (dialog != null && dialog.last_message_date != 0) {
rv.setTextViewText(R.id.shortcut_widget_item_time, LocaleController.stringForMessageListDate(dialog.last_message_date));
+ } else {
+ rv.setTextViewText(R.id.shortcut_widget_item_time, "");
}
+ rv.setTextViewText(R.id.shortcut_widget_item_message, "");
}
if (dialog != null && dialog.unread_count > 0) {
rv.setTextViewText(R.id.shortcut_widget_item_badge, String.format("%d", dialog.unread_count));
rv.setViewVisibility(R.id.shortcut_widget_item_badge, View.VISIBLE);
+ if (accountInstance.getMessagesController().isDialogMuted(dialog.id)) {
+ rv.setInt(R.id.shortcut_widget_item_badge, "setBackgroundResource", R.drawable.widget_counter_muted);
+ } else {
+ rv.setInt(R.id.shortcut_widget_item_badge, "setBackgroundResource", R.drawable.widget_counter);
+ }
} else {
rv.setViewVisibility(R.id.shortcut_widget_item_badge, View.GONE);
}
@@ -302,9 +338,9 @@ class ShortcutRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
Bundle extras = new Bundle();
if (id > 0) {
- extras.putInt("userId", id);
+ extras.putInt("userId", (int) (long) id);
} else {
- extras.putInt("chatId", -id);
+ extras.putInt("chatId", -(int) (long) id);
}
extras.putInt("currentAccount", accountInstance.getCurrentAccount());
@@ -322,7 +358,7 @@ class ShortcutRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
}
public int getViewTypeCount() {
- return 1;
+ return 2;
}
public long getItemId(int position) {
@@ -342,7 +378,7 @@ class ShortcutRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor
ArrayList users = new ArrayList<>();
ArrayList chats = new ArrayList<>();
LongSparseArray messages = new LongSparseArray<>();
- accountInstance.getMessagesStorage().getWidgetDialogs(appWidgetId, dids, dialogs, messages, users, chats);
+ accountInstance.getMessagesStorage().getWidgetDialogs(appWidgetId, 0, dids, dialogs, messages, users, chats);
accountInstance.getMessagesController().putUsers(users, true);
accountInstance.getMessagesController().putChats(chats, true);
messageObjects.clear();
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java b/TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java
index 7a19d9356..93dfe1585 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java
@@ -30,6 +30,7 @@ import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.messenger.support.SparseLongArray;
import org.telegram.tgnet.ConnectionsManager;
import org.telegram.tgnet.TLRPC;
+import org.telegram.ui.Components.Bulletin;
import java.util.ArrayList;
import java.util.Arrays;
@@ -1091,7 +1092,7 @@ public class ContactsController extends BaseController {
}
if (!toDelete.isEmpty()) {
- deleteContact(toDelete);
+ deleteContact(toDelete, false);
}
});
}
@@ -2216,7 +2217,7 @@ public class ContactsController extends BaseController {
}, ConnectionsManager.RequestFlagFailOnServerErrors | ConnectionsManager.RequestFlagCanCompress);
}
- public void deleteContact(final ArrayList users) {
+ public void deleteContact(final ArrayList users, boolean showBulletin) {
if (users == null || users.isEmpty()) {
return;
}
@@ -2231,6 +2232,7 @@ public class ContactsController extends BaseController {
uids.add(user.id);
req.id.add(inputUser);
}
+ String userName = users.get(0).first_name;
getConnectionsManager().sendRequest(req, (response, error) -> {
if (error != null) {
return;
@@ -2273,6 +2275,9 @@ public class ContactsController extends BaseController {
}
getNotificationCenter().postNotificationName(NotificationCenter.updateInterfaces, MessagesController.UPDATE_MASK_NAME);
getNotificationCenter().postNotificationName(NotificationCenter.contactsDidLoad);
+ if (showBulletin) {
+ NotificationCenter.getGlobalInstance().postNotificationName(NotificationCenter.showBulletin, Bulletin.TYPE_ERROR, LocaleController.formatString("DeletedFromYourContacts", R.string.DeletedFromYourContacts, userName));
+ }
});
});
}
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ContactsWidgetProvider.java b/TMessagesProj/src/main/java/org/telegram/messenger/ContactsWidgetProvider.java
new file mode 100644
index 000000000..6f5fd33ef
--- /dev/null
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/ContactsWidgetProvider.java
@@ -0,0 +1,116 @@
+package org.telegram.messenger;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.widget.RemoteViews;
+
+import org.telegram.ui.EditWidgetActivity;
+import org.telegram.ui.LaunchActivity;
+
+import java.util.ArrayList;
+
+public class ContactsWidgetProvider extends AppWidgetProvider {
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ super.onReceive(context, intent);
+ }
+
+ @Override
+ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+ super.onUpdate(context, appWidgetManager, appWidgetIds);
+ for (int i = 0; i < appWidgetIds.length; i++) {
+ int appWidgetId = appWidgetIds[i];
+ updateWidget(context, appWidgetManager, appWidgetId, false);
+ }
+ }
+
+ @Override
+ public void onDeleted(Context context, int[] appWidgetIds) {
+ super.onDeleted(context, appWidgetIds);
+ SharedPreferences preferences = context.getSharedPreferences("shortcut_widget", Activity.MODE_PRIVATE);
+ SharedPreferences.Editor editor = preferences.edit();
+ for (int a = 0; a < appWidgetIds.length; a++) {
+ int accountId = preferences.getInt("account" + appWidgetIds[a], -1);
+ if (accountId >= 0) {
+ AccountInstance accountInstance = AccountInstance.getInstance(accountId);
+ accountInstance.getMessagesStorage().clearWidgetDialogs(appWidgetIds[a]);
+ }
+ editor.remove("account" + appWidgetIds[a]);
+ editor.remove("type" + appWidgetIds[a]);
+ editor.remove("deleted" + appWidgetIds[a]);
+ }
+ editor.commit();
+ }
+
+ @Override
+ public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
+ updateWidget(context, appWidgetManager, appWidgetId, true);
+ super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions);
+ }
+
+ private static int getCellsForSize(int size) {
+ int n = 2;
+ while (86 * n - 30 < size) {
+ ++n;
+ }
+ return n - 1;
+ }
+
+ public static void updateWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId, boolean edit) {
+ Bundle options = appWidgetManager.getAppWidgetOptions(appWidgetId);
+ int minHeight = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT);
+ int rows = getCellsForSize(minHeight);
+
+ Intent intent2 = new Intent(context, ContactsWidgetService.class);
+ intent2.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+ intent2.setData(Uri.parse(intent2.toUri(Intent.URI_INTENT_SCHEME)));
+
+ SharedPreferences preferences = context.getSharedPreferences("shortcut_widget", Activity.MODE_PRIVATE);
+ boolean deleted = preferences.getBoolean("deleted" + appWidgetId, false);
+ int id;
+ if (!deleted) {
+ int accountId = preferences.getInt("account" + appWidgetId, -1);
+ ArrayList selectedDialogs = new ArrayList<>();
+ if (accountId >= 0) {
+ AccountInstance.getInstance(accountId).getMessagesStorage().getWidgetDialogIds(appWidgetId, EditWidgetActivity.TYPE_CONTACTS, selectedDialogs, null, null, false);
+ }
+ int count = (int) Math.ceil(selectedDialogs.size() / 2.0f);
+
+ if (rows == 1 || count <= 1) {
+ id = R.layout.contacts_widget_layout_1;
+ } else if (rows == 2 || count <= 2) {
+ id = R.layout.contacts_widget_layout_2;
+ } else if (rows == 3 || count <= 3) {
+ id = R.layout.contacts_widget_layout_3;
+ } else {
+ id = R.layout.contacts_widget_layout_4;
+ }
+ } else {
+ id = R.layout.contacts_widget_layout_1;
+ }
+ RemoteViews rv = new RemoteViews(context.getPackageName(), id);
+ rv.setRemoteAdapter(appWidgetId, R.id.list_view, intent2);
+ rv.setEmptyView(R.id.list_view, R.id.empty_view);
+
+ Intent intent = new Intent(ApplicationLoader.applicationContext, LaunchActivity.class);
+ intent.setAction("com.tmessages.openchat" + Math.random() + Integer.MAX_VALUE);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ intent.addCategory(Intent.CATEGORY_LAUNCHER);
+ PendingIntent contentIntent = PendingIntent.getActivity(ApplicationLoader.applicationContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+ rv.setPendingIntentTemplate(R.id.list_view, contentIntent);
+
+ appWidgetManager.updateAppWidget(appWidgetId, rv);
+ if (edit) {
+ appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view);
+ }
+ }
+}
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ContactsWidgetService.java b/TMessagesProj/src/main/java/org/telegram/messenger/ContactsWidgetService.java
new file mode 100644
index 000000000..687b37232
--- /dev/null
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/ContactsWidgetService.java
@@ -0,0 +1,229 @@
+package org.telegram.messenger;
+
+import android.app.Activity;
+import android.appwidget.AppWidgetManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.graphics.Shader;
+import android.os.Bundle;
+import android.util.LongSparseArray;
+import android.view.View;
+import android.widget.RemoteViews;
+import android.widget.RemoteViewsService;
+
+import org.telegram.tgnet.TLRPC;
+import org.telegram.ui.ActionBar.Theme;
+import org.telegram.ui.Components.AvatarDrawable;
+import org.telegram.ui.EditWidgetActivity;
+
+import java.io.File;
+import java.util.ArrayList;
+
+public class ContactsWidgetService extends RemoteViewsService {
+ @Override
+ public RemoteViewsFactory onGetViewFactory(Intent intent) {
+ return new ContactsRemoteViewsFactory(getApplicationContext(), intent);
+ }
+}
+
+class ContactsRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactory {
+
+ private ArrayList dids = new ArrayList<>();
+ private Context mContext;
+ private int appWidgetId;
+ private AccountInstance accountInstance;
+ private Paint roundPaint;
+ private RectF bitmapRect;
+ private LongSparseArray dialogs = new LongSparseArray<>();
+ private boolean deleted;
+
+ public ContactsRemoteViewsFactory(Context context, Intent intent) {
+ mContext = context;
+ Theme.createDialogsResources(context);
+ appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
+ SharedPreferences preferences = context.getSharedPreferences("shortcut_widget", Activity.MODE_PRIVATE);
+ int accountId = preferences.getInt("account" + appWidgetId, -1);
+ if (accountId >= 0) {
+ accountInstance = AccountInstance.getInstance(accountId);
+ }
+ deleted = preferences.getBoolean("deleted" + appWidgetId, false) || accountInstance == null;
+ }
+
+ public void onCreate() {
+ ApplicationLoader.postInitApplication();
+ }
+
+ public void onDestroy() {
+
+ }
+
+ public int getCount() {
+ if (deleted) {
+ return 1;
+ }
+ int count = (int) Math.ceil(dids.size() / 2.0f);
+ return count + 1;
+ }
+
+ public RemoteViews getViewAt(int position) {
+ if (deleted) {
+ RemoteViews rv = new RemoteViews(mContext.getPackageName(), R.layout.widget_deleted);
+ rv.setTextViewText(R.id.widget_deleted_text, LocaleController.getString("WidgetLoggedOff", R.string.WidgetLoggedOff));
+ return rv;
+ } else if (position >= getCount() - 1) {
+ RemoteViews rv = new RemoteViews(mContext.getPackageName(), R.layout.widget_edititem);
+ rv.setTextViewText(R.id.widget_edititem_text, LocaleController.getString("TapToEditWidgetShort", R.string.TapToEditWidgetShort));
+ Bundle extras = new Bundle();
+ extras.putInt("appWidgetId", appWidgetId);
+ extras.putInt("appWidgetType", EditWidgetActivity.TYPE_CONTACTS);
+ extras.putInt("currentAccount", accountInstance.getCurrentAccount());
+ Intent fillInIntent = new Intent();
+ fillInIntent.putExtras(extras);
+ rv.setOnClickFillInIntent(R.id.widget_edititem, fillInIntent);
+ return rv;
+ }
+ RemoteViews rv = new RemoteViews(mContext.getPackageName(), R.layout.contacts_widget_item);
+ for (int a = 0; a < 2; a++) {
+ int num = position * 2 + a;
+ if (num >= dids.size()) {
+ rv.setViewVisibility(a == 0 ? R.id.contacts_widget_item1 : R.id.contacts_widget_item2, View.INVISIBLE);
+ } else {
+ rv.setViewVisibility(a == 0 ? R.id.contacts_widget_item1 : R.id.contacts_widget_item2, View.VISIBLE);
+
+ Long id = dids.get(position * 2 + a);
+ String name;
+
+ TLRPC.FileLocation photoPath = null;
+ TLRPC.User user = null;
+ TLRPC.Chat chat = null;
+ if (id > 0) {
+ user = accountInstance.getMessagesController().getUser((int) (long) id);
+ if (UserObject.isUserSelf(user)) {
+ name = LocaleController.getString("SavedMessages", R.string.SavedMessages);
+ } else if (UserObject.isReplyUser(user)) {
+ name = LocaleController.getString("RepliesTitle", R.string.RepliesTitle);
+ } else if (UserObject.isDeleted(user)) {
+ name = LocaleController.getString("HiddenName", R.string.HiddenName);
+ } else {
+ name = UserObject.getFirstName(user);
+ }
+ if (!UserObject.isReplyUser(user) && !UserObject.isUserSelf(user) && user != null && user.photo != null && user.photo.photo_small != null && user.photo.photo_small.volume_id != 0 && user.photo.photo_small.local_id != 0) {
+ photoPath = user.photo.photo_small;
+ }
+ } else {
+ chat = accountInstance.getMessagesController().getChat(-(int) (long) id);
+ name = chat.title;
+ if (chat.photo != null && chat.photo.photo_small != null && chat.photo.photo_small.volume_id != 0 && chat.photo.photo_small.local_id != 0) {
+ photoPath = chat.photo.photo_small;
+ }
+ }
+ rv.setTextViewText(a == 0 ? R.id.contacts_widget_item_text1 : R.id.contacts_widget_item_text2, name);
+
+ try {
+ Bitmap bitmap = null;
+ if (photoPath != null) {
+ File path = FileLoader.getPathToAttach(photoPath, true);
+ bitmap = BitmapFactory.decodeFile(path.toString());
+ }
+
+ int size = AndroidUtilities.dp(48);
+ Bitmap result = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+ result.eraseColor(Color.TRANSPARENT);
+ Canvas canvas = new Canvas(result);
+ if (bitmap == null) {
+ AvatarDrawable avatarDrawable;
+ if (user != null) {
+ avatarDrawable = new AvatarDrawable(user);
+ if (UserObject.isReplyUser(user)) {
+ avatarDrawable.setAvatarType(AvatarDrawable.AVATAR_TYPE_REPLIES);
+ } else if (UserObject.isUserSelf(user)) {
+ avatarDrawable.setAvatarType(AvatarDrawable.AVATAR_TYPE_SAVED);
+ }
+ } else {
+ avatarDrawable = new AvatarDrawable(chat);
+ }
+ avatarDrawable.setBounds(0, 0, size, size);
+ avatarDrawable.draw(canvas);
+ } else {
+ BitmapShader shader = new BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
+ if (roundPaint == null) {
+ roundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+ bitmapRect = new RectF();
+ }
+ float scale = size / (float) bitmap.getWidth();
+ canvas.save();
+ canvas.scale(scale, scale);
+ roundPaint.setShader(shader);
+ bitmapRect.set(0, 0, bitmap.getWidth(), bitmap.getHeight());
+ canvas.drawRoundRect(bitmapRect, bitmap.getWidth(), bitmap.getHeight(), roundPaint);
+ canvas.restore();
+ }
+ canvas.setBitmap(null);
+ rv.setImageViewBitmap(a == 0 ? R.id.contacts_widget_item_avatar1 : R.id.contacts_widget_item_avatar2, result);
+ } catch (Throwable e) {
+ FileLog.e(e);
+ }
+
+ TLRPC.Dialog dialog = dialogs.get(id);
+
+ if (dialog != null && dialog.unread_count > 0) {
+ rv.setTextViewText(a == 0 ? R.id.contacts_widget_item_badge1 : R.id.contacts_widget_item_badge2, String.format("%d", dialog.unread_count));
+ rv.setViewVisibility(a == 0 ? R.id.contacts_widget_item_badge_bg1 : R.id.contacts_widget_item_badge_bg2, View.VISIBLE);
+ } else {
+ rv.setViewVisibility(a == 0 ? R.id.contacts_widget_item_badge_bg1 : R.id.contacts_widget_item_badge_bg2, View.GONE);
+ }
+
+ Bundle extras = new Bundle();
+
+ if (id > 0) {
+ extras.putInt("userId", (int) (long) id);
+ } else {
+ extras.putInt("chatId", -(int) (long) id);
+ }
+ extras.putInt("currentAccount", accountInstance.getCurrentAccount());
+
+ Intent fillInIntent = new Intent();
+ fillInIntent.putExtras(extras);
+ rv.setOnClickFillInIntent(a == 0 ? R.id.contacts_widget_item1 : R.id.contacts_widget_item2, fillInIntent);
+ }
+ }
+ return rv;
+ }
+
+ public RemoteViews getLoadingView() {
+ return null;
+ }
+
+ public int getViewTypeCount() {
+ return 2;
+ }
+
+ public long getItemId(int position) {
+ return position;
+ }
+
+ public boolean hasStableIds() {
+ return true;
+ }
+
+ public void onDataSetChanged() {
+ dids.clear();
+ if (accountInstance == null || !accountInstance.getUserConfig().isClientActivated()) {
+ return;
+ }
+ ArrayList users = new ArrayList<>();
+ ArrayList chats = new ArrayList<>();
+ LongSparseArray messages = new LongSparseArray<>();
+ accountInstance.getMessagesStorage().getWidgetDialogs(appWidgetId, 1, dids, dialogs, messages, users, chats);
+ accountInstance.getMessagesController().putUsers(users, true);
+ accountInstance.getMessagesController().putChats(chats, true);
+ }
+}
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/FeedWidgetProvider.java b/TMessagesProj/src/main/java/org/telegram/messenger/FeedWidgetProvider.java
index 1769fb873..60c37345a 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/FeedWidgetProvider.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/FeedWidgetProvider.java
@@ -10,7 +10,6 @@ import android.content.SharedPreferences;
import android.net.Uri;
import android.widget.RemoteViews;
-import org.telegram.ui.FeedWidgetConfigActivity;
import org.telegram.ui.LaunchActivity;
public class FeedWidgetProvider extends AppWidgetProvider {
@@ -33,7 +32,7 @@ public class FeedWidgetProvider extends AppWidgetProvider {
public void onDeleted(Context context, int[] appWidgetIds) {
super.onDeleted(context, appWidgetIds);
for (int a = 0; a < appWidgetIds.length; a++) {
- SharedPreferences preferences = context.getSharedPreferences("feed_widget", Activity.MODE_PRIVATE);
+ SharedPreferences preferences = context.getSharedPreferences("shortcut_widget", Activity.MODE_PRIVATE);
preferences.edit().remove("account" + appWidgetIds[a]).remove("dialogId" + appWidgetIds[a]).commit();
}
}
@@ -48,7 +47,7 @@ public class FeedWidgetProvider extends AppWidgetProvider {
Intent intent = new Intent(ApplicationLoader.applicationContext, LaunchActivity.class);
intent.setAction("com.tmessages.openchat" + Math.random() + Integer.MAX_VALUE);
- intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.addCategory(Intent.CATEGORY_LAUNCHER);
PendingIntent contentIntent = PendingIntent.getActivity(ApplicationLoader.applicationContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/FeedWidgetService.java b/TMessagesProj/src/main/java/org/telegram/messenger/FeedWidgetService.java
index ceb21c7c8..1a6231914 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/FeedWidgetService.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/FeedWidgetService.java
@@ -14,6 +14,8 @@ import android.view.View;
import android.widget.RemoteViews;
import android.widget.RemoteViewsService;
+import androidx.core.content.FileProvider;
+
import org.telegram.tgnet.ConnectionsManager;
import org.telegram.tgnet.TLRPC;
@@ -22,8 +24,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
-import androidx.core.content.FileProvider;
-
public class FeedWidgetService extends RemoteViewsService {
@Override
public RemoteViewsFactory onGetViewFactory(Intent intent) {
@@ -44,7 +44,7 @@ class FeedRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactory, N
public FeedRemoteViewsFactory(Context context, Intent intent) {
mContext = context;
appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
- SharedPreferences preferences = context.getSharedPreferences("feed_widget", Activity.MODE_PRIVATE);
+ SharedPreferences preferences = context.getSharedPreferences("shortcut_widget", Activity.MODE_PRIVATE);
int accountId = preferences.getInt("account" + appWidgetId, -1);
if (accountId >= 0) {
dialogId = preferences.getLong("dialogId" + appWidgetId, 0);
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/FileLoadOperation.java b/TMessagesProj/src/main/java/org/telegram/messenger/FileLoadOperation.java
index 7598b1fda..b29d5b696 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/FileLoadOperation.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/FileLoadOperation.java
@@ -16,9 +16,9 @@ import org.telegram.tgnet.NativeByteBuffer;
import org.telegram.tgnet.TLObject;
import org.telegram.tgnet.TLRPC;
+import java.io.File;
import java.io.FileInputStream;
import java.io.RandomAccessFile;
-import java.io.File;
import java.nio.channels.FileChannel;
import java.util.ArrayList;
import java.util.Arrays;
@@ -1218,7 +1218,12 @@ public class FileLoadOperation {
FileLog.e(e);
}
} else {
- renameResult = cacheFileTemp.renameTo(cacheFileFinal);
+ try {
+ renameResult = cacheFileTemp.renameTo(cacheFileFinal);
+ } catch (Exception e) {
+ renameResult = false;
+ FileLog.e(e);
+ }
}
if (!renameResult) {
if (BuildVars.LOGS_ENABLED) {
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java b/TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
index d0a640565..da903e13b 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java
@@ -890,7 +890,7 @@ public class FileLoader extends BaseController {
} else if (message.media instanceof TLRPC.TL_messageMediaPhoto) {
ArrayList sizes = message.media.photo.sizes;
if (sizes.size() > 0) {
- TLRPC.PhotoSize sizeFull = getClosestPhotoSizeWithSize(sizes, AndroidUtilities.getPhotoSize());
+ TLRPC.PhotoSize sizeFull = getClosestPhotoSizeWithSize(sizes, AndroidUtilities.getPhotoSize(), false, null, true);
if (sizeFull != null) {
return getAttachFileName(sizeFull);
}
@@ -937,7 +937,7 @@ public class FileLoader extends BaseController {
} else if (message.media instanceof TLRPC.TL_messageMediaPhoto) {
ArrayList sizes = message.media.photo.sizes;
if (sizes.size() > 0) {
- TLRPC.PhotoSize sizeFull = getClosestPhotoSizeWithSize(sizes, AndroidUtilities.getPhotoSize());
+ TLRPC.PhotoSize sizeFull = getClosestPhotoSizeWithSize(sizes, AndroidUtilities.getPhotoSize(), false, null, true);
if (sizeFull != null) {
return getPathToAttach(sizeFull, message.media.ttl_seconds != 0);
}
@@ -1041,10 +1041,10 @@ public class FileLoader extends BaseController {
}
public static TLRPC.PhotoSize getClosestPhotoSizeWithSize(ArrayList sizes, int side, boolean byMinSide) {
- return getClosestPhotoSizeWithSize(sizes, side, byMinSide, null);
+ return getClosestPhotoSizeWithSize(sizes, side, byMinSide, null, false);
}
- public static TLRPC.PhotoSize getClosestPhotoSizeWithSize(ArrayList sizes, int side, boolean byMinSide, TLRPC.PhotoSize toIgnore) {
+ public static TLRPC.PhotoSize getClosestPhotoSizeWithSize(ArrayList sizes, int side, boolean byMinSide, TLRPC.PhotoSize toIgnore, boolean ignoreStripped) {
if (sizes == null || sizes.isEmpty()) {
return null;
}
@@ -1052,7 +1052,7 @@ public class FileLoader extends BaseController {
TLRPC.PhotoSize closestObject = null;
for (int a = 0; a < sizes.size(); a++) {
TLRPC.PhotoSize obj = sizes.get(a);
- if (obj == null || obj == toIgnore || obj instanceof TLRPC.TL_photoSizeEmpty || obj instanceof TLRPC.TL_photoPathSize) {
+ if (obj == null || obj == toIgnore || obj instanceof TLRPC.TL_photoSizeEmpty || obj instanceof TLRPC.TL_photoPathSize || ignoreStripped && obj instanceof TLRPC.TL_photoStrippedSize) {
continue;
}
if (byMinSide) {
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ImageLoader.java b/TMessagesProj/src/main/java/org/telegram/messenger/ImageLoader.java
index 6b483492a..7583c02cd 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/ImageLoader.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/ImageLoader.java
@@ -21,7 +21,6 @@ import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
-import android.os.Environment;
import android.os.SystemClock;
import android.provider.MediaStore;
import android.text.TextUtils;
@@ -819,15 +818,15 @@ public class ImageLoader {
}
if (args.length >= 5) {
if ("c1".equals(args[4])) {
- colors = new int[]{0xf77e41, 0xca907a, 0xffb139, 0xedc5a5, 0xffd140, 0xf7e3c3, 0xffdf79, 0xfbefd6};
+ colors = new int[]{0xf77e41, 0xcb7b55, 0xffb139, 0xf6b689, 0xffd140, 0xffcda7, 0xffdf79, 0xffdfc5};
} else if ("c2".equals(args[4])) {
- colors = new int[]{0xf77e41, 0xaa7c60, 0xffb139, 0xc8a987, 0xffd140, 0xddc89f, 0xffdf79, 0xe6d6b2};
+ colors = new int[]{0xf77e41, 0xa45a38, 0xffb139, 0xdf986b, 0xffd140, 0xedb183, 0xffdf79, 0xf4c3a0};
} else if ("c3".equals(args[4])) {
- colors = new int[]{0xf77e41, 0x8c6148, 0xffb139, 0xad8562, 0xffd140, 0xc49e76, 0xffdf79, 0xd4b188};
+ colors = new int[]{0xf77e41, 0x703a17, 0xffb139, 0xab673d, 0xffd140, 0xc37f4e, 0xffdf79, 0xd89667};
} else if ("c4".equals(args[4])) {
- colors = new int[]{0xf77e41, 0x6e3c2c, 0xffb139, 0x925a34, 0xffd140, 0xa16e46, 0xffdf79, 0xac7a52};
+ colors = new int[]{0xf77e41, 0x4a2409, 0xffb139, 0x7d3e0e, 0xffd140, 0x965529, 0xffdf79, 0xa96337};
} else if ("c5".equals(args[4])) {
- colors = new int[]{0xf77e41, 0x291c12, 0xffb139, 0x472a22, 0xffd140, 0x573b30, 0xffdf79, 0x68493c};
+ colors = new int[]{0xf77e41, 0x200f0a, 0xffb139, 0x412924, 0xffd140, 0x593d37, 0xffdf79, 0x63453f};
}
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java b/TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java
index bc3eb7a87..89d0442d7 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java
@@ -34,7 +34,6 @@ import android.text.TextUtils;
import android.text.style.CharacterStyle;
import android.util.LongSparseArray;
import android.util.SparseArray;
-import android.widget.Toast;
import androidx.core.content.pm.ShortcutInfoCompat;
import androidx.core.content.pm.ShortcutManagerCompat;
@@ -307,9 +306,9 @@ public class MediaDataController extends BaseController {
int maxCount;
if (type == TYPE_FAVE) {
if (remove) {
- Toast.makeText(ApplicationLoader.applicationContext, LocaleController.getString("RemovedFromFavorites", R.string.RemovedFromFavorites), Toast.LENGTH_SHORT).show();
+ NotificationCenter.getGlobalInstance().postNotificationName(NotificationCenter.showBulletin, Bulletin.TYPE_STICKER, document, StickerSetBulletinLayout.TYPE_REMOVED_FROM_FAVORITES);
} else {
- Toast.makeText(ApplicationLoader.applicationContext, LocaleController.getString("AddedToFavorites", R.string.AddedToFavorites), Toast.LENGTH_SHORT).show();
+ NotificationCenter.getGlobalInstance().postNotificationName(NotificationCenter.showBulletin, Bulletin.TYPE_STICKER, document, StickerSetBulletinLayout.TYPE_ADDED_TO_FAVORITES);
}
TLRPC.TL_messages_faveSticker req = new TLRPC.TL_messages_faveSticker();
req.id = new TLRPC.TL_inputDocument();
@@ -330,7 +329,7 @@ public class MediaDataController extends BaseController {
maxCount = NekoConfig.unlimitedFavedStickers ? Integer.MAX_VALUE : getMessagesController().maxFaveStickersCount;
} else {
if (type == TYPE_IMAGE && remove) {
- Toast.makeText(ApplicationLoader.applicationContext, LocaleController.getString("RemovedFromRecent", R.string.RemovedFromRecent), Toast.LENGTH_SHORT).show();
+ NotificationCenter.getGlobalInstance().postNotificationName(NotificationCenter.showBulletin, Bulletin.TYPE_STICKER, document, StickerSetBulletinLayout.TYPE_REMOVED_FROM_RECENT);
TLRPC.TL_messages_saveRecentSticker req = new TLRPC.TL_messages_saveRecentSticker();
req.id = new TLRPC.TL_inputDocument();
req.id.id = document.id;
@@ -3921,16 +3920,26 @@ public class MediaDataController extends BaseController {
getMessagesController().putUsers(users, isCache);
getMessagesController().putChats(chats, isCache);
});
+ int checkedCount = 0;
for (int a = 0, N = results.size(); a < N; a++) {
- messageObjects.add(new MessageObject(currentAccount, results.get(a), usersDict, chatsDict, false, false));
+ TLRPC.Message message = results.get(a);
+ if (message.media instanceof TLRPC.TL_messageMediaDocument || message.media instanceof TLRPC.TL_messageMediaPhoto) {
+ checkedCount++;
+ }
+ messageObjects.add(new MessageObject(currentAccount, message, usersDict, chatsDict, false, checkedCount < 30));
}
return messageObjects;
} else {
AndroidUtilities.runOnUIThread(() -> {
getMessagesController().putUsers(users, isCache);
getMessagesController().putChats(chats, isCache);
+ int checkedCount = 0;
for (int a = 0, N = results.size(); a < N; a++) {
- messageObjects.add(new MessageObject(currentAccount, results.get(a), usersDict, chatsDict, false, false));
+ TLRPC.Message message = results.get(a);
+ if (message.media instanceof TLRPC.TL_messageMediaDocument || message.media instanceof TLRPC.TL_messageMediaPhoto) {
+ checkedCount++;
+ }
+ messageObjects.add(new MessageObject(currentAccount, message, usersDict, chatsDict, false, checkedCount < 30));
}
AndroidUtilities.runOnUIThread(() -> getNotificationCenter().postNotificationName(NotificationCenter.didLoadPinnedMessages, messageObjects.get(0).getDialogId(), null, true, messageObjects, null, 0, -1, false));
});
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
index c30e26e56..45e609d71 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessageObject.java
@@ -1140,11 +1140,6 @@ public class MessageObject {
int offset = str.indexOf("%1$s");
rights = new StringBuilder(String.format(str, getUserName(whoUser, messageOwner.entities, offset)));
} else {
- String str = LocaleController.getString("EventLogPromoted", R.string.EventLogPromoted);
- int offset = str.indexOf("%1$s");
- rights = new StringBuilder(String.format(str, getUserName(whoUser, messageOwner.entities, offset)));
- rights.append("\n");
-
TLRPC.TL_chatAdminRights o = prev_participant.admin_rights;
TLRPC.TL_chatAdminRights n = new_participant.admin_rights;
if (o == null) {
@@ -1153,6 +1148,15 @@ public class MessageObject {
if (n == null) {
n = new TLRPC.TL_chatAdminRights();
}
+ String str;
+ if (n.other) {
+ str = LocaleController.getString("EventLogPromotedNoRights", R.string.EventLogPromotedNoRights);
+ } else {
+ str = LocaleController.getString("EventLogPromoted", R.string.EventLogPromoted);
+ }
+ int offset = str.indexOf("%1$s");
+ rights = new StringBuilder(String.format(str, getUserName(whoUser, messageOwner.entities, offset)));
+ rights.append("\n");
if (!TextUtils.equals(prev_participant.rank, new_participant.rank)) {
if (TextUtils.isEmpty(new_participant.rank)) {
rights.append('\n').append('-').append(' ');
@@ -1194,7 +1198,7 @@ public class MessageObject {
rights.append(LocaleController.getString("EventLogPromotedBanUsers", R.string.EventLogPromotedBanUsers));
}
if (o.manage_call != n.manage_call) {
- rights.append('\n').append(n.ban_users ? '+' : '-').append(' ');
+ rights.append('\n').append(n.manage_call ? '+' : '-').append(' ');
rights.append(LocaleController.getString("EventLogPromotedManageCall", R.string.EventLogPromotedManageCall));
}
}
@@ -1672,6 +1676,51 @@ public class MessageObject {
} else {
messageText = replaceWithLink(LocaleController.getString("EventLogVoiceChatAllowedToSpeak", R.string.EventLogVoiceChatAllowedToSpeak), "un1", fromUser);
}
+ } else if (event.action instanceof TLRPC.TL_channelAdminLogEventActionParticipantJoinByInvite) {
+ TLRPC.TL_channelAdminLogEventActionParticipantJoinByInvite action = (TLRPC.TL_channelAdminLogEventActionParticipantJoinByInvite) event.action;
+ messageText = replaceWithLink(LocaleController.getString("ActionInviteUser", R.string.ActionInviteUser), "un1", fromUser);
+ } else if (event.action instanceof TLRPC.TL_channelAdminLogEventActionExportedInviteDelete) {
+ TLRPC.TL_channelAdminLogEventActionExportedInviteDelete action = (TLRPC.TL_channelAdminLogEventActionExportedInviteDelete) event.action;
+ messageText = replaceWithLink(LocaleController.formatString("ActionDeletedInviteLink", R.string.ActionDeletedInviteLink, action.invite.link), "un1", fromUser);
+ } else if (event.action instanceof TLRPC.TL_channelAdminLogEventActionExportedInviteRevoke) {
+ TLRPC.TL_channelAdminLogEventActionExportedInviteRevoke action = (TLRPC.TL_channelAdminLogEventActionExportedInviteRevoke) event.action;
+ messageText = replaceWithLink(LocaleController.formatString("ActionRevokedInviteLink", R.string.ActionRevokedInviteLink, action.invite.link), "un1", fromUser);
+ } else if (event.action instanceof TLRPC.TL_channelAdminLogEventActionExportedInviteEdit) {
+ TLRPC.TL_channelAdminLogEventActionExportedInviteEdit action = (TLRPC.TL_channelAdminLogEventActionExportedInviteEdit) event.action;
+ if (action.prev_invite.link != null && action.prev_invite.link.equals(action.new_invite.link)) {
+ messageText = replaceWithLink(LocaleController.formatString("ActionEditedInviteLinkToSame", R.string.ActionEditedInviteLinkToSame, action.prev_invite.link), "un1", fromUser);
+ } else {
+ messageText = replaceWithLink(LocaleController.formatString("ActionEditedInviteLink", R.string.ActionEditedInviteLink, action.prev_invite.link, action.new_invite.link), "un1", fromUser);
+ }
+ } else if (event.action instanceof TLRPC.TL_channelAdminLogEventActionParticipantVolume) {
+ TLRPC.TL_channelAdminLogEventActionParticipantVolume action = (TLRPC.TL_channelAdminLogEventActionParticipantVolume) event.action;
+ double vol = ChatObject.getParticipantVolume(action.participant) / 100.0;
+ TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(action.participant.user_id);
+ messageText = replaceWithLink(LocaleController.formatString("ActionVolumeChanged", R.string.ActionVolumeChanged, (int) (vol > 0 ? Math.max(vol, 1) : 0)), "un1", fromUser);
+ messageText = replaceWithLink(messageText, "un2", user);
+ } else if (event.action instanceof TLRPC.TL_channelAdminLogEventActionChangeHistoryTTL) {
+ TLRPC.TL_channelAdminLogEventActionChangeHistoryTTL action = (TLRPC.TL_channelAdminLogEventActionChangeHistoryTTL) event.action;
+ if (!chat.megagroup) {
+ if (action.new_value != 0) {
+ messageText = LocaleController.formatString("ActionTTLChannelChanged", R.string.ActionTTLChannelChanged, LocaleController.formatTTLString(action.new_value));
+ } else {
+ messageText = LocaleController.getString("ActionTTLChannelDisabled", R.string.ActionTTLChannelDisabled);
+ }
+ } else if (action.new_value == 0) {
+ messageText = replaceWithLink(LocaleController.getString("ActionTTLDisabled", R.string.ActionTTLDisabled), "un1", fromUser);
+ } else {
+ String time;
+ if (action.new_value > 24 * 60 * 60) {
+ time = LocaleController.formatPluralString("Days", action.new_value / (24 * 60 * 60));
+ } else if (action.new_value >= 60 * 60) {
+ time = LocaleController.formatPluralString("Hours", action.new_value / (60 * 60));
+ } else if (action.new_value >= 60) {
+ time = LocaleController.formatPluralString("Minutes", action.new_value / 60);
+ } else {
+ time = LocaleController.formatPluralString("Seconds", action.new_value);
+ }
+ messageText = replaceWithLink(LocaleController.formatString("ActionTTLChanged", R.string.ActionTTLChanged, time), "un1", fromUser);
+ }
} else {
messageText = "unsupported " + event.action;
}
@@ -2540,6 +2589,28 @@ public class MessageObject {
messageText = LocaleController.formatString("MessageLifetimeRemoved", R.string.MessageLifetimeRemoved, UserObject.getFirstName(fromUser));
}
}
+ } else if (messageOwner.action instanceof TLRPC.TL_messageActionSetMessagesTTL) {
+ TLRPC.TL_messageActionSetMessagesTTL action = (TLRPC.TL_messageActionSetMessagesTTL) messageOwner.action;
+ TLRPC.Chat chat = messageOwner.peer_id != null && messageOwner.peer_id.channel_id != 0 ? getChat(chats, sChats, messageOwner.peer_id.channel_id) : null;
+ if (chat != null && !chat.megagroup) {
+ if (action.period != 0) {
+ messageText = LocaleController.formatString("ActionTTLChannelChanged", R.string.ActionTTLChannelChanged, LocaleController.formatTTLString(action.period));
+ } else {
+ messageText = LocaleController.getString("ActionTTLChannelDisabled", R.string.ActionTTLChannelDisabled);
+ }
+ } else if (action.period != 0) {
+ if (isOut()) {
+ messageText = LocaleController.formatString("ActionTTLYouChanged", R.string.ActionTTLYouChanged, LocaleController.formatTTLString(action.period));
+ } else {
+ messageText = replaceWithLink(LocaleController.formatString("ActionTTLChanged", R.string.ActionTTLChanged, LocaleController.formatTTLString(action.period)), "un1", fromObject);
+ }
+ } else {
+ if (isOut()) {
+ messageText = LocaleController.getString("ActionTTLYouDisabled", R.string.ActionTTLYouDisabled);
+ } else {
+ messageText = replaceWithLink(LocaleController.getString("ActionTTLDisabled", R.string.ActionTTLDisabled), "un1", fromObject);
+ }
+ }
} else if (messageOwner.action instanceof TLRPC.TL_messageActionLoginUnknownLocation) {
String date;
long time = ((long) messageOwner.date) * 1000;
@@ -5542,6 +5613,9 @@ public class MessageObject {
if (inScheduleMode && !chat.megagroup) {
return chat.creator || chat.admin_rights != null && (chat.admin_rights.delete_messages || message.out);
}
+ if (message.out && message instanceof TLRPC.TL_messageService) {
+ return message.id != 1 && ChatObject.canUserDoAdminAction(chat, ChatObject.ACTION_DELETE_MESSAGES);
+ }
return inScheduleMode || message.id != 1 && (chat.creator || chat.admin_rights != null && (chat.admin_rights.delete_messages || message.out && (chat.megagroup || chat.admin_rights.post_messages)) || chat.megagroup && message.out && message.from_id instanceof TLRPC.TL_peerUser);
}
return inScheduleMode || isOut(message) || !ChatObject.isChannel(chat);
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
index ef6e070c1..c599f86b5 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
@@ -9,6 +9,7 @@
package org.telegram.messenger;
import android.app.Activity;
+import android.appwidget.AppWidgetManager;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -23,7 +24,6 @@ import android.util.LongSparseArray;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
-import android.widget.Toast;
import androidx.core.app.NotificationManagerCompat;
@@ -41,7 +41,9 @@ import org.telegram.ui.ActionBar.BaseFragment;
import org.telegram.ui.ActionBar.Theme;
import org.telegram.ui.ChatActivity;
import org.telegram.ui.Components.AlertsCreator;
+import org.telegram.ui.Components.BulletinFactory;
import org.telegram.ui.DialogsActivity;
+import org.telegram.ui.EditWidgetActivity;
import org.telegram.ui.ProfileActivity;
import java.io.File;
@@ -52,6 +54,7 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Locale;
+import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
@@ -187,6 +190,7 @@ public class MessagesController extends BaseController implements NotificationCe
private boolean gettingNewDeleteTask;
private int currentDeletingTaskTime;
private ArrayList currentDeletingTaskMids;
+ private boolean currentDeletingTaskMedia;
private int currentDeletingTaskChannelId;
private Runnable currentDeleteTaskRunnable;
@@ -309,6 +313,8 @@ public class MessagesController extends BaseController implements NotificationCe
public boolean suggestStickersApiOnly;
public ArrayList gifSearchEmojies = new ArrayList<>();
public HashSet diceEmojies;
+ public Set autologinDomains;
+ public String autologinToken;
public HashMap diceSuccess = new HashMap<>();
public HashMap emojiSounds = new HashMap<>();
@@ -854,6 +860,15 @@ public class MessagesController extends BaseController implements NotificationCe
exportPrivateUri.add("@s.whatsapp.net/");
}
+ autologinDomains = mainPreferences.getStringSet("autologinDomains", null);
+ if (autologinDomains != null) {
+ autologinDomains = new HashSet<>(autologinDomains);
+ } else {
+ autologinDomains = new HashSet<>();
+ }
+
+ autologinToken = mainPreferences.getString("autologinToken", null);
+
Set emojies = mainPreferences.getStringSet("diceEmojies", null);
if (emojies == null) {
diceEmojies = new HashSet<>();
@@ -1505,6 +1520,36 @@ public class MessagesController extends BaseController implements NotificationCe
}
break;
}
+ case "autologin_domains": {
+ HashSet newDomains = new HashSet<>();
+ if (value.value instanceof TLRPC.TL_jsonArray) {
+ TLRPC.TL_jsonArray array = (TLRPC.TL_jsonArray) value.value;
+ for (int b = 0, N2 = array.value.size(); b < N2; b++) {
+ TLRPC.JSONValue val = array.value.get(b);
+ if (val instanceof TLRPC.TL_jsonString) {
+ TLRPC.TL_jsonString string = (TLRPC.TL_jsonString) val;
+ newDomains.add(string.value);
+ }
+ }
+ }
+ if (!autologinDomains.equals(newDomains)) {
+ autologinDomains = newDomains;
+ editor.putStringSet("autologinDomains", autologinDomains);
+ changed = true;
+ }
+ break;
+ }
+ case "autologin_token": {
+ if (value.value instanceof TLRPC.TL_jsonString) {
+ TLRPC.TL_jsonString string = (TLRPC.TL_jsonString) value.value;
+ if (!string.value.equals(autologinToken)) {
+ autologinToken = string.value;
+ editor.putString("autologinToken", autologinToken);
+ changed = true;
+ }
+ }
+ break;
+ }
case "emojies_send_dice": {
HashSet newEmojies = new HashSet<>();
if (value.value instanceof TLRPC.TL_jsonArray) {
@@ -1759,20 +1804,29 @@ public class MessagesController extends BaseController implements NotificationCe
}));
}
- public void removeSuggestion(String suggestion) {
- if (suggestion == null) {
+ public void removeSuggestion(long did, String suggestion) {
+ if (TextUtils.isEmpty(suggestion)) {
return;
}
- if (pendingSuggestions.remove(suggestion)) {
- SharedPreferences.Editor editor = mainPreferences.edit();
- editor.putStringSet("pendingSuggestions", pendingSuggestions);
- editor.commit();
- TLRPC.TL_help_dismissSuggestion req = new TLRPC.TL_help_dismissSuggestion();
- req.suggestion = suggestion;
- getConnectionsManager().sendRequest(req, (response, error) -> {
-
- });
+ if (did == 0) {
+ if (pendingSuggestions.remove(suggestion)) {
+ SharedPreferences.Editor editor = mainPreferences.edit();
+ editor.putStringSet("pendingSuggestions", pendingSuggestions);
+ editor.commit();
+ } else {
+ return;
+ }
}
+ TLRPC.TL_help_dismissSuggestion req = new TLRPC.TL_help_dismissSuggestion();
+ req.suggestion = suggestion;
+ if (did == 0) {
+ req.peer = new TLRPC.TL_inputPeerEmpty();
+ } else {
+ req.peer = getInputPeer((int) did);
+ }
+ getConnectionsManager().sendRequest(req, (response, error) -> {
+
+ });
}
public void updateConfig(final TLRPC.TL_config config) {
@@ -2393,6 +2447,8 @@ public class MessagesController extends BaseController implements NotificationCe
getLocationController().cleanup();
getMediaDataController().cleanup();
+ showFiltersTooltip = false;
+
DialogsActivity.dialogsLoaded[currentAccount] = false;
SharedPreferences.Editor editor = notificationsPreferences.edit();
@@ -2400,7 +2456,52 @@ public class MessagesController extends BaseController implements NotificationCe
editor = emojiPreferences.edit();
editor.putLong("lastGifLoadTime", 0).putLong("lastStickersLoadTime", 0).putLong("lastStickersLoadTimeMask", 0).putLong("lastStickersLoadTimeFavs", 0).commit();
editor = mainPreferences.edit();
- editor.remove("archivehint").remove("proximityhint").remove("archivehint_l").remove("gifhint").remove("soundHint").remove("dcDomainName2").remove("webFileDatacenterId").remove("themehint").commit();
+ editor.remove("archivehint").remove("proximityhint").remove("archivehint_l").remove("gifhint").remove("soundHint").remove("dcDomainName2").remove("webFileDatacenterId").remove("themehint").remove("showFiltersTooltip").commit();
+
+ SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("shortcut_widget", Activity.MODE_PRIVATE);
+ SharedPreferences.Editor widgetEditor = null;
+ AppWidgetManager appWidgetManager = null;
+ ArrayList chatsWidgets = null;
+ ArrayList contactsWidgets = null;
+ Map values = preferences.getAll();
+ for (Map.Entry entry : values.entrySet()) {
+ String key = entry.getKey();
+ if (key.startsWith("account")) {
+ Integer value = (Integer) entry.getValue();
+ if (value == currentAccount) {
+ int widgetId = Utilities.parseInt(key);
+ if (widgetEditor == null) {
+ widgetEditor = preferences.edit();
+ appWidgetManager = AppWidgetManager.getInstance(ApplicationLoader.applicationContext);
+ }
+ widgetEditor.putBoolean("deleted" + widgetId, true);
+ if (preferences.getInt("type" + widgetId, 0) == EditWidgetActivity.TYPE_CHATS) {
+ if (chatsWidgets == null) {
+ chatsWidgets = new ArrayList<>();
+ }
+ chatsWidgets.add(widgetId);
+ } else {
+ if (contactsWidgets == null) {
+ contactsWidgets = new ArrayList<>();
+ }
+ contactsWidgets.add(widgetId);
+ }
+ }
+ }
+ }
+ if (widgetEditor != null) {
+ widgetEditor.commit();
+ }
+ if (chatsWidgets != null) {
+ for (int a = 0, N = chatsWidgets.size(); a < N; a++) {
+ ChatsWidgetProvider.updateWidget(ApplicationLoader.applicationContext, appWidgetManager, chatsWidgets.get(a), true);
+ }
+ }
+ if (contactsWidgets != null) {
+ for (int a = 0, N = contactsWidgets.size(); a < N; a++) {
+ ContactsWidgetProvider.updateWidget(ApplicationLoader.applicationContext, appWidgetManager, contactsWidgets.get(a), true);
+ }
+ }
lastScheduledServerQueryTime.clear();
lastServerQueryTime.clear();
@@ -2513,6 +2614,7 @@ public class MessagesController extends BaseController implements NotificationCe
currentDeletingTaskTime = 0;
currentDeletingTaskMids = null;
+ currentDeletingTaskMedia = false;
currentDeletingTaskChannelId = 0;
gettingNewDeleteTask = false;
loadingBlockedPeers = false;
@@ -3460,6 +3562,7 @@ public class MessagesController extends BaseController implements NotificationCe
} else if (currentUser != null) {
req.peer = getInputPeer(currentUser.id);
}
+ req.message = "";
req.reason = new TLRPC.TL_inputReportReasonGeoIrrelevant();
getConnectionsManager().sendRequest(req, (response, error) -> {
@@ -3651,7 +3754,9 @@ public class MessagesController extends BaseController implements NotificationCe
getNewDeleteTask(null, 0);
}
});
- AndroidUtilities.runOnUIThread(() -> getNotificationCenter().postNotificationName(NotificationCenter.didCreatedNewDeleteTask, mids));
+ if (mids != null) {
+ AndroidUtilities.runOnUIThread(() -> getNotificationCenter().postNotificationName(NotificationCenter.didCreatedNewDeleteTask, mids));
+ }
}
public void getNewDeleteTask(final ArrayList oldTask, final int channelId) {
@@ -3672,15 +3777,17 @@ public class MessagesController extends BaseController implements NotificationCe
currentDeleteTaskRunnable = null;
final ArrayList mids = new ArrayList<>(currentDeletingTaskMids);
AndroidUtilities.runOnUIThread(() -> {
- if (!mids.isEmpty() && mids.get(0) > 0) {
+ if (currentDeletingTaskMedia) {
getMessagesStorage().emptyMessagesMedia(mids);
} else {
- deleteMessages(mids, null, null, 0, 0, false, false);
+ deleteMessages(mids, null, null, 0, 0, false, false, !mids.isEmpty() && mids.get(0) > 0);
}
Utilities.stageQueue.postRunnable(() -> {
getNewDeleteTask(mids, currentDeletingTaskChannelId);
currentDeletingTaskTime = 0;
currentDeletingTaskMids = null;
+ currentDeletingTaskMedia = false;
+ currentDeletingTaskChannelId = 0;
});
});
return true;
@@ -3688,12 +3795,14 @@ public class MessagesController extends BaseController implements NotificationCe
return false;
}
- public void processLoadedDeleteTask(final int taskTime, final ArrayList messages, final int channelId) {
+ public void processLoadedDeleteTask(int taskTime, ArrayList messages, boolean media, int channelId) {
Utilities.stageQueue.postRunnable(() -> {
gettingNewDeleteTask = false;
if (messages != null) {
currentDeletingTaskTime = taskTime;
currentDeletingTaskMids = messages;
+ currentDeletingTaskMedia = media;
+ currentDeletingTaskChannelId = channelId;
if (currentDeleteTaskRunnable != null) {
Utilities.stageQueue.cancelRunnable(currentDeleteTaskRunnable);
@@ -3708,6 +3817,8 @@ public class MessagesController extends BaseController implements NotificationCe
} else {
currentDeletingTaskTime = 0;
currentDeletingTaskMids = null;
+ currentDeletingTaskMedia = false;
+ currentDeletingTaskChannelId = 0;
}
});
}
@@ -4241,20 +4352,26 @@ public class MessagesController extends BaseController implements NotificationCe
}
public void deleteMessages(ArrayList messages, ArrayList randoms, TLRPC.EncryptedChat encryptedChat, final long dialogId, final int channelId, boolean forAll, boolean scheduled) {
- deleteMessages(messages, randoms, encryptedChat, dialogId, channelId, forAll, scheduled, 0, null);
+ deleteMessages(messages, randoms, encryptedChat, dialogId, channelId, forAll, scheduled, false, 0, null);
}
- public void deleteMessages(ArrayList messages, ArrayList randoms, TLRPC.EncryptedChat encryptedChat, final long dialogId, final int channelId, boolean forAll, boolean scheduled, long taskId, TLObject taskRequest) {
+ public void deleteMessages(ArrayList messages, ArrayList randoms, TLRPC.EncryptedChat encryptedChat, final long dialogId, final int channelId, boolean forAll, boolean scheduled, boolean cacheOnly) {
+ deleteMessages(messages, randoms, encryptedChat, dialogId, channelId, forAll, scheduled, cacheOnly, 0, null);
+ }
+
+ public void deleteMessages(ArrayList messages, ArrayList randoms, TLRPC.EncryptedChat encryptedChat, final long dialogId, final int channelId, boolean forAll, boolean scheduled, boolean cacheOnly, long taskId, TLObject taskRequest) {
if ((messages == null || messages.isEmpty()) && taskId == 0) {
return;
}
ArrayList toSend = null;
if (taskId == 0) {
- toSend = new ArrayList<>();
- for (int a = 0, N = messages.size(); a < N; a++) {
- Integer mid = messages.get(a);
- if (mid > 0) {
- toSend.add(mid);
+ if (!cacheOnly) {
+ toSend = new ArrayList<>();
+ for (int a = 0, N = messages.size(); a < N; a++) {
+ Integer mid = messages.get(a);
+ if (mid > 0) {
+ toSend.add(mid);
+ }
}
}
if (scheduled) {
@@ -4276,6 +4393,9 @@ public class MessagesController extends BaseController implements NotificationCe
}
getNotificationCenter().postNotificationName(NotificationCenter.messagesDeleted, messages, channelId, scheduled);
}
+ if (cacheOnly) {
+ return;
+ }
final long newTaskId;
if (scheduled) {
@@ -4577,6 +4697,45 @@ public class MessagesController extends BaseController implements NotificationCe
deleteDialog(did, 1, onlyHistory, 0, revoke, null, 0);
}
+ public void setDialogHistoryTTL(final long did, int ttl) {
+ TLRPC.TL_messages_setHistoryTTL req = new TLRPC.TL_messages_setHistoryTTL();
+ req.peer = getInputPeer((int) did);
+ req.period = ttl;
+ getConnectionsManager().sendRequest(req, (response, error) -> {
+ if (response != null) {
+ TLRPC.Updates updates = (TLRPC.Updates) response;
+ processUpdates(updates, false);
+ }
+ });
+ int lowerId = (int) did;
+ TLRPC.ChatFull chatFull = null;
+ TLRPC.UserFull userFull = null;
+ if (lowerId > 0) {
+ userFull = getUserFull(lowerId);
+ if (userFull == null) {
+ return;
+ }
+ userFull.ttl_period = ttl;
+ userFull.flags |= 16384;
+ } else {
+ chatFull = getChatFull(-lowerId);
+ if (chatFull == null) {
+ return;
+ }
+ chatFull.ttl_period = ttl;
+ if (chatFull instanceof TLRPC.TL_channelFull) {
+ chatFull.flags |= 16777216;
+ } else {
+ chatFull.flags |= 16384;
+ }
+ }
+ if (chatFull != null) {
+ getNotificationCenter().postNotificationName(NotificationCenter.chatInfoDidLoad, chatFull, 0, false);
+ } else {
+ getNotificationCenter().postNotificationName(NotificationCenter.userInfoDidLoad, lowerId, userFull);
+ }
+ }
+
public void setDialogsInTransaction(boolean transaction) {
dialogsInTransaction = transaction;
if (!transaction) {
@@ -8769,8 +8928,60 @@ public class MessagesController extends BaseController implements NotificationCe
progressDialog.setOnCancelListener(dialog -> getConnectionsManager().cancelRequest(reqId, true));
try {
progressDialog.show();
- } catch (Exception e) {
- //don't promt
+ } catch (Exception ignore) {
+
+ }
+ }
+ }
+
+ public void convertToGigaGroup(final Context context, TLRPC.Chat chat, BaseFragment fragment, MessagesStorage.BooleanCallback convertRunnable) {
+ TLRPC.TL_channels_convertToGigagroup req = new TLRPC.TL_channels_convertToGigagroup();
+ req.channel = getInputChannel(chat);
+ final AlertDialog progressDialog = context != null ? new AlertDialog(context, 3) : null;
+ final int reqId = getConnectionsManager().sendRequest(req, (response, error) -> {
+ if (error == null) {
+ if (context != null) {
+ AndroidUtilities.runOnUIThread(() -> {
+ if (!((Activity) context).isFinishing()) {
+ try {
+ progressDialog.dismiss();
+ } catch (Exception e) {
+ FileLog.e(e);
+ }
+ }
+ });
+ }
+ TLRPC.Updates updates = (TLRPC.Updates) response;
+ processUpdates((TLRPC.Updates) response, false);
+ AndroidUtilities.runOnUIThread(() -> {
+ if (convertRunnable != null) {
+ convertRunnable.run(true);
+ }
+ });
+ } else {
+ AndroidUtilities.runOnUIThread(() -> {
+ if (convertRunnable != null) {
+ convertRunnable.run(false);
+ }
+ if (context != null) {
+ if (!((Activity) context).isFinishing()) {
+ try {
+ progressDialog.dismiss();
+ } catch (Exception e) {
+ FileLog.e(e);
+ }
+ AlertsCreator.processError(currentAccount, error, fragment, req, false);
+ }
+ }
+ });
+ }
+ });
+ if (progressDialog != null) {
+ progressDialog.setOnCancelListener(dialog -> getConnectionsManager().cancelRequest(reqId, true));
+ try {
+ progressDialog.showDelayed(400);
+ } catch (Exception ignore) {
+
}
}
}
@@ -10886,6 +11097,7 @@ public class MessagesController extends BaseController implements NotificationCe
message.via_bot_id = updates.via_bot_id;
message.flags = updates.flags | TLRPC.MESSAGE_FLAG_HAS_FROM_ID;
message.reply_to = updates.reply_to;
+ message.ttl_period = updates.ttl_period;
message.media = new TLRPC.TL_messageMediaEmpty();
ConcurrentHashMap read_max = message.out ? dialogs_read_outbox_max : dialogs_read_inbox_max;
@@ -12374,6 +12586,11 @@ public class MessagesController extends BaseController implements NotificationCe
updatesOnMainThread = new ArrayList<>();
}
updatesOnMainThread.add(baseUpdate);
+ } else if (baseUpdate instanceof TLRPC.TL_updatePeerHistoryTTL) {
+ if (updatesOnMainThread == null) {
+ updatesOnMainThread = new ArrayList<>();
+ }
+ updatesOnMainThread.add(baseUpdate);
}
}
if (messages != null) {
@@ -12992,6 +13209,47 @@ public class MessagesController extends BaseController implements NotificationCe
getNotificationCenter().postNotificationName(NotificationCenter.threadMessagesRead, (long) -update.channel_id, update.top_msg_id, 0, update.read_max_id);
} else if (baseUpdate instanceof TLRPC.TL_updateLoginToken) {
getNotificationCenter().postNotificationName(NotificationCenter.updateLoginToken);
+ } else if (baseUpdate instanceof TLRPC.TL_updatePeerHistoryTTL) {
+ TLRPC.TL_updatePeerHistoryTTL updatePeerHistoryTTL = (TLRPC.TL_updatePeerHistoryTTL) baseUpdate;
+ int lowerId = MessageObject.getPeerId(updatePeerHistoryTTL.peer);
+ TLRPC.ChatFull chatFull = null;
+ TLRPC.UserFull userFull = null;
+ if (lowerId > 0) {
+ userFull = getUserFull(lowerId);
+ if (userFull != null) {
+ userFull.ttl_period = updatePeerHistoryTTL.ttl_period;
+ if (userFull.ttl_period == 0) {
+ userFull.flags &= ~16384;
+ } else {
+ userFull.flags |= 16384;
+ }
+ }
+ } else {
+ chatFull = getChatFull(-lowerId);
+ if (chatFull != null) {
+ chatFull.ttl_period = updatePeerHistoryTTL.ttl_period;
+ if (chatFull instanceof TLRPC.TL_channelFull) {
+ if (chatFull.ttl_period == 0) {
+ chatFull.flags &= ~16777216;
+ } else {
+ chatFull.flags |= 16777216;
+ }
+ } else {
+ if (chatFull.ttl_period == 0) {
+ chatFull.flags &= ~16384;
+ } else {
+ chatFull.flags |= 16384;
+ }
+ }
+ }
+ }
+ if (chatFull != null) {
+ getNotificationCenter().postNotificationName(NotificationCenter.chatInfoDidLoad, chatFull, 0, false);
+ getMessagesStorage().updateChatInfo(chatFull, false);
+ } else if (userFull != null) {
+ getNotificationCenter().postNotificationName(NotificationCenter.userInfoDidLoad, lowerId, userFull);
+ getMessagesStorage().updateUserInfo(userFull, false);
+ }
}
}
if (editor != null) {
@@ -13768,6 +14026,7 @@ public class MessagesController extends BaseController implements NotificationCe
}
if (chat != null && chat.megagroup) {
dialogsGroupsOnly.add(d);
+ canAddToForward = !chat.gigagroup || ChatObject.hasAdminRights(chat);
} else {
dialogsChannelsOnly.add(d);
canAddToForward = ChatObject.hasAdminRights(chat) && ChatObject.canPost(chat);
@@ -14039,9 +14298,9 @@ public class MessagesController extends BaseController implements NotificationCe
openChatOrProfileWith(res.users.get(0), null, fragment, type, false);
}
} else {
- if (fragment.getParentActivity() != null) {
+ if (fragment != null) {
try {
- Toast.makeText(fragment.getParentActivity(), LocaleController.getString("NoUsernameFound", R.string.NoUsernameFound), Toast.LENGTH_SHORT).show();
+ BulletinFactory.of(fragment).createErrorBulletin(LocaleController.getString("NoUsernameFound", R.string.NoUsernameFound)).show();
} catch (Exception e) {
FileLog.e(e);
}
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
index be40fa912..8bda7fff7 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
@@ -33,6 +33,7 @@ import org.telegram.tgnet.TLObject;
import org.telegram.tgnet.TLRPC;
import org.telegram.ui.ActionBar.Theme;
import org.telegram.ui.Adapters.DialogsSearchAdapter;
+import org.telegram.ui.EditWidgetActivity;
import java.io.File;
import java.util.ArrayList;
@@ -92,7 +93,7 @@ public class MessagesStorage extends BaseController {
private CountDownLatch openSync = new CountDownLatch(1);
private static volatile MessagesStorage[] Instance = new MessagesStorage[UserConfig.MAX_ACCOUNT_COUNT];
- private final static int LAST_DB_VERSION = 76;
+ private final static int LAST_DB_VERSION = 77;
public static MessagesStorage getInstance(int num) {
MessagesStorage localInstance = Instance[num];
@@ -322,7 +323,7 @@ public class MessagesStorage extends BaseController {
database.executeFast("CREATE TABLE randoms(random_id INTEGER, mid INTEGER, PRIMARY KEY (random_id, mid))").stepThis().dispose();
database.executeFast("CREATE INDEX IF NOT EXISTS mid_idx_randoms ON randoms(mid);").stepThis().dispose();
- database.executeFast("CREATE TABLE enc_tasks_v2(mid INTEGER PRIMARY KEY, date INTEGER)").stepThis().dispose();
+ database.executeFast("CREATE TABLE enc_tasks_v2(mid INTEGER PRIMARY KEY, date INTEGER, media INTEGER)").stepThis().dispose();
database.executeFast("CREATE INDEX IF NOT EXISTS date_idx_enc_tasks_v2 ON enc_tasks_v2(date);").stepThis().dispose();
database.executeFast("CREATE TABLE messages_seq(mid INTEGER PRIMARY KEY, seq_in INTEGER, seq_out INTEGER);").stepThis().dispose();
@@ -457,6 +458,13 @@ public class MessagesStorage extends BaseController {
openDatabase(openTries == 1 ? 2 : 3);
}
}
+ if (BuildVars.DEBUG_PRIVATE_VERSION) { //TODO remove later
+ try {
+ database.executeFast("DELETE FROM pending_tasks WHERE 1").stepThis().dispose();
+ } catch (Exception e) {
+ FileLog.e(e);
+ }
+ }
loadDialogFilters();
loadUnreadMessages();
loadPendingTasks();
@@ -948,6 +956,11 @@ public class MessagesStorage extends BaseController {
version = 76;
}
if (version == 76) {
+ executeNoException("ALTER TABLE enc_tasks_v2 ADD COLUMN media INTEGER default -1");
+ database.executeFast("PRAGMA user_version = 77").stepThis().dispose();
+ version = 77;
+ }
+ if (version == 77) {
}
} catch (Exception e) {
@@ -1203,7 +1216,7 @@ public class MessagesStorage extends BaseController {
removePendingTask(taskId);
} else {
final TLObject finalRequest = request;
- AndroidUtilities.runOnUIThread(() -> getMessagesController().deleteMessages(null, null, null, 0, channelId, true, false, taskId, finalRequest));
+ AndroidUtilities.runOnUIThread(() -> getMessagesController().deleteMessages(null, null, null, 0, channelId, true, false, false, taskId, finalRequest));
}
break;
}
@@ -1292,7 +1305,7 @@ public class MessagesStorage extends BaseController {
removePendingTask(taskId);
} else {
final TLObject finalRequest = request;
- AndroidUtilities.runOnUIThread(() -> MessagesController.getInstance(currentAccount).deleteMessages(null, null, null, dialogId, channelId, true, true, taskId, finalRequest));
+ AndroidUtilities.runOnUIThread(() -> MessagesController.getInstance(currentAccount).deleteMessages(null, null, null, dialogId, channelId, true, true, false, taskId, finalRequest));
}
break;
}
@@ -3626,13 +3639,30 @@ public class MessagesStorage extends BaseController {
storageQueue.postRunnable(() -> {
try {
if (oldTask != null) {
- String ids = TextUtils.join(",", oldTask);
+ String ids;
+ if (channelId != 0) {
+ StringBuilder builder = new StringBuilder();
+ for (int a = 0, N = oldTask.size(); a < N; a++) {
+ long messageId = oldTask.get(a);
+ if (channelId != 0) {
+ messageId |= ((long) channelId) << 32;
+ }
+ if (builder.length() > 0) {
+ builder.append(",");
+ }
+ builder.append(messageId);
+ }
+ ids = builder.toString();
+ } else {
+ ids = TextUtils.join(",", oldTask);
+ }
database.executeFast(String.format(Locale.US, "DELETE FROM enc_tasks_v2 WHERE mid IN(%s)", ids)).stepThis().dispose();
}
int date = 0;
int channelId1 = -1;
+ boolean media = false;
ArrayList arr = null;
- SQLiteCursor cursor = database.queryFinalized("SELECT mid, date FROM enc_tasks_v2 WHERE date = (SELECT min(date) FROM enc_tasks_v2)");
+ SQLiteCursor cursor = database.queryFinalized("SELECT mid, date, media FROM enc_tasks_v2 WHERE date = (SELECT min(date) FROM enc_tasks_v2)");
while (cursor.next()) {
long mid = cursor.longValue(0);
if (channelId1 == -1) {
@@ -3645,10 +3675,17 @@ public class MessagesStorage extends BaseController {
if (arr == null) {
arr = new ArrayList<>();
}
- arr.add((int) mid);
+ int m = (int) mid;
+ arr.add(m);
+ int isMedia = cursor.intValue(2);
+ if (isMedia == -1) {
+ media = m > 0;
+ } else {
+ media = isMedia != 0;
+ }
}
cursor.dispose();
- getMessagesController().processLoadedDeleteTask(date, arr, channelId1);
+ getMessagesController().processLoadedDeleteTask(date, arr, media, channelId1);
} catch (Exception e) {
FileLog.e(e);
}
@@ -3742,7 +3779,7 @@ public class MessagesStorage extends BaseController {
getNotificationCenter().postNotificationName(NotificationCenter.messagesReadContent, midsArray);
});
- SQLitePreparedStatement state = database.executeFast("REPLACE INTO enc_tasks_v2 VALUES(?, ?)");
+ SQLitePreparedStatement state = database.executeFast("REPLACE INTO enc_tasks_v2 VALUES(?, ?, ?)");
for (int a = 0; a < messages.size(); a++) {
int key = messages.keyAt(a);
ArrayList arr = messages.get(key);
@@ -3750,6 +3787,7 @@ public class MessagesStorage extends BaseController {
state.requery();
state.bindLong(1, arr.get(b));
state.bindInteger(2, key);
+ state.bindInteger(3, 1);
state.step();
}
}
@@ -3809,7 +3847,7 @@ public class MessagesStorage extends BaseController {
if (messages.size() != 0) {
database.beginTransaction();
- SQLitePreparedStatement state = database.executeFast("REPLACE INTO enc_tasks_v2 VALUES(?, ?)");
+ SQLitePreparedStatement state = database.executeFast("REPLACE INTO enc_tasks_v2 VALUES(?, ?, ?)");
for (int a = 0; a < messages.size(); a++) {
int key = messages.keyAt(a);
ArrayList arr = messages.get(key);
@@ -3817,6 +3855,7 @@ public class MessagesStorage extends BaseController {
state.requery();
state.bindLong(1, arr.get(b));
state.bindInteger(2, key);
+ state.bindInteger(3, 0);
state.step();
}
}
@@ -6872,9 +6911,13 @@ public class MessagesStorage extends BaseController {
}
private void updateWidgets(ArrayList dids) {
+ if (dids.isEmpty()) {
+ return;
+ }
try {
AppWidgetManager appWidgetManager = null;
- SQLiteCursor cursor = database.queryFinalized(String.format(Locale.US, "SELECT DISTINCT id FROM shortcut_widget WHERE did IN(%s)", TextUtils.join(",", dids)));
+ String ids = TextUtils.join(",", dids);
+ SQLiteCursor cursor = database.queryFinalized(String.format(Locale.US, "SELECT DISTINCT id FROM shortcut_widget WHERE did IN(%s,-1)", TextUtils.join(",", dids)));
while (cursor.next()) {
if (appWidgetManager == null) {
appWidgetManager = AppWidgetManager.getInstance(ApplicationLoader.applicationContext);
@@ -6890,16 +6933,27 @@ public class MessagesStorage extends BaseController {
public void putWidgetDialogs(int widgetId, ArrayList dids) {
storageQueue.postRunnable(() -> {
try {
+ database.beginTransaction();
+ database.executeFast("DELETE FROM shortcut_widget WHERE id = " + widgetId).stepThis().dispose();
SQLitePreparedStatement state = database.executeFast("REPLACE INTO shortcut_widget VALUES(?, ?, ?)");
- for (int a = 0, N = dids.size(); a < N; a++) {
- long did = dids.get(a);
+ if (dids.isEmpty()) {
state.requery();
state.bindInteger(1, widgetId);
- state.bindInteger(2, (int) did);
- state.bindInteger(3, a);
+ state.bindLong(2, -1);
+ state.bindInteger(3, 0);
state.step();
+ } else {
+ for (int a = 0, N = dids.size(); a < N; a++) {
+ long did = dids.get(a);
+ state.requery();
+ state.bindInteger(1, widgetId);
+ state.bindLong(2, did);
+ state.bindInteger(3, a);
+ state.step();
+ }
}
state.dispose();
+ database.commitTransaction();
} catch (Exception e) {
FileLog.e(e);
}
@@ -6916,7 +6970,7 @@ public class MessagesStorage extends BaseController {
});
}
- public void getWidgetDialogs(int widgetId, ArrayList dids, LongSparseArray dialogs, LongSparseArray messages, ArrayList users, ArrayList chats) {
+ public void getWidgetDialogIds(int widgetId, int type, ArrayList dids, ArrayList users, ArrayList chats, boolean edit) {
final CountDownLatch countDownLatch = new CountDownLatch(1);
storageQueue.postRunnable(() -> {
try {
@@ -6924,18 +6978,128 @@ public class MessagesStorage extends BaseController {
ArrayList chatsToLoad = new ArrayList<>();
SQLiteCursor cursor = database.queryFinalized(String.format(Locale.US, "SELECT did FROM shortcut_widget WHERE id = %d ORDER BY ord ASC", widgetId));
while (cursor.next()) {
- int id = cursor.intValue(0);
+ long id = cursor.longValue(0);
+ if (id == -1) {
+ continue;
+ }
dids.add(id);
- if (id > 0) {
- usersToLoad.add(id);
- } else {
- chatsToLoad.add(-id);
+ if (users != null && chats != null) {
+ int lowerId = (int) id;
+ if (lowerId > 0) {
+ usersToLoad.add(lowerId);
+ } else {
+ chatsToLoad.add(-lowerId);
+ }
}
}
cursor.dispose();
- cursor = database.queryFinalized(String.format(Locale.US, "SELECT d.did, d.last_mid, d.unread_count, d.date, m.data, m.read_state, m.mid, m.send_state, m.date FROM dialogs as d LEFT JOIN messages as m ON d.last_mid = m.mid WHERE d.did IN(%s)", TextUtils.join(",", dids)));
+ if (!edit && dids.isEmpty()) {
+ if (type == EditWidgetActivity.TYPE_CHATS) {
+ cursor = database.queryFinalized("SELECT did FROM dialogs WHERE folder_id = 0 ORDER BY pinned DESC, date DESC LIMIT 0,10");
+ while (cursor.next()) {
+ long dialogId = cursor.longValue(0);
+ if (DialogObject.isFolderDialogId(dialogId)) {
+ continue;
+ }
+ dids.add(dialogId);
+ if (users != null && chats != null) {
+ int lowerId = (int) dialogId;
+ if (lowerId > 0) {
+ usersToLoad.add(lowerId);
+ } else {
+ chatsToLoad.add(-lowerId);
+ }
+ }
+ }
+ cursor.dispose();
+ } else {
+ cursor = getMessagesStorage().getDatabase().queryFinalized("SELECT did FROM chat_hints WHERE type = 0 ORDER BY rating DESC LIMIT 4");
+ while (cursor.next()) {
+ long dialogId = cursor.longValue(0);
+ dids.add(dialogId);
+ if (users != null && chats != null) {
+ int lowerId = (int) dialogId;
+ if (lowerId > 0) {
+ usersToLoad.add(lowerId);
+ } else {
+ chatsToLoad.add(-lowerId);
+ }
+ }
+ }
+ cursor.dispose();
+ }
+ }
+ if (users != null && chats != null) {
+ if (!chatsToLoad.isEmpty()) {
+ getChatsInternal(TextUtils.join(",", chatsToLoad), chats);
+ }
+ if (!usersToLoad.isEmpty()) {
+ getUsersInternal(TextUtils.join(",", usersToLoad), users);
+ }
+ }
+ } catch (Exception e) {
+ FileLog.e(e);
+ } finally {
+ countDownLatch.countDown();
+ }
+ });
+ try {
+ countDownLatch.await();
+ } catch (Exception e) {
+ FileLog.e(e);
+ }
+ }
+
+ public void getWidgetDialogs(int widgetId, int type, ArrayList dids, LongSparseArray dialogs, LongSparseArray messages, ArrayList users, ArrayList chats) {
+ final CountDownLatch countDownLatch = new CountDownLatch(1);
+ storageQueue.postRunnable(() -> {
+ try {
+ boolean add = false;
+ ArrayList usersToLoad = new ArrayList<>();
+ ArrayList chatsToLoad = new ArrayList<>();
+ SQLiteCursor cursor = database.queryFinalized(String.format(Locale.US, "SELECT did FROM shortcut_widget WHERE id = %d ORDER BY ord ASC", widgetId));
+ while (cursor.next()) {
+ long id = cursor.longValue(0);
+ if (id == -1) {
+ continue;
+ }
+ dids.add(id);
+ int lowerId = (int) id;
+ if (lowerId > 0) {
+ usersToLoad.add(lowerId);
+ } else {
+ chatsToLoad.add(-lowerId);
+ }
+ }
+ cursor.dispose();
+ if (dids.isEmpty() && type == EditWidgetActivity.TYPE_CONTACTS) {
+ cursor = getMessagesStorage().getDatabase().queryFinalized("SELECT did FROM chat_hints WHERE type = 0 ORDER BY rating DESC LIMIT 4");
+ while (cursor.next()) {
+ long dialogId = cursor.longValue(0);
+ dids.add(dialogId);
+ int lowerId = (int) dialogId;
+ if (lowerId > 0) {
+ usersToLoad.add(lowerId);
+ } else {
+ chatsToLoad.add(-lowerId);
+ }
+ }
+ cursor.dispose();
+ }
+ if (dids.isEmpty()) {
+ add = true;
+ cursor = database.queryFinalized("SELECT d.did, d.last_mid, d.unread_count, d.date, m.data, m.read_state, m.mid, m.send_state, m.date FROM dialogs as d LEFT JOIN messages as m ON d.last_mid = m.mid WHERE d.folder_id = 0 ORDER BY d.pinned DESC, d.date DESC LIMIT 0,10");
+ } else {
+ cursor = database.queryFinalized(String.format(Locale.US, "SELECT d.did, d.last_mid, d.unread_count, d.date, m.data, m.read_state, m.mid, m.send_state, m.date FROM dialogs as d LEFT JOIN messages as m ON d.last_mid = m.mid WHERE d.did IN(%s)", TextUtils.join(",", dids)));
+ }
while (cursor.next()) {
long dialogId = cursor.longValue(0);
+ if (DialogObject.isFolderDialogId(dialogId)) {
+ continue;
+ }
+ if (add) {
+ dids.add(dialogId);
+ }
TLRPC.Dialog dialog = new TLRPC.TL_dialog();
dialog.id = dialogId;
dialog.top_message = cursor.intValue(1);
@@ -6962,6 +7126,28 @@ public class MessagesStorage extends BaseController {
}
}
cursor.dispose();
+ if (!add) {
+ if (dids.size() > dialogs.size()) {
+ for (int a = 0, N = dids.size(); a < N; a++) {
+ long did = dids.get(a);
+ if (dialogs.get(dids.get(a)) == null) {
+ TLRPC.TL_dialog dialog = new TLRPC.TL_dialog();
+ dialog.id = did;
+ dialogs.put(dialog.id, dialog);
+ int lowerId = (int) did;
+ if (lowerId < 0) {
+ if (chatsToLoad.contains(-lowerId)) {
+ chatsToLoad.add(-lowerId);
+ }
+ } else {
+ if (usersToLoad.contains(lowerId)) {
+ usersToLoad.add(lowerId);
+ }
+ }
+ }
+ }
+ }
+ }
if (!chatsToLoad.isEmpty()) {
getChatsInternal(TextUtils.join(",", chatsToLoad), chats);
}
@@ -8194,6 +8380,8 @@ public class MessagesStorage extends BaseController {
SQLitePreparedStatement state_download = database.executeFast("REPLACE INTO download_queue VALUES(?, ?, ?, ?, ?)");
SQLitePreparedStatement state_webpage = database.executeFast("REPLACE INTO webpage_pending VALUES(?, ?)");
SQLitePreparedStatement state_polls = null;
+ SQLitePreparedStatement state_tasks = null;
+ int minDeleteTime = Integer.MAX_VALUE;
for (int a = 0; a < messages.size(); a++) {
TLRPC.Message message = messages.get(a);
@@ -8429,6 +8617,18 @@ public class MessagesStorage extends BaseController {
state_media.step();
}
+ if (message.ttl_period != 0 && message.id > 0) {
+ if (state_tasks == null) {
+ state_tasks = database.executeFast("REPLACE INTO enc_tasks_v2 VALUES(?, ?, ?)");
+ }
+ state_tasks.requery();
+ state_tasks.bindLong(1, messageId);
+ state_tasks.bindInteger(2, message.date + message.ttl_period);
+ state_tasks.bindInteger(3, 0);
+ state_tasks.step();
+ minDeleteTime = Math.min(minDeleteTime, message.date + message.ttl_period);
+ }
+
if (message.media instanceof TLRPC.TL_messageMediaPoll) {
if (state_polls == null) {
state_polls = database.executeFast("REPLACE INTO polls VALUES(?, ?)");
@@ -8518,6 +8718,10 @@ public class MessagesStorage extends BaseController {
if (state_media != null) {
state_media.dispose();
}
+ if (state_tasks != null) {
+ state_tasks.dispose();
+ getMessagesController().didAddedNewTask(minDeleteTime, null);
+ }
if (state_polls != null) {
state_polls.dispose();
}
@@ -9893,7 +10097,6 @@ public class MessagesStorage extends BaseController {
SQLitePreparedStatement state = database.executeFast("REPLACE INTO messages VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, ?, ?, ?, ?, ?)");
SQLitePreparedStatement state2 = database.executeFast("REPLACE INTO media_v2 VALUES(?, ?, ?, ?, ?)");
-
if (message.dialog_id == 0) {
MessageObject.getDialogId(message);
}
@@ -10059,6 +10262,8 @@ public class MessagesStorage extends BaseController {
SQLitePreparedStatement state_media = database.executeFast("REPLACE INTO media_v2 VALUES(?, ?, ?, ?, ?)");
SQLitePreparedStatement state_polls = null;
SQLitePreparedStatement state_webpage = null;
+ SQLitePreparedStatement state_tasks = null;
+ int minDeleteTime = Integer.MAX_VALUE;
TLRPC.Message botKeyboard = null;
int channelId = 0;
for (int a = 0; a < count; a++) {
@@ -10230,6 +10435,18 @@ public class MessagesStorage extends BaseController {
}
data.reuse();
+ if (message.ttl_period != 0 && message.id > 0) {
+ if (state_tasks == null) {
+ state_tasks = database.executeFast("REPLACE INTO enc_tasks_v2 VALUES(?, ?, ?)");
+ }
+ state_tasks.requery();
+ state_tasks.bindLong(1, messageId);
+ state_tasks.bindInteger(2, message.date + message.ttl_period);
+ state_tasks.bindInteger(3, 0);
+ state_tasks.step();
+ minDeleteTime = Math.min(minDeleteTime, message.date + message.ttl_period);
+ }
+
if (message.media instanceof TLRPC.TL_messageMediaPoll) {
if (state_polls == null) {
state_polls = database.executeFast("REPLACE INTO polls VALUES(?, ?)");
@@ -10260,6 +10477,10 @@ public class MessagesStorage extends BaseController {
if (state_webpage != null) {
state_webpage.dispose();
}
+ if (state_tasks != null) {
+ state_tasks.dispose();
+ getMessagesController().didAddedNewTask(minDeleteTime, null);
+ }
if (state_polls != null) {
state_polls.dispose();
}
@@ -10727,6 +10948,8 @@ public class MessagesStorage extends BaseController {
SQLitePreparedStatement state_holes = database.executeFast("REPLACE INTO messages_holes VALUES(?, ?, ?)");
SQLitePreparedStatement state_media_holes = database.executeFast("REPLACE INTO media_holes_v2 VALUES(?, ?, ?, ?)");
SQLitePreparedStatement state_polls = null;
+ SQLitePreparedStatement state_tasks = null;
+ int minDeleteTime = Integer.MAX_VALUE;
for (int a = 0; a < dialogs.dialogs.size(); a++) {
TLRPC.Dialog dialog = dialogs.dialogs.get(a);
@@ -10828,6 +11051,18 @@ public class MessagesStorage extends BaseController {
}
data.reuse();
+ if (message.ttl_period != 0 && message.id > 0) {
+ if (state_tasks == null) {
+ state_tasks = database.executeFast("REPLACE INTO enc_tasks_v2 VALUES(?, ?, ?)");
+ }
+ state_tasks.requery();
+ state_tasks.bindLong(1, messageId);
+ state_tasks.bindInteger(2, message.date + message.ttl_period);
+ state_tasks.bindInteger(3, 0);
+ state_tasks.step();
+ minDeleteTime = Math.min(minDeleteTime, message.date + message.ttl_period);
+ }
+
if (message.media instanceof TLRPC.TL_messageMediaPoll) {
if (state_polls == null) {
state_polls = database.executeFast("REPLACE INTO polls VALUES(?, ?)");
@@ -10898,6 +11133,10 @@ public class MessagesStorage extends BaseController {
state_settings.dispose();
state_holes.dispose();
state_media_holes.dispose();
+ if (state_tasks != null) {
+ state_tasks.dispose();
+ getMessagesController().didAddedNewTask(minDeleteTime, null);
+ }
if (state_polls != null) {
state_polls.dispose();
}
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MusicPlayerService.java b/TMessagesProj/src/main/java/org/telegram/messenger/MusicPlayerService.java
index 4db885cc3..76dbf72ec 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MusicPlayerService.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MusicPlayerService.java
@@ -30,11 +30,12 @@ import android.media.session.MediaSession;
import android.media.session.PlaybackState;
import android.os.Build;
import android.os.IBinder;
-import androidx.core.app.NotificationCompat;
import android.text.TextUtils;
import android.view.View;
import android.widget.RemoteViews;
+import androidx.core.app.NotificationCompat;
+
import com.google.android.exoplayer2.C;
import org.telegram.messenger.audioinfo.AudioInfo;
@@ -299,6 +300,7 @@ public class MusicPlayerService extends Service implements NotificationCenter.No
MediaMetadata.Builder meta = new MediaMetadata.Builder()
.putBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART, fullAlbumArt)
.putString(MediaMetadata.METADATA_KEY_ALBUM_ARTIST, authorName)
+ .putString(MediaMetadata.METADATA_KEY_ARTIST, authorName)
.putLong(MediaMetadata.METADATA_KEY_DURATION, duration)
.putString(MediaMetadata.METADATA_KEY_TITLE, songName)
.putString(MediaMetadata.METADATA_KEY_ALBUM, audioInfo != null ? audioInfo.getAlbum() : null);
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/NotificationCenter.java b/TMessagesProj/src/main/java/org/telegram/messenger/NotificationCenter.java
index 1737ea8c4..1d23a9168 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/NotificationCenter.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/NotificationCenter.java
@@ -8,11 +8,11 @@
package org.telegram.messenger;
-import androidx.annotation.UiThread;
-
import android.os.SystemClock;
import android.util.SparseArray;
+import androidx.annotation.UiThread;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -214,6 +214,7 @@ public class NotificationCenter {
public static final int voipServiceCreated = totalEvents++;
public static final int webRtcMicAmplitudeEvent = totalEvents++;
public static final int webRtcSpeakerAmplitudeEvent = totalEvents++;
+ public static final int showBulletin = totalEvents++;
// custom
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java b/TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java
index e9ab929fe..117db41d6 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java
@@ -3483,7 +3483,8 @@ public class NotificationsController extends BaseController {
Intent intent = new Intent(ApplicationLoader.applicationContext, LaunchActivity.class);
intent.setAction("com.tmessages.openchat" + Math.random() + Integer.MAX_VALUE);
- intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ //intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
if ((int) dialog_id != 0) {
if (pushDialogs.size() == 1) {
if (chat_id != 0) {
@@ -4197,7 +4198,7 @@ public class NotificationsController extends BaseController {
Intent intent = new Intent(ApplicationLoader.applicationContext, LaunchActivity.class);
intent.setAction("com.tmessages.openchat" + Math.random() + Integer.MAX_VALUE);
- intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.addCategory(Intent.CATEGORY_LAUNCHER);
if (lowerId != 0) {
if (lowerId > 0) {
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
index 679aa79bb..6b801e946 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
@@ -57,6 +57,7 @@ import org.telegram.ui.Cells.ChatMessageCell;
import org.telegram.ui.ChatActivity;
import org.telegram.ui.Components.AlertsCreator;
import org.telegram.ui.Components.AnimatedFileDrawable;
+import org.telegram.ui.Components.Bulletin;
import org.telegram.ui.Components.LayoutHelper;
import org.telegram.ui.Components.Point;
import org.telegram.ui.TwoStepVerificationActivity;
@@ -413,9 +414,6 @@ public class SendMessagesHelper extends BaseController implements NotificationCe
AndroidUtilities.cancelRunOnUIThread(locationQueryCancelRunnable);
}
locationQueryCancelRunnable = () -> {
- if (locationQueryCancelRunnable != this) {
- return;
- }
if (delegate != null) {
if (lastKnownLocation != null) {
delegate.onLocationAcquired(lastKnownLocation);
@@ -1824,6 +1822,10 @@ public boolean retriedToSend;
final ArrayList sentMessages = new ArrayList<>();
sentMessages.add(message);
msgObj1.messageOwner.post_author = message.post_author;
+ if ((message.flags & 33554432) != 0) {
+ msgObj1.messageOwner.ttl_period = message.ttl_period;
+ msgObj1.messageOwner.flags |= 33554432;
+ }
updateMediaPaths(msgObj1, message, message.id, null, true);
int existFlags = msgObj1.getMediaExistanceFlags();
newMsgObj1.id = message.id;
@@ -4785,6 +4787,10 @@ public boolean retriedToSend;
if (message != null) {
MessageObject.getDialogId(message);
sentMessages.add(message);
+ if ((message.flags & 33554432) != 0) {
+ msgObj.messageOwner.ttl_period = message.ttl_period;
+ msgObj.messageOwner.flags |= 33554432;
+ }
updateMediaPaths(msgObj, message, message.id, originalPath, false);
existFlags = msgObj.getMediaExistanceFlags();
newMsgObj.id = message.id;
@@ -4983,6 +4989,10 @@ public boolean retriedToSend;
newMsgObj.date = res.date;
newMsgObj.entities = res.entities;
newMsgObj.out = res.out;
+ if ((res.flags & 33554432) != 0) {
+ newMsgObj.ttl_period = res.ttl_period;
+ newMsgObj.flags |= 33554432;
+ }
if (res.media != null) {
newMsgObj.media = res.media;
newMsgObj.flags |= TLRPC.MESSAGE_FLAG_HAS_MEDIA;
@@ -5074,6 +5084,10 @@ public boolean retriedToSend;
message.unread = value < message.id;
}
msgObj.messageOwner.post_author = message.post_author;
+ if ((message.flags & 33554432) != 0) {
+ msgObj.messageOwner.ttl_period = message.ttl_period;
+ msgObj.messageOwner.flags |= 33554432;
+ }
updateMediaPaths(msgObj, message, message.id, originalPath, false);
existFlags = msgObj.getMediaExistanceFlags();
newMsgObj.id = message.id;
@@ -5569,7 +5583,7 @@ public boolean retriedToSend;
MimeTypeMap myMime = MimeTypeMap.getSingleton();
TLRPC.TL_documentAttributeAudio attributeAudio = null;
String extension = null;
- if (uri != null) {
+ if (uri != null && path == null) {
boolean hasExt = false;
if (mime != null) {
extension = myMime.getExtensionFromMimeType(mime);
@@ -6015,8 +6029,7 @@ public boolean retriedToSend;
if (error) {
AndroidUtilities.runOnUIThread(() -> {
try {
- Toast toast = Toast.makeText(ApplicationLoader.applicationContext, LocaleController.getString("UnsupportedAttachment", R.string.UnsupportedAttachment), Toast.LENGTH_SHORT);
- toast.show();
+ NotificationCenter.getGlobalInstance().postNotificationName(NotificationCenter.showBulletin, Bulletin.TYPE_ERROR, LocaleController.getString("UnsupportedAttachment", R.string.UnsupportedAttachment));
} catch (Exception e) {
FileLog.e(e);
}
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ShortcutWidgetProvider.java b/TMessagesProj/src/main/java/org/telegram/messenger/ShortcutWidgetProvider.java
deleted file mode 100644
index 5d1d69d5d..000000000
--- a/TMessagesProj/src/main/java/org/telegram/messenger/ShortcutWidgetProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.telegram.messenger;
-
-import android.app.Activity;
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.widget.RemoteViews;
-
-import org.telegram.ui.LaunchActivity;
-
-public class ShortcutWidgetProvider extends AppWidgetProvider {
-
- @Override
- public void onReceive(Context context, Intent intent) {
- super.onReceive(context, intent);
- }
-
- @Override
- public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
- super.onUpdate(context, appWidgetManager, appWidgetIds);
- for (int i = 0; i < appWidgetIds.length; i++) {
- int appWidgetId = appWidgetIds[i];
- updateWidget(context, appWidgetManager, appWidgetId);
- }
- }
-
- @Override
- public void onDeleted(Context context, int[] appWidgetIds) {
- super.onDeleted(context, appWidgetIds);
- for (int a = 0; a < appWidgetIds.length; a++) {
- SharedPreferences preferences = context.getSharedPreferences("shortcut_widget", Activity.MODE_PRIVATE);
- int accountId = preferences.getInt("account" + appWidgetIds[a], -1);
- if (accountId >= 0) {
- AccountInstance accountInstance = AccountInstance.getInstance(accountId);
- accountInstance.getMessagesStorage().clearWidgetDialogs(appWidgetIds[a]);
- }
- }
- }
-
- public static void updateWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId) {
- Intent intent2 = new Intent(context, ShortcutWidgetService.class);
- intent2.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
- intent2.setData(Uri.parse(intent2.toUri(Intent.URI_INTENT_SCHEME)));
- RemoteViews rv = new RemoteViews(context.getPackageName(), R.layout.shortcut_widget_layout);
- rv.setRemoteAdapter(appWidgetId, R.id.list_view, intent2);
- rv.setEmptyView(R.id.list_view, R.id.empty_view);
-
- Intent intent = new Intent(ApplicationLoader.applicationContext, LaunchActivity.class);
- intent.setAction("com.tmessages.openchat" + Math.random() + Integer.MAX_VALUE);
- intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
- intent.addCategory(Intent.CATEGORY_LAUNCHER);
- PendingIntent contentIntent = PendingIntent.getActivity(ApplicationLoader.applicationContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-
- rv.setPendingIntentTemplate(R.id.list_view, contentIntent);
-
- appWidgetManager.updateAppWidget(appWidgetId, rv);
- }
-}
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/browser/Browser.java b/TMessagesProj/src/main/java/org/telegram/messenger/browser/Browser.java
index 5f1a83cc3..7477ffcad 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/browser/Browser.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/browser/Browser.java
@@ -26,6 +26,7 @@ import androidx.browser.customtabs.CustomTabsIntent;
import androidx.browser.customtabs.CustomTabsServiceConnection;
import androidx.browser.customtabs.CustomTabsSession;
+import org.telegram.messenger.AccountInstance;
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.ApplicationLoader;
import org.telegram.messenger.BuildVars;
@@ -47,6 +48,7 @@ import org.telegram.ui.ActionBar.Theme;
import org.telegram.ui.LaunchActivity;
import java.lang.ref.WeakReference;
+import java.net.URLEncoder;
import java.util.List;
public class Browser {
@@ -239,6 +241,24 @@ public class Browser {
FileLog.e(e);
}
}
+ String host = uri.getHost() != null ? uri.getHost().toLowerCase() : "";
+ if (AccountInstance.getInstance(currentAccount).getMessagesController().autologinDomains.contains(host)) {
+ String token = "autologin_token=" + URLEncoder.encode(AccountInstance.getInstance(UserConfig.selectedAccount).getMessagesController().autologinToken, "UTF-8");
+ String url = uri.toString();
+ int idx = url.indexOf("://");
+ String path = idx >= 0 ? url.substring(idx + 3) : url;
+ String[] args = path.split("#");
+ String finalPath = args[0];
+ if (finalPath.indexOf('?') >= 0) {
+ finalPath += "&" + token;
+ } else {
+ finalPath += "?" + token;
+ }
+ if (args.length > 1) {
+ finalPath += args[1];
+ }
+ uri = Uri.parse("https://" + finalPath);
+ }
if (allowCustom && SharedConfig.customTabs && !internalUri && !scheme.equals("tel")) {
String[] browserPackageNames = null;
try {
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPBaseService.java b/TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPBaseService.java
index daa470762..85057da89 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPBaseService.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPBaseService.java
@@ -143,26 +143,26 @@ public abstract class VoIPBaseService extends Service implements SensorEventList
protected TLRPC.Chat chat;
- protected boolean isVideoAvailable;
- protected boolean notificationsDisabled;
- protected boolean switchingCamera;
- protected boolean isFrontFaceCamera = true;
- protected String lastError;
- protected PowerManager.WakeLock proximityWakelock;
- protected PowerManager.WakeLock cpuWakelock;
- protected boolean isProximityNear;
- protected boolean isHeadsetPlugged;
- protected int previousAudioOutput;
- protected ArrayList stateListeners = new ArrayList<>();
- protected MediaPlayer ringtonePlayer;
- protected Vibrator vibrator;
- protected SoundPool soundPool;
- protected int spRingbackID;
- protected int spFailedID;
- protected int spEndId;
- protected int spVoiceChatEndId;
- protected int spVoiceChatStartId;
- protected int spVoiceChatConnecting;
+ protected boolean isVideoAvailable;
+ protected boolean notificationsDisabled;
+ protected boolean switchingCamera;
+ protected boolean isFrontFaceCamera = true;
+ protected String lastError;
+ protected PowerManager.WakeLock proximityWakelock;
+ protected PowerManager.WakeLock cpuWakelock;
+ protected boolean isProximityNear;
+ protected boolean isHeadsetPlugged;
+ protected int previousAudioOutput = -1;
+ protected ArrayList stateListeners = new ArrayList<>();
+ protected MediaPlayer ringtonePlayer;
+ protected Vibrator vibrator;
+ protected SoundPool soundPool;
+ protected int spRingbackID;
+ protected int spFailedID;
+ protected int spEndId;
+ protected int spVoiceChatEndId;
+ protected int spVoiceChatStartId;
+ protected int spVoiceChatConnecting;
protected int spBusyId;
protected int spConnectingId;
protected int spPlayID;
diff --git a/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java b/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java
index a8c27bd60..880f70a8a 100644
--- a/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java
+++ b/TMessagesProj/src/main/java/org/telegram/tgnet/TLRPC.java
@@ -10,8 +10,6 @@ package org.telegram.tgnet;
import android.text.TextUtils;
-import org.telegram.messenger.FileLoader;
-import org.telegram.messenger.FileLog;
import org.osmdroid.util.TileSystemWebMercator;
import org.telegram.messenger.Utilities;
@@ -63,7 +61,7 @@ public class TLRPC {
public static final int MESSAGE_FLAG_HAS_BOT_ID = 0x00000800;
public static final int MESSAGE_FLAG_EDITED = 0x00008000;
- public static final int LAYER = 123;
+ public static final int LAYER = 124;
public static class TL_stats_megagroupStats extends TLObject {
public static int constructor = 0xef7ff916;
@@ -3323,6 +3321,7 @@ public class TLRPC {
public boolean add_admins;
public boolean anonymous;
public boolean manage_call;
+ public boolean other;
public static TL_chatAdminRights TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
if (TL_chatAdminRights.constructor != constructor) {
@@ -3349,6 +3348,7 @@ public class TLRPC {
add_admins = (flags & 512) != 0;
anonymous = (flags & 1024) != 0;
manage_call = (flags & 2048) != 0;
+ other = (flags & 4096) != 0;
}
public void serializeToStream(AbstractSerializedData stream) {
@@ -3362,7 +3362,8 @@ public class TLRPC {
flags = pin_messages ? (flags | 128) : (flags &~ 128);
flags = add_admins ? (flags | 512) : (flags &~ 512);
flags = anonymous ? (flags | 1024) : (flags &~ 1024);
- flags = manage_call ? (flags | 2048) : (flags &~ 2048);
+ flags = manage_call ? (flags | 2048) : (flags & ~2048);
+ flags = other ? (flags | 4096) : (flags & ~4096);
stream.writeInt32(flags);
}
}
@@ -9121,24 +9122,72 @@ public class TLRPC {
}
}
- public static class TL_messages_exportedChatInvite extends TLObject {
- public static int constructor = 0x1871be50;
+ public static abstract class messages_ExportedChatInvite extends TLObject {
public ExportedChatInvite invite;
public ArrayList users = new ArrayList<>();
- public static TL_messages_exportedChatInvite TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
- if (TL_messages_exportedChatInvite.constructor != constructor) {
- if (exception) {
- throw new RuntimeException(String.format("can't parse magic %x in TL_messages_exportedChatInvite", constructor));
- } else {
- return null;
- }
+ public static messages_ExportedChatInvite TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
+ messages_ExportedChatInvite result = null;
+ switch (constructor) {
+ case 0x222600ef:
+ result = new TL_messages_exportedChatInviteReplaced();
+ break;
+ case 0x1871be50:
+ result = new TL_messages_exportedChatInvite();
+ break;
+ }
+ if (result == null && exception) {
+ throw new RuntimeException(String.format("can't parse magic %x in messages_ExportedChatInvite", constructor));
+ }
+ if (result != null) {
+ result.readParams(stream, exception);
}
- TL_messages_exportedChatInvite result = new TL_messages_exportedChatInvite();
- result.readParams(stream, exception);
return result;
}
+ }
+
+ public static class TL_messages_exportedChatInviteReplaced extends messages_ExportedChatInvite {
+ public static int constructor = 0x222600ef;
+
+ public ExportedChatInvite new_invite;
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ invite = ExportedChatInvite.TLdeserialize(stream, stream.readInt32(exception), exception);
+ new_invite = ExportedChatInvite.TLdeserialize(stream, stream.readInt32(exception), exception);
+ int magic = stream.readInt32(exception);
+ if (magic != 0x1cb5c415) {
+ if (exception) {
+ throw new RuntimeException(String.format("wrong Vector magic, got %x", magic));
+ }
+ return;
+ }
+ int count = stream.readInt32(exception);
+ for (int a = 0; a < count; a++) {
+ User object = User.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if (object == null) {
+ return;
+ }
+ users.add(object);
+ }
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ invite.serializeToStream(stream);
+ new_invite.serializeToStream(stream);
+ stream.writeInt32(0x1cb5c415);
+ int count = users.size();
+ stream.writeInt32(count);
+ for (int a = 0; a < count; a++) {
+ users.get(a).serializeToStream(stream);
+ }
+ }
+ }
+
+ public static class TL_messages_exportedChatInvite extends messages_ExportedChatInvite {
+ public static int constructor = 0x1871be50;
+
public void readParams(AbstractSerializedData stream, boolean exception) {
invite = ExportedChatInvite.TLdeserialize(stream, stream.readInt32(exception), exception);
@@ -9401,7 +9450,9 @@ public class TLRPC {
public int stats_dc;
public int pts;
public TL_inputGroupCall call;
- public int inviterId;
+ public int ttl_period;
+ public ArrayList pending_suggestions = new ArrayList<>();
+ public int inviterId; //custom
public int invitesCount; //custom
public static ChatFull TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
@@ -9450,9 +9501,15 @@ public class TLRPC {
result = new TL_chatFull_layer122();
break;
case 0xf3474af6:
- result = new TL_chatFull();
+ result = new TL_chatFull_layer123();
break;
case 0x7a7de4f7:
+ result = new TL_channelFull_layer123();
+ break;
+ case 0xf06c4018:
+ result = new TL_chatFull();
+ break;
+ case 0x2548c037:
result = new TL_channelFull();
break;
case 0x1b7c9db3:
@@ -9645,6 +9702,295 @@ public class TLRPC {
}
public static class TL_chatFull extends ChatFull {
+ public static int constructor = 0xf06c4018;
+
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ flags = stream.readInt32(exception);
+ can_set_username = (flags & 128) != 0;
+ has_scheduled = (flags & 256) != 0;
+ id = stream.readInt32(exception);
+ about = stream.readString(exception);
+ participants = ChatParticipants.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if ((flags & 4) != 0) {
+ chat_photo = Photo.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ notify_settings = PeerNotifySettings.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if ((flags & 8192) != 0) {
+ exported_invite = (TL_chatInviteExported) ExportedChatInvite.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ if ((flags & 8) != 0) {
+ int magic = stream.readInt32(exception);
+ if (magic != 0x1cb5c415) {
+ if (exception) {
+ throw new RuntimeException(String.format("wrong Vector magic, got %x", magic));
+ }
+ return;
+ }
+ int count = stream.readInt32(exception);
+ for (int a = 0; a < count; a++) {
+ BotInfo object = BotInfo.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if (object == null) {
+ return;
+ }
+ bot_info.add(object);
+ }
+ }
+ if ((flags & 64) != 0) {
+ pinned_msg_id = stream.readInt32(exception);
+ }
+ if ((flags & 2048) != 0) {
+ folder_id = stream.readInt32(exception);
+ }
+ if ((flags & 4096) != 0) {
+ call = TL_inputGroupCall.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ if ((flags & 16384) != 0) {
+ ttl_period = stream.readInt32(exception);
+ }
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ flags = can_set_username ? (flags | 128) : (flags &~ 128);
+ flags = has_scheduled ? (flags | 256) : (flags &~ 256);
+ stream.writeInt32(flags);
+ stream.writeInt32(id);
+ stream.writeString(about);
+ participants.serializeToStream(stream);
+ if ((flags & 4) != 0) {
+ chat_photo.serializeToStream(stream);
+ }
+ notify_settings.serializeToStream(stream);
+ if ((flags & 8192) != 0) {
+ exported_invite.serializeToStream(stream);
+ }
+ if ((flags & 8) != 0) {
+ stream.writeInt32(0x1cb5c415);
+ int count = bot_info.size();
+ stream.writeInt32(count);
+ for (int a = 0; a < count; a++) {
+ bot_info.get(a).serializeToStream(stream);
+ }
+ }
+ if ((flags & 64) != 0) {
+ stream.writeInt32(pinned_msg_id);
+ }
+ if ((flags & 2048) != 0) {
+ stream.writeInt32(folder_id);
+ }
+ if ((flags & 4096) != 0) {
+ call.serializeToStream(stream);
+ }
+ if ((flags & 16384) != 0) {
+ stream.writeInt32(ttl_period);
+ }
+ }
+ }
+
+ public static class TL_channelFull extends ChatFull {
+ public static int constructor = 0x2548c037;
+
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ flags = stream.readInt32(exception);
+ can_view_participants = (flags & 8) != 0;
+ can_set_username = (flags & 64) != 0;
+ can_set_stickers = (flags & 128) != 0;
+ hidden_prehistory = (flags & 1024) != 0;
+ can_set_location = (flags & 65536) != 0;
+ has_scheduled = (flags & 524288) != 0;
+ can_view_stats = (flags & 1048576) != 0;
+ blocked = (flags & 4194304) != 0;
+ id = stream.readInt32(exception);
+ about = stream.readString(exception);
+ if ((flags & 1) != 0) {
+ participants_count = stream.readInt32(exception);
+ }
+ if ((flags & 2) != 0) {
+ admins_count = stream.readInt32(exception);
+ }
+ if ((flags & 4) != 0) {
+ kicked_count = stream.readInt32(exception);
+ }
+ if ((flags & 4) != 0) {
+ banned_count = stream.readInt32(exception);
+ }
+ if ((flags & 8192) != 0) {
+ online_count = stream.readInt32(exception);
+ }
+ read_inbox_max_id = stream.readInt32(exception);
+ read_outbox_max_id = stream.readInt32(exception);
+ unread_count = stream.readInt32(exception);
+ chat_photo = Photo.TLdeserialize(stream, stream.readInt32(exception), exception);
+ notify_settings = PeerNotifySettings.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if ((flags & 8388608) != 0) {
+ exported_invite = (TL_chatInviteExported) ExportedChatInvite.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ int magic = stream.readInt32(exception);
+ if (magic != 0x1cb5c415) {
+ if (exception) {
+ throw new RuntimeException(String.format("wrong Vector magic, got %x", magic));
+ }
+ return;
+ }
+ int count = stream.readInt32(exception);
+ for (int a = 0; a < count; a++) {
+ BotInfo object = BotInfo.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if (object == null) {
+ return;
+ }
+ bot_info.add(object);
+ }
+ if ((flags & 16) != 0) {
+ migrated_from_chat_id = stream.readInt32(exception);
+ }
+ if ((flags & 16) != 0) {
+ migrated_from_max_id = stream.readInt32(exception);
+ }
+ if ((flags & 32) != 0) {
+ pinned_msg_id = stream.readInt32(exception);
+ }
+ if ((flags & 256) != 0) {
+ stickerset = StickerSet.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ if ((flags & 512) != 0) {
+ available_min_id = stream.readInt32(exception);
+ }
+ if ((flags & 2048) != 0) {
+ folder_id = stream.readInt32(exception);
+ }
+ if ((flags & 16384) != 0) {
+ linked_chat_id = stream.readInt32(exception);
+ }
+ if ((flags & 32768) != 0) {
+ location = ChannelLocation.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ if ((flags & 131072) != 0) {
+ slowmode_seconds = stream.readInt32(exception);
+ }
+ if ((flags & 262144) != 0) {
+ slowmode_next_send_date = stream.readInt32(exception);
+ }
+ if ((flags & 4096) != 0) {
+ stats_dc = stream.readInt32(exception);
+ }
+ pts = stream.readInt32(exception);
+ if ((flags & 2097152) != 0) {
+ call = TL_inputGroupCall.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ if ((flags & 16777216) != 0) {
+ ttl_period = stream.readInt32(exception);
+ }
+ if ((flags & 33554432) != 0) {
+ magic = stream.readInt32(exception);
+ if (magic != 0x1cb5c415) {
+ if (exception) {
+ throw new RuntimeException(String.format("wrong Vector magic, got %x", magic));
+ }
+ return;
+ }
+ count = stream.readInt32(exception);
+ for (int a = 0; a < count; a++) {
+ pending_suggestions.add(stream.readString(exception));
+ }
+ }
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ flags = can_view_participants ? (flags | 8) : (flags & ~8);
+ flags = can_set_username ? (flags | 64) : (flags & ~64);
+ flags = can_set_stickers ? (flags | 128) : (flags & ~128);
+ flags = hidden_prehistory ? (flags | 1024) : (flags & ~1024);
+ flags = can_set_location ? (flags | 65536) : (flags & ~65536);
+ flags = has_scheduled ? (flags | 524288) : (flags & ~524288);
+ flags = can_view_stats ? (flags | 1048576) : (flags & ~1048576);
+ flags = blocked ? (flags | 4194304) : (flags & ~4194304);
+ stream.writeInt32(flags);
+ stream.writeInt32(id);
+ stream.writeString(about);
+ if ((flags & 1) != 0) {
+ stream.writeInt32(participants_count);
+ }
+ if ((flags & 2) != 0) {
+ stream.writeInt32(admins_count);
+ }
+ if ((flags & 4) != 0) {
+ stream.writeInt32(kicked_count);
+ }
+ if ((flags & 4) != 0) {
+ stream.writeInt32(banned_count);
+ }
+ if ((flags & 8192) != 0) {
+ stream.writeInt32(online_count);
+ }
+ stream.writeInt32(read_inbox_max_id);
+ stream.writeInt32(read_outbox_max_id);
+ stream.writeInt32(unread_count);
+ chat_photo.serializeToStream(stream);
+ notify_settings.serializeToStream(stream);
+ if ((flags & 8388608) != 0) {
+ exported_invite.serializeToStream(stream);
+ }
+ stream.writeInt32(0x1cb5c415);
+ int count = bot_info.size();
+ stream.writeInt32(count);
+ for (int a = 0; a < count; a++) {
+ bot_info.get(a).serializeToStream(stream);
+ }
+ if ((flags & 16) != 0) {
+ stream.writeInt32(migrated_from_chat_id);
+ }
+ if ((flags & 16) != 0) {
+ stream.writeInt32(migrated_from_max_id);
+ }
+ if ((flags & 32) != 0) {
+ stream.writeInt32(pinned_msg_id);
+ }
+ if ((flags & 256) != 0) {
+ stickerset.serializeToStream(stream);
+ }
+ if ((flags & 512) != 0) {
+ stream.writeInt32(available_min_id);
+ }
+ if ((flags & 2048) != 0) {
+ stream.writeInt32(folder_id);
+ }
+ if ((flags & 16384) != 0) {
+ stream.writeInt32(linked_chat_id);
+ }
+ if ((flags & 32768) != 0) {
+ location.serializeToStream(stream);
+ }
+ if ((flags & 131072) != 0) {
+ stream.writeInt32(slowmode_seconds);
+ }
+ if ((flags & 262144) != 0) {
+ stream.writeInt32(slowmode_next_send_date);
+ }
+ if ((flags & 4096) != 0) {
+ stream.writeInt32(stats_dc);
+ }
+ stream.writeInt32(pts);
+ if ((flags & 2097152) != 0) {
+ call.serializeToStream(stream);
+ }
+ if ((flags & 16777216) != 0) {
+ stream.writeInt32(ttl_period);
+ }
+ if ((flags & 33554432) != 0) {
+ stream.writeInt32(0x1cb5c415);
+ count = pending_suggestions.size();
+ stream.writeInt32(count);
+ for (int a = 0; a < count; a++) {
+ stream.writeString(pending_suggestions.get(a));
+ }
+ }
+ }
+ }
+
+ public static class TL_chatFull_layer123 extends TL_chatFull {
public static int constructor = 0xf3474af6;
@@ -9692,8 +10038,8 @@ public class TLRPC {
public void serializeToStream(AbstractSerializedData stream) {
stream.writeInt32(constructor);
- flags = can_set_username ? (flags | 128) : (flags &~ 128);
- flags = has_scheduled ? (flags | 256) : (flags &~ 256);
+ flags = can_set_username ? (flags | 128) : (flags & ~128);
+ flags = has_scheduled ? (flags | 256) : (flags & ~256);
stream.writeInt32(flags);
stream.writeInt32(id);
stream.writeString(about);
@@ -9725,7 +10071,7 @@ public class TLRPC {
}
}
- public static class TL_channelFull extends ChatFull {
+ public static class TL_channelFull_layer123 extends TL_channelFull {
public static int constructor = 0x7a7de4f7;
@@ -15639,15 +15985,84 @@ public class TLRPC {
public int expires;
- public void readParams(AbstractSerializedData stream, boolean exception) {
- expires = stream.readInt32(exception);
- }
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ expires = stream.readInt32(exception);
+ }
- public void serializeToStream(AbstractSerializedData stream) {
- stream.writeInt32(constructor);
- stream.writeInt32(expires);
- }
- }
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ stream.writeInt32(expires);
+ }
+ }
+
+ public static class TL_messages_chatAdminsWithInvites extends TLObject {
+ public static int constructor = 0xb69b72d7;
+
+ public ArrayList admins = new ArrayList<>();
+ public ArrayList users = new ArrayList<>();
+
+ public static TL_messages_chatAdminsWithInvites TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
+ if (TL_messages_chatAdminsWithInvites.constructor != constructor) {
+ if (exception) {
+ throw new RuntimeException(String.format("can't parse magic %x in TL_messages_chatAdminsWithInvites", constructor));
+ } else {
+ return null;
+ }
+ }
+ TL_messages_chatAdminsWithInvites result = new TL_messages_chatAdminsWithInvites();
+ result.readParams(stream, exception);
+ return result;
+ }
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ int magic = stream.readInt32(exception);
+ if (magic != 0x1cb5c415) {
+ if (exception) {
+ throw new RuntimeException(String.format("wrong Vector magic, got %x", magic));
+ }
+ return;
+ }
+ int count = stream.readInt32(exception);
+ for (int a = 0; a < count; a++) {
+ TL_chatAdminWithInvites object = TL_chatAdminWithInvites.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if (object == null) {
+ return;
+ }
+ admins.add(object);
+ }
+ magic = stream.readInt32(exception);
+ if (magic != 0x1cb5c415) {
+ if (exception) {
+ throw new RuntimeException(String.format("wrong Vector magic, got %x", magic));
+ }
+ return;
+ }
+ count = stream.readInt32(exception);
+ for (int a = 0; a < count; a++) {
+ User object = User.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if (object == null) {
+ return;
+ }
+ users.add(object);
+ }
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ stream.writeInt32(0x1cb5c415);
+ int count = admins.size();
+ stream.writeInt32(count);
+ for (int a = 0; a < count; a++) {
+ admins.get(a).serializeToStream(stream);
+ }
+ stream.writeInt32(0x1cb5c415);
+ count = users.size();
+ stream.writeInt32(count);
+ for (int a = 0; a < count; a++) {
+ users.get(a).serializeToStream(stream);
+ }
+ }
+ }
public static class TL_phone_groupCall extends TLObject {
public static int constructor = 0x66ab0bfc;
@@ -17418,26 +17833,29 @@ public class TLRPC {
break;
case 0x55555550:
result = new TL_messageActionUserJoined();
- break;
- case 0x55555551:
- result = new TL_messageActionUserUpdatedPhoto();
- break;
- case 0x5e3cfc4b:
- result = new TL_messageActionChatAddUser_old();
- break;
- case 0x55555552:
- result = new TL_messageActionTTLChange();
- break;
+ break;
+ case 0x55555551:
+ result = new TL_messageActionUserUpdatedPhoto();
+ break;
+ case 0x5e3cfc4b:
+ result = new TL_messageActionChatAddUser_old();
+ break;
+ case 0x55555552:
+ result = new TL_messageActionTTLChange();
+ break;
+ case 0xaa1afbfd:
+ result = new TL_messageActionSetMessagesTTL();
+ break;
case 0xd95c6154:
result = new TL_messageActionSecureValuesSent();
break;
- case 0xf89cf5e8:
- result = new TL_messageActionChatJoinedByLink();
- break;
+ case 0xf89cf5e8:
+ result = new TL_messageActionChatJoinedByLink();
+ break;
case 0xf3f25f76:
result = new TL_messageActionContactSignUp();
break;
- case 0x95d2ac92:
+ case 0x95d2ac92:
result = new TL_messageActionChannelCreate();
break;
case 0x94bd38ed:
@@ -17773,25 +18191,40 @@ public class TLRPC {
public static int constructor = 0x55555552;
- public void readParams(AbstractSerializedData stream, boolean exception) {
- ttl = stream.readInt32(exception);
- }
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ ttl = stream.readInt32(exception);
+ }
- public void serializeToStream(AbstractSerializedData stream) {
- stream.writeInt32(constructor);
- stream.writeInt32(ttl);
- }
- }
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ stream.writeInt32(ttl);
+ }
+ }
- public static class TL_messageActionChatJoinedByLink extends MessageAction {
- public static int constructor = 0xf89cf5e8;
+ public static class TL_messageActionSetMessagesTTL extends MessageAction {
+ public static int constructor = 0xaa1afbfd;
+
+ public int period;
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ period = stream.readInt32(exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ stream.writeInt32(period);
+ }
+ }
+
+ public static class TL_messageActionChatJoinedByLink extends MessageAction {
+ public static int constructor = 0xf89cf5e8;
- public void readParams(AbstractSerializedData stream, boolean exception) {
- inviter_id = stream.readInt32(exception);
- }
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ inviter_id = stream.readInt32(exception);
+ }
- public void serializeToStream(AbstractSerializedData stream) {
+ public void serializeToStream(AbstractSerializedData stream) {
stream.writeInt32(constructor);
stream.writeInt32(inviter_id);
}
@@ -17992,7 +18425,7 @@ public class TLRPC {
case 0xdbd4feed:
result = new TL_inputReportReasonGeoIrrelevant();
break;
- case 0xe1746d0a:
+ case 0xc1e4a2b1:
result = new TL_inputReportReasonOther();
break;
case 0xf5ddd6e7:
@@ -18034,17 +18467,11 @@ public class TLRPC {
}
public static class TL_inputReportReasonOther extends ReportReason {
- public static int constructor = 0xe1746d0a;
+ public static int constructor = 0xc1e4a2b1;
- public String text;
-
- public void readParams(AbstractSerializedData stream, boolean exception) {
- text = stream.readString(exception);
- }
public void serializeToStream(AbstractSerializedData stream) {
stream.writeInt32(constructor);
- stream.writeString(text);
}
}
@@ -22419,6 +22846,7 @@ public class TLRPC {
public boolean edit;
public boolean delete;
public boolean group_call;
+ public boolean invites;
public static TL_channelAdminLogEventsFilter TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
if (TL_channelAdminLogEventsFilter.constructor != constructor) {
@@ -22450,6 +22878,7 @@ public class TLRPC {
edit = (flags & 4096) != 0;
delete = (flags & 8192) != 0;
group_call = (flags & 16384) != 0;
+ invites = (flags & 32768) != 0;
}
public void serializeToStream(AbstractSerializedData stream) {
@@ -22468,7 +22897,8 @@ public class TLRPC {
flags = pinned ? (flags | 2048) : (flags &~ 2048);
flags = edit ? (flags | 4096) : (flags &~ 4096);
flags = delete ? (flags | 8192) : (flags &~ 8192);
- flags = group_call ? (flags | 16384) : (flags &~ 16384);
+ flags = group_call ? (flags | 16384) : (flags & ~16384);
+ flags = invites ? (flags | 32768) : (flags & ~32768);
stream.writeInt32(flags);
}
}
@@ -22561,26 +22991,54 @@ public class TLRPC {
stream.writeInt32(constructor);
stream.writeInt32(expires);
}
- }
+ }
- public static class TL_userStatusRecently extends UserStatus {
- public static int constructor = 0xe26f42f1;
+ public static class TL_userStatusRecently extends UserStatus {
+ public static int constructor = 0xe26f42f1;
- public void serializeToStream(AbstractSerializedData stream) {
- stream.writeInt32(constructor);
- }
- }
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ }
+ }
- public static class TL_messages_messageEditData extends TLObject {
- public static int constructor = 0x26b5dde6;
+ public static class TL_messages_checkedHistoryImportPeer extends TLObject {
+ public static int constructor = 0xa24de717;
- public int flags;
- public boolean caption;
+ public String confirm_text;
- public static TL_messages_messageEditData TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
- if (TL_messages_messageEditData.constructor != constructor) {
- if (exception) {
+ public static TL_messages_checkedHistoryImportPeer TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
+ if (TL_messages_checkedHistoryImportPeer.constructor != constructor) {
+ if (exception) {
+ throw new RuntimeException(String.format("can't parse magic %x in TL_messages_checkedHistoryImportPeer", constructor));
+ } else {
+ return null;
+ }
+ }
+ TL_messages_checkedHistoryImportPeer result = new TL_messages_checkedHistoryImportPeer();
+ result.readParams(stream, exception);
+ return result;
+ }
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ confirm_text = stream.readString(exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ stream.writeString(confirm_text);
+ }
+ }
+
+ public static class TL_messages_messageEditData extends TLObject {
+ public static int constructor = 0x26b5dde6;
+
+ public int flags;
+ public boolean caption;
+
+ public static TL_messages_messageEditData TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
+ if (TL_messages_messageEditData.constructor != constructor) {
+ if (exception) {
throw new RuntimeException(String.format("can't parse magic %x in TL_messages_messageEditData", constructor));
} else {
return null;
@@ -22879,6 +23337,9 @@ public class TLRPC {
case 0xaca1657b:
result = new TL_updateMessagePoll();
break;
+ case 0xbb9bb9a5:
+ result = new TL_updatePeerHistoryTTL();
+ break;
case 0x1330a196:
result = new TL_updateChat();
break;
@@ -23794,6 +24255,31 @@ public class TLRPC {
}
}
+ public static class TL_updatePeerHistoryTTL extends Update {
+ public static int constructor = 0xbb9bb9a5;
+
+ public int flags;
+ public Peer peer;
+ public int ttl_period;
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ flags = stream.readInt32(exception);
+ peer = Peer.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if ((flags & 1) != 0) {
+ ttl_period = stream.readInt32(exception);
+ }
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ stream.writeInt32(flags);
+ peer.serializeToStream(stream);
+ if ((flags & 1) != 0) {
+ stream.writeInt32(ttl_period);
+ }
+ }
+ }
+
public static class TL_updateChat extends Update {
public static int constructor = 0x1330a196;
@@ -25689,6 +26175,40 @@ public class TLRPC {
}
}
+ public static class TL_chatAdminWithInvites extends TLObject {
+ public static int constructor = 0xdfd2330f;
+
+ public int admin_id;
+ public int invites_count;
+ public int revoked_invites_count;
+
+ public static TL_chatAdminWithInvites TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
+ if (TL_chatAdminWithInvites.constructor != constructor) {
+ if (exception) {
+ throw new RuntimeException(String.format("can't parse magic %x in TL_chatAdminWithInvites", constructor));
+ } else {
+ return null;
+ }
+ }
+ TL_chatAdminWithInvites result = new TL_chatAdminWithInvites();
+ result.readParams(stream, exception);
+ return result;
+ }
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ admin_id = stream.readInt32(exception);
+ invites_count = stream.readInt32(exception);
+ revoked_invites_count = stream.readInt32(exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ stream.writeInt32(admin_id);
+ stream.writeInt32(invites_count);
+ stream.writeInt32(revoked_invites_count);
+ }
+ }
+
public static abstract class UserProfilePhoto extends TLObject {
public int flags;
@@ -31198,11 +31718,11 @@ public class TLRPC {
}
}
- public static abstract class ChannelAdminLogEventAction extends TLObject {
+ public static abstract class ChannelAdminLogEventAction extends TLObject {
- public static ChannelAdminLogEventAction TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
- ChannelAdminLogEventAction result = null;
- switch (constructor) {
+ public static ChannelAdminLogEventAction TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
+ ChannelAdminLogEventAction result = null;
+ switch (constructor) {
case 0xdb9f9140:
result = new TL_channelAdminLogEventActionDiscardGroupCall();
break;
@@ -31221,6 +31741,9 @@ public class TLRPC {
case 0x709b2405:
result = new TL_channelAdminLogEventActionEditMessage();
break;
+ case 0xe90ebb59:
+ result = new TL_channelAdminLogEventActionExportedInviteEdit();
+ break;
case 0x6a4afc38:
result = new TL_channelAdminLogEventActionChangeUsername();
break;
@@ -31236,12 +31759,24 @@ public class TLRPC {
case 0x53909779:
result = new TL_channelAdminLogEventActionToggleSlowMode();
break;
+ case 0x5cdada77:
+ result = new TL_channelAdminLogEventActionParticipantJoinByInvite();
+ break;
+ case 0x410a134e:
+ result = new TL_channelAdminLogEventActionExportedInviteRevoke();
+ break;
case 0x8f079643:
result = new TL_channelAdminLogEventActionStopPoll();
break;
+ case 0x5a50fca4:
+ result = new TL_channelAdminLogEventActionExportedInviteDelete();
+ break;
case 0x26ae0971:
result = new TL_channelAdminLogEventActionToggleSignatures();
break;
+ case 0x3e7f6847:
+ result = new TL_channelAdminLogEventActionParticipantVolume();
+ break;
case 0xe6d83d7e:
result = new TL_channelAdminLogEventActionParticipantToggleBan();
break;
@@ -31281,16 +31816,19 @@ public class TLRPC {
case 0xe6dfb825:
result = new TL_channelAdminLogEventActionChangeTitle();
break;
- }
- if (result == null && exception) {
- throw new RuntimeException(String.format("can't parse magic %x in ChannelAdminLogEventAction", constructor));
- }
- if (result != null) {
- result.readParams(stream, exception);
- }
- return result;
- }
- }
+ case 0x6e941a38:
+ result = new TL_channelAdminLogEventActionChangeHistoryTTL();
+ break;
+ }
+ if (result == null && exception) {
+ throw new RuntimeException(String.format("can't parse magic %x in ChannelAdminLogEventAction", constructor));
+ }
+ if (result != null) {
+ result.readParams(stream, exception);
+ }
+ return result;
+ }
+ }
public static class TL_channelAdminLogEventActionDiscardGroupCall extends ChannelAdminLogEventAction {
public static int constructor = 0xdb9f9140;
@@ -31385,6 +31923,24 @@ public class TLRPC {
}
}
+ public static class TL_channelAdminLogEventActionExportedInviteEdit extends ChannelAdminLogEventAction {
+ public static int constructor = 0xe90ebb59;
+
+ public TL_chatInviteExported prev_invite;
+ public TL_chatInviteExported new_invite;
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ prev_invite = (TL_chatInviteExported) ExportedChatInvite.TLdeserialize(stream, stream.readInt32(exception), exception);
+ new_invite = (TL_chatInviteExported) ExportedChatInvite.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ prev_invite.serializeToStream(stream);
+ new_invite.serializeToStream(stream);
+ }
+ }
+
public static class TL_channelAdminLogEventActionChangeUsername extends ChannelAdminLogEventAction {
public static int constructor = 0x6a4afc38;
@@ -31475,6 +32031,36 @@ public class TLRPC {
}
}
+ public static class TL_channelAdminLogEventActionParticipantJoinByInvite extends ChannelAdminLogEventAction {
+ public static int constructor = 0x5cdada77;
+
+ public TL_chatInviteExported invite;
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ invite = (TL_chatInviteExported) ExportedChatInvite.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ invite.serializeToStream(stream);
+ }
+ }
+
+ public static class TL_channelAdminLogEventActionExportedInviteRevoke extends ChannelAdminLogEventAction {
+ public static int constructor = 0x410a134e;
+
+ public TL_chatInviteExported invite;
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ invite = (TL_chatInviteExported) ExportedChatInvite.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ invite.serializeToStream(stream);
+ }
+ }
+
public static class TL_channelAdminLogEventActionStopPoll extends ChannelAdminLogEventAction {
public static int constructor = 0x8f079643;
@@ -31490,6 +32076,21 @@ public class TLRPC {
}
}
+ public static class TL_channelAdminLogEventActionExportedInviteDelete extends ChannelAdminLogEventAction {
+ public static int constructor = 0x5a50fca4;
+
+ public TL_chatInviteExported invite;
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ invite = (TL_chatInviteExported) ExportedChatInvite.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ invite.serializeToStream(stream);
+ }
+ }
+
public static class TL_channelAdminLogEventActionToggleSignatures extends ChannelAdminLogEventAction {
public static int constructor = 0x26ae0971;
@@ -31505,6 +32106,21 @@ public class TLRPC {
}
}
+ public static class TL_channelAdminLogEventActionParticipantVolume extends ChannelAdminLogEventAction {
+ public static int constructor = 0x3e7f6847;
+
+ public TL_groupCallParticipant participant;
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ participant = TL_groupCallParticipant.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ participant.serializeToStream(stream);
+ }
+ }
+
public static class TL_channelAdminLogEventActionParticipantToggleBan extends ChannelAdminLogEventAction {
public static int constructor = 0xe6d83d7e;
@@ -31706,15 +32322,33 @@ public class TLRPC {
}
}
- public static abstract class InputWebFileLocation extends TLObject {
+ public static class TL_channelAdminLogEventActionChangeHistoryTTL extends ChannelAdminLogEventAction {
+ public static int constructor = 0x6e941a38;
- public static InputWebFileLocation TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
- InputWebFileLocation result = null;
- switch (constructor) {
- case 0x9f2221c9:
- result = new TL_inputWebFileGeoPointLocation();
- break;
- case 0xc239d686:
+ public int prev_value;
+ public int new_value;
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ prev_value = stream.readInt32(exception);
+ new_value = stream.readInt32(exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ stream.writeInt32(prev_value);
+ stream.writeInt32(new_value);
+ }
+ }
+
+ public static abstract class InputWebFileLocation extends TLObject {
+
+ public static InputWebFileLocation TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
+ InputWebFileLocation result = null;
+ switch (constructor) {
+ case 0x9f2221c9:
+ result = new TL_inputWebFileGeoPointLocation();
+ break;
+ case 0xc239d686:
result = new TL_inputWebFileLocation();
break;
}
@@ -32120,6 +32754,7 @@ public class TLRPC {
public boolean call_active;
public boolean call_not_empty;
public boolean fake;
+ public boolean gigagroup;
public ArrayList restriction_reason = new ArrayList<>();
public TL_channelAdminRights_layer92 admin_rights_layer92;
public TL_channelBannedRights_layer92 banned_rights_layer92;
@@ -32637,6 +33272,7 @@ public class TLRPC {
call_active = (flags & 8388608) != 0;
call_not_empty = (flags & 16777216) != 0;
fake = (flags & 33554432) != 0;
+ gigagroup = (flags & 67108864) != 0;
id = stream.readInt32(exception);
if ((flags & 8192) != 0) {
access_hash = stream.readInt64(exception);
@@ -32695,7 +33331,8 @@ public class TLRPC {
flags = slowmode_enabled ? (flags | 4194304) : (flags &~ 4194304);
flags = call_active ? (flags | 8388608) : (flags &~ 8388608);
flags = call_not_empty ? (flags | 16777216) : (flags &~ 16777216);
- flags = fake ? (flags | 33554432) : (flags &~ 33554432);
+ flags = fake ? (flags | 33554432) : (flags & ~33554432);
+ flags = gigagroup ? (flags | 67108864) : (flags & ~67108864);
stream.writeInt32(flags);
stream.writeInt32(id);
if ((flags & 8192) != 0) {
@@ -35191,11 +35828,15 @@ public class TLRPC {
public int pinned_msg_id;
public int common_chats_count;
public int folder_id;
+ public int ttl_period;
public TL_peerSettings settings;
public static UserFull TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
UserFull result = null;
switch (constructor) {
+ case 0x139a9a77:
+ result = new TL_userFull();
+ break;
case 0x745559cc:
result = new TL_userFull_layer101();
break;
@@ -35203,7 +35844,7 @@ public class TLRPC {
result = new TL_userFull_layer98();
break;
case 0xedf17c12:
- result = new TL_userFull();
+ result = new TL_userFull_layer123();
break;
}
if (result == null && exception) {
@@ -35331,6 +35972,76 @@ public class TLRPC {
}
public static class TL_userFull extends UserFull {
+ public static int constructor = 0x139a9a77;
+
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ flags = stream.readInt32(exception);
+ blocked = (flags & 1) != 0;
+ phone_calls_available = (flags & 16) != 0;
+ phone_calls_private = (flags & 32) != 0;
+ can_pin_message = (flags & 128) != 0;
+ has_scheduled = (flags & 4096) != 0;
+ video_calls_available = (flags & 8192) != 0;
+ user = User.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if ((flags & 2) != 0) {
+ about = stream.readString(exception);
+ }
+ settings = TL_peerSettings.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if ((flags & 4) != 0) {
+ profile_photo = Photo.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ notify_settings = PeerNotifySettings.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if ((flags & 8) != 0) {
+ bot_info = BotInfo.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ if ((flags & 64) != 0) {
+ pinned_msg_id = stream.readInt32(exception);
+ }
+ common_chats_count = stream.readInt32(exception);
+ if ((flags & 2048) != 0) {
+ folder_id = stream.readInt32(exception);
+ }
+ if ((flags & 16384) != 0) {
+ ttl_period = stream.readInt32(exception);
+ }
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ flags = blocked ? (flags | 1) : (flags & ~1);
+ flags = phone_calls_available ? (flags | 16) : (flags & ~16);
+ flags = phone_calls_private ? (flags | 32) : (flags & ~32);
+ flags = can_pin_message ? (flags | 128) : (flags & ~128);
+ flags = has_scheduled ? (flags | 4096) : (flags & ~4096);
+ flags = video_calls_available ? (flags | 8192) : (flags & ~8192);
+ stream.writeInt32(flags);
+ user.serializeToStream(stream);
+ if ((flags & 2) != 0) {
+ stream.writeString(about);
+ }
+ settings.serializeToStream(stream);
+ if ((flags & 4) != 0) {
+ profile_photo.serializeToStream(stream);
+ }
+ notify_settings.serializeToStream(stream);
+ if ((flags & 8) != 0) {
+ bot_info.serializeToStream(stream);
+ }
+ if ((flags & 64) != 0) {
+ stream.writeInt32(pinned_msg_id);
+ }
+ stream.writeInt32(common_chats_count);
+ if ((flags & 2048) != 0) {
+ stream.writeInt32(folder_id);
+ }
+ if ((flags & 16384) != 0) {
+ stream.writeInt32(ttl_period);
+ }
+ }
+ }
+
+ public static class TL_userFull_layer123 extends TL_userFull {
public static int constructor = 0xedf17c12;
@@ -35417,33 +36128,34 @@ public class TLRPC {
public Update update;
public int from_id;
public int chat_id;
- public int seq_start;
+ public int seq_start;
+ public int ttl_period;
public static Updates TLdeserialize(AbstractSerializedData stream, int constructor, boolean exception) {
Updates result = null;
switch (constructor) {
- case 0x74ae4240:
- result = new TL_updates();
- break;
- case 0x2296d2c8:
+ case 0x74ae4240:
+ result = new TL_updates();
+ break;
+ case 0xfaeff833:
result = new TL_updateShortMessage();
break;
- case 0x11f1331c:
- result = new TL_updateShortSentMessage();
- break;
- case 0x78d4dec1:
- result = new TL_updateShort();
- break;
- case 0x402d5dbb:
+ case 0x9015e101:
+ result = new TL_updateShortSentMessage();
+ break;
+ case 0x78d4dec1:
+ result = new TL_updateShort();
+ break;
+ case 0x1157b858:
result = new TL_updateShortChatMessage();
break;
- case 0x725b04c3:
- result = new TL_updatesCombined();
- break;
- case 0xe317af7e:
- result = new TL_updatesTooLong();
- break;
- }
+ case 0x725b04c3:
+ result = new TL_updatesCombined();
+ break;
+ case 0xe317af7e:
+ result = new TL_updatesTooLong();
+ break;
+ }
if (result == null && exception) {
throw new RuntimeException(String.format("can't parse magic %x in Updates", constructor));
}
@@ -35510,7 +36222,7 @@ public class TLRPC {
}
public static class TL_updateShortMessage extends Updates {
- public static int constructor = 0x2296d2c8;
+ public static int constructor = 0xfaeff833;
public void readParams(AbstractSerializedData stream, boolean exception) {
@@ -35551,42 +36263,48 @@ public class TLRPC {
entities.add(object);
}
}
+ if ((flags & 33554432) != 0) {
+ ttl_period = stream.readInt32(exception);
+ }
}
}
- public static class TL_updateShortSentMessage extends Updates {
- public static int constructor = 0x11f1331c;
+ public static class TL_updateShortSentMessage extends Updates {
+ public static int constructor = 0x9015e101;
- public void readParams(AbstractSerializedData stream, boolean exception) {
- flags = stream.readInt32(exception);
- out = (flags & 2) != 0;
- id = stream.readInt32(exception);
- pts = stream.readInt32(exception);
- pts_count = stream.readInt32(exception);
- date = stream.readInt32(exception);
- if ((flags & 512) != 0) {
- media = MessageMedia.TLdeserialize(stream, stream.readInt32(exception), exception);
- }
- if ((flags & 128) != 0) {
- int magic = stream.readInt32(exception);
- if (magic != 0x1cb5c415) {
- if (exception) {
- throw new RuntimeException(String.format("wrong Vector magic, got %x", magic));
- }
- return;
- }
- int count = stream.readInt32(exception);
- for (int a = 0; a < count; a++) {
- MessageEntity object = MessageEntity.TLdeserialize(stream, stream.readInt32(exception), exception);
- if (object == null) {
- return;
- }
- entities.add(object);
- }
- }
- }
- }
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ flags = stream.readInt32(exception);
+ out = (flags & 2) != 0;
+ id = stream.readInt32(exception);
+ pts = stream.readInt32(exception);
+ pts_count = stream.readInt32(exception);
+ date = stream.readInt32(exception);
+ if ((flags & 512) != 0) {
+ media = MessageMedia.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ if ((flags & 128) != 0) {
+ int magic = stream.readInt32(exception);
+ if (magic != 0x1cb5c415) {
+ if (exception) {
+ throw new RuntimeException(String.format("wrong Vector magic, got %x", magic));
+ }
+ return;
+ }
+ int count = stream.readInt32(exception);
+ for (int a = 0; a < count; a++) {
+ MessageEntity object = MessageEntity.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if (object == null) {
+ return;
+ }
+ entities.add(object);
+ }
+ }
+ if ((flags & 33554432) != 0) {
+ ttl_period = stream.readInt32(exception);
+ }
+ }
+ }
public static class TL_updateShort extends Updates {
public static int constructor = 0x78d4dec1;
@@ -35599,7 +36317,7 @@ public class TLRPC {
}
public static class TL_updateShortChatMessage extends Updates {
- public static int constructor = 0x402d5dbb;
+ public static int constructor = 0x1157b858;
public void readParams(AbstractSerializedData stream, boolean exception) {
@@ -35641,6 +36359,9 @@ public class TLRPC {
entities.add(object);
}
}
+ if ((flags & 33554432) != 0) {
+ ttl_period = stream.readInt32(exception);
+ }
}
}
@@ -36989,6 +37710,7 @@ public class TLRPC {
public boolean versioned;
public boolean min;
public boolean muted_by_you;
+ public boolean volume_by_admin;
public int user_id;
public int date;
public int active_date;
@@ -37023,6 +37745,7 @@ public class TLRPC {
versioned = (flags & 32) != 0;
min = (flags & 256) != 0;
muted_by_you = (flags & 512) != 0;
+ volume_by_admin = (flags & 1024) != 0;
user_id = stream.readInt32(exception);
date = stream.readInt32(exception);
if ((flags & 8) != 0) {
@@ -37042,7 +37765,8 @@ public class TLRPC {
flags = just_joined ? (flags | 16) : (flags &~ 16);
flags = versioned ? (flags | 32) : (flags &~ 32);
flags = min ? (flags | 256) : (flags &~ 256);
- flags = muted_by_you ? (flags | 512) : (flags &~ 512);
+ flags = muted_by_you ? (flags | 512) : (flags & ~512);
+ flags = volume_by_admin ? (flags | 1024) : (flags & ~1024);
stream.writeInt32(flags);
stream.writeInt32(user_id);
stream.writeInt32(date);
@@ -37947,32 +38671,34 @@ public class TLRPC {
}
public void serializeToStream(AbstractSerializedData stream) {
- stream.writeInt32(constructor);
- stream.writeInt32(0x1cb5c415);
- int count = id.size();
- stream.writeInt32(count);
- for (int a = 0; a < count; a++) {
- id.get(a).serializeToStream(stream);
- }
- }
- }
+ stream.writeInt32(constructor);
+ stream.writeInt32(0x1cb5c415);
+ int count = id.size();
+ stream.writeInt32(count);
+ for (int a = 0; a < count; a++) {
+ id.get(a).serializeToStream(stream);
+ }
+ }
+ }
- public static class TL_account_reportPeer extends TLObject {
- public static int constructor = 0xae189d5f;
+ public static class TL_account_reportPeer extends TLObject {
+ public static int constructor = 0xc5ba3d86;
- public InputPeer peer;
- public ReportReason reason;
+ public InputPeer peer;
+ public ReportReason reason;
+ public String message;
- public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
- return Bool.TLdeserialize(stream, constructor, exception);
- }
+ public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
+ return Bool.TLdeserialize(stream, constructor, exception);
+ }
- public void serializeToStream(AbstractSerializedData stream) {
- stream.writeInt32(constructor);
- peer.serializeToStream(stream);
- reason.serializeToStream(stream);
- }
- }
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ peer.serializeToStream(stream);
+ reason.serializeToStream(stream);
+ stream.writeString(message);
+ }
+ }
public static class TL_users_getFullUser extends TLObject {
public static int constructor = 0xca30a5b1;
@@ -38532,8 +39258,9 @@ public class TLRPC {
}
public static class TL_help_dismissSuggestion extends TLObject {
- public static int constructor = 0x77fa99f;
+ public static int constructor = 0xf50dbaa1;
+ public InputPeer peer;
public String suggestion;
public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
@@ -38542,6 +39269,7 @@ public class TLRPC {
public void serializeToStream(AbstractSerializedData stream) {
stream.writeInt32(constructor);
+ peer.serializeToStream(stream);
stream.writeString(suggestion);
}
}
@@ -39022,39 +39750,41 @@ public class TLRPC {
public InputPeer peer;
- public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
- return TL_peerSettings.TLdeserialize(stream, constructor, exception);
- }
+ public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
+ return TL_peerSettings.TLdeserialize(stream, constructor, exception);
+ }
- public void serializeToStream(AbstractSerializedData stream) {
- stream.writeInt32(constructor);
- peer.serializeToStream(stream);
- }
- }
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ peer.serializeToStream(stream);
+ }
+ }
- public static class TL_messages_report extends TLObject {
- public static int constructor = 0xbd82b658;
+ public static class TL_messages_report extends TLObject {
+ public static int constructor = 0x8953ab4e;
- public InputPeer peer;
- public ArrayList id = new ArrayList<>();
- public ReportReason reason;
+ public InputPeer peer;
+ public ArrayList id = new ArrayList<>();
+ public ReportReason reason;
+ public String message;
- public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
- return Bool.TLdeserialize(stream, constructor, exception);
- }
+ public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
+ return Bool.TLdeserialize(stream, constructor, exception);
+ }
- public void serializeToStream(AbstractSerializedData stream) {
- stream.writeInt32(constructor);
- peer.serializeToStream(stream);
- stream.writeInt32(0x1cb5c415);
- int count = id.size();
- stream.writeInt32(count);
- for (int a = 0; a < count; a++) {
- stream.writeInt32(id.get(a));
- }
- reason.serializeToStream(stream);
- }
- }
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ peer.serializeToStream(stream);
+ stream.writeInt32(0x1cb5c415);
+ int count = id.size();
+ stream.writeInt32(count);
+ for (int a = 0; a < count; a++) {
+ stream.writeInt32(id.get(a));
+ }
+ reason.serializeToStream(stream);
+ stream.writeString(message);
+ }
+ }
public static class TL_messages_getChats extends TLObject {
public static int constructor = 0x3c6aa187;
@@ -39975,15 +40705,36 @@ public class TLRPC {
}
}
- public static class TL_account_getAllSecureValues extends TLObject {
- public static int constructor = 0xb288bc7d;
+ public static class TL_account_reportProfilePhoto extends TLObject {
+ public static int constructor = 0xfa8cc6f5;
+
+ public InputPeer peer;
+ public InputPhoto photo_id;
+ public ReportReason reason;
+ public String message;
+
+ public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
+ return Bool.TLdeserialize(stream, constructor, exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ peer.serializeToStream(stream);
+ photo_id.serializeToStream(stream);
+ reason.serializeToStream(stream);
+ stream.writeString(message);
+ }
+ }
+
+ public static class TL_account_getAllSecureValues extends TLObject {
+ public static int constructor = 0xb288bc7d;
- public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
- Vector vector = new Vector();
- int size = stream.readInt32(exception);
- for (int a = 0; a < size; a++) {
- TL_secureValue object = TL_secureValue.TLdeserialize(stream, stream.readInt32(exception), exception);
+ public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
+ Vector vector = new Vector();
+ int size = stream.readInt32(exception);
+ for (int a = 0; a < size; a++) {
+ TL_secureValue object = TL_secureValue.TLdeserialize(stream, stream.readInt32(exception), exception);
if (object == null) {
return vector;
}
@@ -40808,21 +41559,6 @@ public class TLRPC {
}
public static class TL_messages_exportChatInvite extends TLObject {
- public static int constructor = 0xdf7534c;
-
- public InputPeer peer;
-
- public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
- return ExportedChatInvite.TLdeserialize(stream, constructor, exception);
- }
-
- public void serializeToStream(AbstractSerializedData stream) {
- stream.writeInt32(constructor);
- peer.serializeToStream(stream);
- }
- }
-
- public static class TL_messages_exportChatInvite_layer124 extends TLObject {
public static int constructor = 0x14b9bcd7;
public int flags;
@@ -42492,7 +43228,7 @@ public class TLRPC {
}
public static class TL_messages_getExportedChatInvites extends TLObject {
- public static int constructor = 0x6a72ac6c;
+ public static int constructor = 0xa2b5a3f6;
public int flags;
public boolean revoked;
@@ -42511,9 +43247,7 @@ public class TLRPC {
flags = revoked ? (flags | 8) : (flags &~ 8);
stream.writeInt32(flags);
peer.serializeToStream(stream);
- if ((flags & 1) != 0) {
- admin_id.serializeToStream(stream);
- }
+ admin_id.serializeToStream(stream);
if ((flags & 4) != 0) {
stream.writeInt32(offset_date);
}
@@ -42535,7 +43269,7 @@ public class TLRPC {
public int usage_limit;
public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
- return TL_messages_exportedChatInvite.TLdeserialize(stream, constructor, exception);
+ return messages_ExportedChatInvite.TLdeserialize(stream, constructor, exception);
}
public void serializeToStream(AbstractSerializedData stream) {
@@ -42554,9 +43288,10 @@ public class TLRPC {
}
public static class TL_messages_deleteRevokedExportedChatInvites extends TLObject {
- public static int constructor = 0x52041463;
+ public static int constructor = 0x56987bd5;
public InputPeer peer;
+ public InputUser admin_id;
public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
return Bool.TLdeserialize(stream, constructor, exception);
@@ -42565,6 +43300,7 @@ public class TLRPC {
public void serializeToStream(AbstractSerializedData stream) {
stream.writeInt32(constructor);
peer.serializeToStream(stream);
+ admin_id.serializeToStream(stream);
}
}
@@ -42585,6 +43321,21 @@ public class TLRPC {
}
}
+ public static class TL_messages_getAdminsWithInvites extends TLObject {
+ public static int constructor = 0x3920e6ef;
+
+ public InputPeer peer;
+
+ public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
+ return TL_messages_chatAdminsWithInvites.TLdeserialize(stream, constructor, exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ peer.serializeToStream(stream);
+ }
+ }
+
public static class TL_messages_getChatInviteImporters extends TLObject {
public static int constructor = 0x26fb7289;
@@ -42608,6 +43359,23 @@ public class TLRPC {
}
}
+ public static class TL_messages_setHistoryTTL extends TLObject {
+ public static int constructor = 0xb80e5fe4;
+
+ public InputPeer peer;
+ public int period;
+
+ public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
+ return Updates.TLdeserialize(stream, constructor, exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ peer.serializeToStream(stream);
+ stream.writeInt32(period);
+ }
+ }
+
public static class TL_messages_deleteChat extends TLObject {
public static int constructor = 0x83247d11;
@@ -42712,14 +43480,29 @@ public class TLRPC {
}
}
- public static class TL_help_getAppChangelog extends TLObject {
- public static int constructor = 0x9010ef6f;
+ public static class TL_messages_checkHistoryImportPeer extends TLObject {
+ public static int constructor = 0x5dc60f03;
- public String prev_app_version;
+ public InputPeer peer;
- public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
- return Updates.TLdeserialize(stream, constructor, exception);
- }
+ public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
+ return TL_messages_checkedHistoryImportPeer.TLdeserialize(stream, constructor, exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ peer.serializeToStream(stream);
+ }
+ }
+
+ public static class TL_help_getAppChangelog extends TLObject {
+ public static int constructor = 0x9010ef6f;
+
+ public String prev_app_version;
+
+ public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
+ return Updates.TLdeserialize(stream, constructor, exception);
+ }
public void serializeToStream(AbstractSerializedData stream) {
stream.writeInt32(constructor);
@@ -43463,32 +44246,32 @@ public class TLRPC {
public void serializeToStream(AbstractSerializedData stream) {
stream.writeInt32(constructor);
- channel.serializeToStream(stream);
- stream.writeInt32(0x1cb5c415);
- int count = id.size();
- stream.writeInt32(count);
- for (int a = 0; a < count; a++) {
- stream.writeInt32(id.get(a));
- }
- }
- }
+ channel.serializeToStream(stream);
+ stream.writeInt32(0x1cb5c415);
+ int count = id.size();
+ stream.writeInt32(count);
+ for (int a = 0; a < count; a++) {
+ stream.writeInt32(id.get(a));
+ }
+ }
+ }
- public static class TL_channels_deleteHistory extends TLObject {
- public static int constructor = 0xaf369d42;
+ public static class TL_channels_deleteHistory extends TLObject {
+ public static int constructor = 0xaf369d42;
- public InputChannel channel;
- public int max_id;
+ public InputChannel channel;
+ public int max_id;
- public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
- return Bool.TLdeserialize(stream, constructor, exception);
- }
+ public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
+ return Bool.TLdeserialize(stream, constructor, exception);
+ }
- public void serializeToStream(AbstractSerializedData stream) {
- stream.writeInt32(constructor);
- channel.serializeToStream(stream);
- stream.writeInt32(max_id);
- }
- }
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ channel.serializeToStream(stream);
+ stream.writeInt32(max_id);
+ }
+ }
public static class TL_channels_searchPosts extends TLObject {
public static int constructor = 0x43a0a7e2;
@@ -43543,6 +44326,21 @@ public class TLRPC {
}
}
+ public static class TL_channels_convertToGigagroup extends TLObject {
+ public static int constructor = 0xb290c69;
+
+ public InputChannel channel;
+
+ public TLObject deserializeResponse(AbstractSerializedData stream, int constructor, boolean exception) {
+ return Updates.TLdeserialize(stream, constructor, exception);
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ channel.serializeToStream(stream);
+ }
+ }
+
public static class TL_phone_getCallConfig extends TLObject {
public static int constructor = 0x55451fa9;
@@ -45028,6 +45826,7 @@ public class TLRPC {
public Peer from_id;
public Peer peer_id;
public int date;
+ public int expire_date;
public MessageAction action;
public String message;
public MessageMedia media;
@@ -45056,6 +45855,7 @@ public class TLRPC {
public long grouped_id;
public TL_messageReactions reactions;
public ArrayList restriction_reason = new ArrayList<>();
+ public int ttl_period;
public int send_state = 0; //custom
public int fwd_msg_id = 0; //custom
public String attachPath = ""; //custom
@@ -45153,17 +45953,23 @@ public class TLRPC {
result = new TL_message_layer118();
break;
case 0x58ae39c9:
+ result = new TL_message_layer123();
+ break;
+ case 0xbce383d2:
result = new TL_message();
break;
- case 0x9e19a1f6:
- result = new TL_messageService_layer118();
- break;
+ case 0x9e19a1f6:
+ result = new TL_messageService_layer118();
+ break;
case 0x286fa604:
+ result = new TL_messageService_layer123();
+ break;
+ case 0x2b085862:
result = new TL_messageService();
break;
- case 0xf07814c8:
- result = new TL_message_old5(); //custom
- break;
+ case 0xf07814c8:
+ result = new TL_message_old5(); //custom
+ break;
}
if (result == null && exception) {
throw new RuntimeException(String.format("can't parse magic %x in Message", constructor));
@@ -45845,6 +46651,181 @@ public class TLRPC {
}
public static class TL_message extends Message {
+ public static int constructor = 0xbce383d2;
+
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ flags = stream.readInt32(exception);
+ out = (flags & 2) != 0;
+ mentioned = (flags & 16) != 0;
+ media_unread = (flags & 32) != 0;
+ silent = (flags & 8192) != 0;
+ post = (flags & 16384) != 0;
+ from_scheduled = (flags & 262144) != 0;
+ legacy = (flags & 524288) != 0;
+ edit_hide = (flags & 2097152) != 0;
+ pinned = (flags & 16777216) != 0;
+ id = stream.readInt32(exception);
+ if ((flags & 256) != 0) {
+ from_id = Peer.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ peer_id = Peer.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if ((flags & 4) != 0) {
+ fwd_from = MessageFwdHeader.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ if ((flags & 2048) != 0) {
+ via_bot_id = stream.readInt32(exception);
+ }
+ if ((flags & 8) != 0) {
+ reply_to = TL_messageReplyHeader.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ date = stream.readInt32(exception);
+ message = stream.readString(exception);
+ if ((flags & 512) != 0) {
+ media = MessageMedia.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if (media != null) {
+ ttl = media.ttl_seconds; //custom
+ }
+ if (media != null && !TextUtils.isEmpty(media.captionLegacy)) {
+ message = media.captionLegacy;
+ }
+ }
+ if ((flags & 64) != 0) {
+ reply_markup = ReplyMarkup.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ if ((flags & 128) != 0) {
+ int magic = stream.readInt32(exception);
+ if (magic != 0x1cb5c415) {
+ if (exception) {
+ throw new RuntimeException(String.format("wrong Vector magic, got %x", magic));
+ }
+ return;
+ }
+ int count = stream.readInt32(exception);
+ for (int a = 0; a < count; a++) {
+ MessageEntity object = MessageEntity.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if (object == null) {
+ return;
+ }
+ entities.add(object);
+ }
+ }
+ if ((flags & 1024) != 0) {
+ views = stream.readInt32(exception);
+ }
+ if ((flags & 1024) != 0) {
+ forwards = stream.readInt32(exception);
+ }
+ if ((flags & 8388608) != 0) {
+ replies = TL_messageReplies.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ if ((flags & 32768) != 0) {
+ edit_date = stream.readInt32(exception);
+ }
+ if ((flags & 65536) != 0) {
+ post_author = stream.readString(exception);
+ }
+ if ((flags & 131072) != 0) {
+ grouped_id = stream.readInt64(exception);
+ }
+ if ((flags & 4194304) != 0) {
+ int magic = stream.readInt32(exception);
+ if (magic != 0x1cb5c415) {
+ if (exception) {
+ throw new RuntimeException(String.format("wrong Vector magic, got %x", magic));
+ }
+ return;
+ }
+ int count = stream.readInt32(exception);
+ for (int a = 0; a < count; a++) {
+ TL_restrictionReason object = TL_restrictionReason.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if (object == null) {
+ return;
+ }
+ restriction_reason.add(object);
+ }
+ }
+ if ((flags & 33554432) != 0) {
+ ttl_period = stream.readInt32(exception);
+ }
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ flags = out ? (flags | 2) : (flags & ~2);
+ flags = mentioned ? (flags | 16) : (flags & ~16);
+ flags = media_unread ? (flags | 32) : (flags & ~32);
+ flags = silent ? (flags | 8192) : (flags & ~8192);
+ flags = post ? (flags | 16384) : (flags & ~16384);
+ flags = from_scheduled ? (flags | 262144) : (flags & ~262144);
+ flags = legacy ? (flags | 524288) : (flags & ~524288);
+ flags = edit_hide ? (flags | 2097152) : (flags & ~2097152);
+ flags = pinned ? (flags | 16777216) : (flags & ~16777216);
+ stream.writeInt32(flags);
+ stream.writeInt32(id);
+ if ((flags & 256) != 0) {
+ from_id.serializeToStream(stream);
+ }
+ peer_id.serializeToStream(stream);
+ if ((flags & 4) != 0) {
+ fwd_from.serializeToStream(stream);
+ }
+ if ((flags & 2048) != 0) {
+ stream.writeInt32(via_bot_id);
+ }
+ if ((flags & 8) != 0) {
+ reply_to.serializeToStream(stream);
+ }
+ stream.writeInt32(date);
+ stream.writeString(message);
+ if ((flags & 512) != 0) {
+ media.serializeToStream(stream);
+ }
+ if ((flags & 64) != 0) {
+ reply_markup.serializeToStream(stream);
+ }
+ if ((flags & 128) != 0) {
+ stream.writeInt32(0x1cb5c415);
+ int count = entities.size();
+ stream.writeInt32(count);
+ for (int a = 0; a < count; a++) {
+ entities.get(a).serializeToStream(stream);
+ }
+ }
+ if ((flags & 1024) != 0) {
+ stream.writeInt32(views);
+ }
+ if ((flags & 1024) != 0) {
+ stream.writeInt32(forwards);
+ }
+ if ((flags & 8388608) != 0) {
+ replies.serializeToStream(stream);
+ }
+ if ((flags & 32768) != 0) {
+ stream.writeInt32(edit_date);
+ }
+ if ((flags & 65536) != 0) {
+ stream.writeString(post_author);
+ }
+ if ((flags & 131072) != 0) {
+ stream.writeInt64(grouped_id);
+ }
+ if ((flags & 4194304) != 0) {
+ stream.writeInt32(0x1cb5c415);
+ int count = restriction_reason.size();
+ stream.writeInt32(count);
+ for (int a = 0; a < count; a++) {
+ restriction_reason.get(a).serializeToStream(stream);
+ }
+ }
+ if ((flags & 33554432) != 0) {
+ stream.writeInt32(ttl_period);
+ }
+ writeAttachPath(stream);
+ }
+ }
+
+ public static class TL_message_layer123 extends TL_message {
public static int constructor = 0x58ae39c9;
@@ -47449,7 +48430,7 @@ public class TLRPC {
}
}
- public static class TL_messageService extends Message {
+ public static class TL_messageService_layer123 extends TL_messageService {
public static int constructor = 0x286fa604;
@@ -47496,15 +48477,67 @@ public class TLRPC {
}
}
- public static class TL_messageService_layer118 extends TL_messageService {
- public static int constructor = 0x9e19a1f6;
+ public static class TL_messageService extends Message {
+ public static int constructor = 0x2b085862;
- public void readParams(AbstractSerializedData stream, boolean exception) {
- flags = stream.readInt32(exception);
- unread = (flags & 1) != 0;
- out = (flags & 2) != 0;
- mentioned = (flags & 16) != 0;
- media_unread = (flags & 32) != 0;
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ flags = stream.readInt32(exception);
+ out = (flags & 2) != 0;
+ mentioned = (flags & 16) != 0;
+ media_unread = (flags & 32) != 0;
+ silent = (flags & 8192) != 0;
+ post = (flags & 16384) != 0;
+ legacy = (flags & 524288) != 0;
+ id = stream.readInt32(exception);
+ if ((flags & 256) != 0) {
+ from_id = Peer.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ peer_id = Peer.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if ((flags & 8) != 0) {
+ reply_to = TL_messageReplyHeader.TLdeserialize(stream, stream.readInt32(exception), exception);
+ }
+ date = stream.readInt32(exception);
+ action = MessageAction.TLdeserialize(stream, stream.readInt32(exception), exception);
+ if ((flags & 33554432) != 0) {
+ ttl_period = stream.readInt32(exception);
+ }
+ }
+
+ public void serializeToStream(AbstractSerializedData stream) {
+ stream.writeInt32(constructor);
+ flags = out ? (flags | 2) : (flags & ~2);
+ flags = mentioned ? (flags | 16) : (flags & ~16);
+ flags = media_unread ? (flags | 32) : (flags & ~32);
+ flags = silent ? (flags | 8192) : (flags & ~8192);
+ flags = post ? (flags | 16384) : (flags & ~16384);
+ flags = legacy ? (flags | 524288) : (flags & ~524288);
+ stream.writeInt32(flags);
+ stream.writeInt32(id);
+ if ((flags & 256) != 0) {
+ from_id.serializeToStream(stream);
+ }
+ peer_id.serializeToStream(stream);
+ if ((flags & 8) != 0) {
+ reply_to.serializeToStream(stream);
+ }
+ stream.writeInt32(date);
+ action.serializeToStream(stream);
+ if ((flags & 33554432) != 0) {
+ stream.writeInt32(ttl_period);
+ }
+ }
+ }
+
+ public static class TL_messageService_layer118 extends TL_messageService {
+ public static int constructor = 0x9e19a1f6;
+
+ public void readParams(AbstractSerializedData stream, boolean exception) {
+ flags = stream.readInt32(exception);
+ unread = (flags & 1) != 0;
+ out = (flags & 2) != 0;
+ mentioned = (flags & 16) != 0;
+ media_unread = (flags & 32) != 0;
silent = (flags & 8192) != 0;
post = (flags & 16384) != 0;
legacy = (flags & 524288) != 0;
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java
index 81ec7ac2d..b35c12f3e 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java
@@ -486,98 +486,162 @@ public class ActionBar extends FrameLayout {
}
public void showActionMode() {
- showActionMode(null, null, null, null, null, 0);
+ showActionMode(true, null, null, null, null, null, 0);
}
- public void showActionMode(View extraView, View showingView, View[] hidingViews,
+ public void showActionMode(boolean animated) {
+ showActionMode(animated, null, null, null, null, null, 0);
+ }
+
+ public void showActionMode(boolean animated, View extraView, View showingView, View[] hidingViews,
boolean[] hideView, View translationView, int translation) {
if (actionMode == null || actionModeVisible) {
return;
}
actionModeVisible = true;
- ArrayList animators = new ArrayList<>();
- animators.add(ObjectAnimator.ofFloat(actionMode, View.ALPHA, 0.0f, 1.0f));
- if (hidingViews != null) {
- for (int a = 0; a < hidingViews.length; a++) {
- if (hidingViews[a] != null) {
- animators.add(ObjectAnimator.ofFloat(hidingViews[a], View.ALPHA, 1.0f, 0.0f));
+ if (animated) {
+ ArrayList animators = new ArrayList<>();
+ animators.add(ObjectAnimator.ofFloat(actionMode, View.ALPHA, 0.0f, 1.0f));
+ if (hidingViews != null) {
+ for (int a = 0; a < hidingViews.length; a++) {
+ if (hidingViews[a] != null) {
+ animators.add(ObjectAnimator.ofFloat(hidingViews[a], View.ALPHA, 1.0f, 0.0f));
+ }
}
}
- }
- if (showingView != null) {
- animators.add(ObjectAnimator.ofFloat(showingView, View.ALPHA, 0.0f, 1.0f));
- }
- if (translationView != null) {
- animators.add(ObjectAnimator.ofFloat(translationView, View.TRANSLATION_Y, translation));
- actionModeTranslationView = translationView;
- }
- actionModeExtraView = extraView;
- actionModeShowingView = showingView;
- actionModeHidingViews = hidingViews;
- if (occupyStatusBar && actionModeTop != null && !SharedConfig.noStatusBar) {
- animators.add(ObjectAnimator.ofFloat(actionModeTop, View.ALPHA, 0.0f, 1.0f));
- }
- if (SharedConfig.noStatusBar) {
- if (AndroidUtilities.computePerceivedBrightness(actionModeColor) < 0.721f) {
- AndroidUtilities.setLightStatusBar(((Activity) getContext()).getWindow(), false);
- } else {
- AndroidUtilities.setLightStatusBar(((Activity) getContext()).getWindow(), true);
+ if (showingView != null) {
+ animators.add(ObjectAnimator.ofFloat(showingView, View.ALPHA, 0.0f, 1.0f));
}
- }
- if (actionModeAnimation != null) {
- actionModeAnimation.cancel();
- }
- actionModeAnimation = new AnimatorSet();
- actionModeAnimation.playTogether(animators);
- actionModeAnimation.setDuration(200);
- actionModeAnimation.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationStart(Animator animation) {
- actionMode.setVisibility(VISIBLE);
- if (occupyStatusBar && actionModeTop != null && !SharedConfig.noStatusBar) {
- actionModeTop.setVisibility(VISIBLE);
+ if (translationView != null) {
+ animators.add(ObjectAnimator.ofFloat(translationView, View.TRANSLATION_Y, translation));
+ actionModeTranslationView = translationView;
+ }
+ actionModeExtraView = extraView;
+ actionModeShowingView = showingView;
+ actionModeHidingViews = hidingViews;
+ if (occupyStatusBar && actionModeTop != null && !SharedConfig.noStatusBar) {
+ animators.add(ObjectAnimator.ofFloat(actionModeTop, View.ALPHA, 0.0f, 1.0f));
+ }
+ if (SharedConfig.noStatusBar) {
+ if (AndroidUtilities.computePerceivedBrightness(actionModeColor) < 0.721f) {
+ AndroidUtilities.setLightStatusBar(((Activity) getContext()).getWindow(), false);
+ } else {
+ AndroidUtilities.setLightStatusBar(((Activity) getContext()).getWindow(), true);
}
}
+ if (actionModeAnimation != null) {
+ actionModeAnimation.cancel();
+ }
+ actionModeAnimation = new AnimatorSet();
+ actionModeAnimation.playTogether(animators);
+ actionModeAnimation.setDuration(200);
+ actionModeAnimation.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationStart(Animator animation) {
+ actionMode.setVisibility(VISIBLE);
+ if (occupyStatusBar && actionModeTop != null && !SharedConfig.noStatusBar) {
+ actionModeTop.setVisibility(VISIBLE);
+ }
+ }
- @Override
- public void onAnimationEnd(Animator animation) {
- if (actionModeAnimation != null && actionModeAnimation.equals(animation)) {
- actionModeAnimation = null;
- if (titleTextView[0] != null) {
- titleTextView[0].setVisibility(INVISIBLE);
- }
- if (subtitleTextView != null && !TextUtils.isEmpty(subtitleTextView.getText())) {
- subtitleTextView.setVisibility(INVISIBLE);
- }
- if (menu != null) {
- menu.setVisibility(INVISIBLE);
- }
- if (actionModeHidingViews != null) {
- for (int a = 0; a < actionModeHidingViews.length; a++) {
- if (actionModeHidingViews[a] != null) {
- if (hideView == null || a >= hideView.length || hideView[a]) {
- actionModeHidingViews[a].setVisibility(INVISIBLE);
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ if (actionModeAnimation != null && actionModeAnimation.equals(animation)) {
+ actionModeAnimation = null;
+ if (titleTextView[0] != null) {
+ titleTextView[0].setVisibility(INVISIBLE);
+ }
+ if (subtitleTextView != null && !TextUtils.isEmpty(subtitleTextView.getText())) {
+ subtitleTextView.setVisibility(INVISIBLE);
+ }
+ if (menu != null) {
+ menu.setVisibility(INVISIBLE);
+ }
+ if (actionModeHidingViews != null) {
+ for (int a = 0; a < actionModeHidingViews.length; a++) {
+ if (actionModeHidingViews[a] != null) {
+ if (hideView == null || a >= hideView.length || hideView[a]) {
+ actionModeHidingViews[a].setVisibility(INVISIBLE);
+ }
}
}
}
}
}
- }
- @Override
- public void onAnimationCancel(Animator animation) {
- if (actionModeAnimation != null && actionModeAnimation.equals(animation)) {
- actionModeAnimation = null;
+ @Override
+ public void onAnimationCancel(Animator animation) {
+ if (actionModeAnimation != null && actionModeAnimation.equals(animation)) {
+ actionModeAnimation = null;
+ }
+ }
+ });
+ actionModeAnimation.start();
+ if (backButtonImageView != null) {
+ Drawable drawable = backButtonImageView.getDrawable();
+ if (drawable instanceof BackDrawable) {
+ ((BackDrawable) drawable).setRotation(1, true);
+ }
+ backButtonImageView.setBackgroundDrawable(Theme.createSelectorDrawable(itemsActionModeBackgroundColor));
+ }
+ } else {
+ actionMode.setAlpha(1.0f);
+ if (hidingViews != null) {
+ for (int a = 0; a < hidingViews.length; a++) {
+ if (hidingViews[a] != null) {
+ hidingViews[a].setAlpha(0.0f);
+ }
}
}
- });
- actionModeAnimation.start();
- if (backButtonImageView != null) {
- Drawable drawable = backButtonImageView.getDrawable();
- if (drawable instanceof BackDrawable) {
- ((BackDrawable) drawable).setRotation(1, true);
+ if (showingView != null) {
+ showingView.setAlpha(1.0f);
+ }
+ if (translationView != null) {
+ translationView.setTranslationY(translation);
+ actionModeTranslationView = translationView;
+ }
+ actionModeExtraView = extraView;
+ actionModeShowingView = showingView;
+ actionModeHidingViews = hidingViews;
+ if (occupyStatusBar && actionModeTop != null && !SharedConfig.noStatusBar) {
+ actionModeTop.setAlpha(1.0f);
+ }
+ if (SharedConfig.noStatusBar) {
+ if (AndroidUtilities.computePerceivedBrightness(actionModeColor) < 0.721f) {
+ AndroidUtilities.setLightStatusBar(((Activity) getContext()).getWindow(), false);
+ } else {
+ AndroidUtilities.setLightStatusBar(((Activity) getContext()).getWindow(), true);
+ }
+ }
+ actionMode.setVisibility(VISIBLE);
+ if (occupyStatusBar && actionModeTop != null && !SharedConfig.noStatusBar) {
+ actionModeTop.setVisibility(VISIBLE);
+ }
+ if (titleTextView[0] != null) {
+ titleTextView[0].setVisibility(INVISIBLE);
+ }
+ if (subtitleTextView != null && !TextUtils.isEmpty(subtitleTextView.getText())) {
+ subtitleTextView.setVisibility(INVISIBLE);
+ }
+ if (menu != null) {
+ menu.setVisibility(INVISIBLE);
+ }
+ if (actionModeHidingViews != null) {
+ for (int a = 0; a < actionModeHidingViews.length; a++) {
+ if (actionModeHidingViews[a] != null) {
+ if (hideView == null || a >= hideView.length || hideView[a]) {
+ actionModeHidingViews[a].setVisibility(INVISIBLE);
+ }
+ }
+ }
+ }
+ if (backButtonImageView != null) {
+ Drawable drawable = backButtonImageView.getDrawable();
+ if (drawable instanceof BackDrawable) {
+ ((BackDrawable) drawable).setRotation(1, false);
+ }
+ backButtonImageView.setBackgroundDrawable(Theme.createSelectorDrawable(itemsActionModeBackgroundColor));
}
- backButtonImageView.setBackgroundDrawable(Theme.createSelectorDrawable(itemsActionModeBackgroundColor));
}
}
@@ -591,7 +655,7 @@ public class ActionBar extends FrameLayout {
animators.add(ObjectAnimator.ofFloat(actionMode, View.ALPHA, 0.0f));
if (actionModeHidingViews != null) {
for (int a = 0; a < actionModeHidingViews.length; a++) {
- if (actionModeHidingViews != null) {
+ if (actionModeHidingViews[a] != null) {
actionModeHidingViews[a].setVisibility(VISIBLE);
animators.add(ObjectAnimator.ofFloat(actionModeHidingViews[a], View.ALPHA, 1.0f));
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java
index dd191f2e0..2432e6a62 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarLayout.java
@@ -24,7 +24,6 @@ import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import androidx.annotation.Keep;
import android.view.Gravity;
import android.view.HapticFeedbackConstants;
import android.view.KeyEvent;
@@ -38,11 +37,14 @@ import android.view.animation.AccelerateDecelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
import android.widget.FrameLayout;
+import androidx.annotation.Keep;
+
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.MessagesController;
import org.telegram.messenger.R;
import org.telegram.messenger.SharedConfig;
+import org.telegram.ui.Components.Bulletin;
import org.telegram.ui.Components.CubicBezierInterpolator;
import org.telegram.ui.Components.GroupCallPip;
import org.telegram.ui.Components.LayoutHelper;
@@ -1432,6 +1434,9 @@ public class ActionBarLayout extends FrameLayout {
}
} else {
currentAnimation = animation;
+ if (Bulletin.getVisibleBulletin() != null && Bulletin.getVisibleBulletin().isShowing()) {
+ Bulletin.getVisibleBulletin().hide();
+ }
}
} else {
currentFragment.onTransitionAnimationEnd(false, true);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuSubItem.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuSubItem.java
index ddb1f71b2..7ee253ad0 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuSubItem.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuSubItem.java
@@ -128,6 +128,10 @@ public class ActionBarMenuSubItem extends FrameLayout {
textView.setText(text);
}
+ public void setSubtextColor(int color) {
+ subtextView.setTextColor(color);
+ }
+
public void setSubtext(String text) {
if (subtextView == null) {
subtextView = new TextView(getContext());
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/AdjustPanLayoutHelper.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/AdjustPanLayoutHelper.java
index 3bff5aee5..34fde5fc3 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/AdjustPanLayoutHelper.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/AdjustPanLayoutHelper.java
@@ -8,6 +8,7 @@ import android.content.Context;
import android.view.ContextThemeWrapper;
import android.view.View;
import android.view.ViewGroup;
+import android.view.ViewParent;
import android.view.ViewTreeObserver;
import android.view.Window;
import android.view.animation.Interpolator;
@@ -45,6 +46,8 @@ public class AdjustPanLayoutHelper {
ArrayList viewsToHeightSet = new ArrayList<>();
protected float keyboardSize;
+ boolean checkHierarchyHeight;
+
ViewTreeObserver.OnPreDrawListener onPreDrawListener = new ViewTreeObserver.OnPreDrawListener() {
@Override
public boolean onPreDraw() {
@@ -92,10 +95,17 @@ public class AdjustPanLayoutHelper {
int startOffset = startOffset();
getViewsToSetHeight(parent);
- setViewHeight(Math.max(previousHeight, contentHeight));
+ int additionalContentHeight = 0;
+ if (checkHierarchyHeight) {
+ ViewParent viewParent = parent.getParent();
+ if (viewParent instanceof View) {
+ additionalContentHeight = ((View) viewParent).getHeight() - contentHeight;
+ }
+ }
+ setViewHeight(Math.max(previousHeight, contentHeight + additionalContentHeight));
resizableView.requestLayout();
- onTransitionStart(isKeyboardVisible);
+ onTransitionStart(isKeyboardVisible, contentHeight);
float dy = contentHeight - previousHeight;
float from;
@@ -240,7 +250,7 @@ public class AdjustPanLayoutHelper {
}
- protected void onTransitionStart(boolean keyboardVisible) {
+ protected void onTransitionStart(boolean keyboardVisible, int contentHeight) {
}
@@ -255,4 +265,8 @@ public class AdjustPanLayoutHelper {
public boolean animationInProgress() {
return animationInProgress;
}
+
+ public void setCheckHierarchyHeight(boolean checkHierarchyHeight) {
+ this.checkHierarchyHeight = checkHierarchyHeight;
+ }
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BottomSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BottomSheet.java
index 0af516e59..6bfc95d70 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BottomSheet.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BottomSheet.java
@@ -56,6 +56,7 @@ import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.R;
import org.telegram.messenger.UserConfig;
import org.telegram.ui.Components.AnimationProperties;
+import org.telegram.ui.Components.Bulletin;
import org.telegram.ui.Components.CubicBezierInterpolator;
import org.telegram.ui.Components.LayoutHelper;
@@ -1200,6 +1201,7 @@ public class BottomSheet extends Dialog {
onHideListener.onDismiss(this);
}
cancelSheetAnimation();
+ long duration = 0;
if (!allowCustomAnimation || !onCustomCloseAnimation()) {
currentSheetAnimationType = 2;
currentSheetAnimation = new AnimatorSet();
@@ -1209,10 +1211,11 @@ public class BottomSheet extends Dialog {
);
if (useFastDismiss) {
int height = containerView.getMeasuredHeight();
- currentSheetAnimation.setDuration(Math.max(60, (int) (250 * (height - containerView.getTranslationY()) / (float) height)));
+ duration = Math.max(60, (int) (250 * (height - containerView.getTranslationY()) / (float) height));
+ currentSheetAnimation.setDuration(duration);
useFastDismiss = false;
} else {
- currentSheetAnimation.setDuration(250);
+ currentSheetAnimation.setDuration(duration = 250);
}
currentSheetAnimation.setInterpolator(CubicBezierInterpolator.DEFAULT);
currentSheetAnimation.addListener(new AnimatorListenerAdapter() {
@@ -1243,6 +1246,15 @@ public class BottomSheet extends Dialog {
NotificationCenter.getGlobalInstance().postNotificationName(NotificationCenter.stopAllHeavyOperations, 512);
currentSheetAnimation.start();
}
+
+ Bulletin bulletin = Bulletin.getVisibleBulletin();
+ if (bulletin != null && bulletin.isShowing()) {
+ if (duration > 0) {
+ bulletin.hide((long) (duration * 0.6f));
+ } else {
+ bulletin.hide();
+ }
+ }
}
public int getSheetAnimationType() {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java
index f9fee886f..3785fa6bb 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/DrawerLayoutContainer.java
@@ -290,6 +290,13 @@ public class DrawerLayoutContainer extends FrameLayout {
parentActionBarLayout = layout;
}
+ public void closeDrawer() {
+ if (drawerPosition != 0) {
+ setDrawerPosition(0);
+ onDrawerAnimationEnd(false);
+ }
+ }
+
public void setAllowOpenDrawer(boolean value, boolean animated) {
allowOpenDrawer = value;
if (!allowOpenDrawer && drawerPosition != 0) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ThemeDescription.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ThemeDescription.java
index d9abf967c..42f7504fc 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ThemeDescription.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ThemeDescription.java
@@ -28,6 +28,8 @@ import android.widget.ImageView;
import android.widget.ScrollView;
import android.widget.TextView;
+import androidx.viewpager.widget.ViewPager;
+
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.FileLog;
import org.telegram.ui.Components.AudioPlayerAlert;
@@ -61,10 +63,6 @@ import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
-import androidx.viewpager.widget.ViewPager;
-
-import com.google.android.exoplayer2.util.Log;
-
public class ThemeDescription {
public static int FLAG_BACKGROUND = 0x00000001;
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionIntroActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionIntroActivity.java
index 90085baef..db7a047c8 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ActionIntroActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionIntroActivity.java
@@ -561,11 +561,12 @@ public class ActionIntroActivity extends BaseFragment implements LocationControl
switch (currentType) {
case ACTION_TYPE_CHANNEL_CREATE: {
- imageView.setImageResource(R.drawable.channelintro);
imageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
+ imageView.setAnimation(R.raw.channel_create, 200, 200);
titleTextView.setText(LocaleController.getString("ChannelAlertTitle", R.string.ChannelAlertTitle));
descriptionText.setText(LocaleController.getString("ChannelAlertText", R.string.ChannelAlertText));
buttonTextView.setText(LocaleController.getString("ChannelAlertCreate2", R.string.ChannelAlertCreate2));
+ imageView.playAnimation();
break;
}
case ACTION_TYPE_NEARBY_LOCATION_ACCESS: {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/MentionsAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/MentionsAdapter.java
index 3198506c7..92d64dc80 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/MentionsAdapter.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/MentionsAdapter.java
@@ -21,11 +21,13 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.ChatObject;
import org.telegram.messenger.ContactsController;
-import org.telegram.messenger.MediaDataController;
import org.telegram.messenger.LocaleController;
+import org.telegram.messenger.MediaDataController;
import org.telegram.messenger.MessageObject;
import org.telegram.messenger.MessagesController;
import org.telegram.messenger.MessagesStorage;
@@ -51,8 +53,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
-import androidx.recyclerview.widget.RecyclerView;
-
public class MentionsAdapter extends RecyclerListView.SelectionAdapter {
public interface MentionsAdapterDelegate {
@@ -82,6 +82,7 @@ public class MentionsAdapter extends RecyclerListView.SelectionAdapter {
private int resultStartPosition;
private int resultLength;
private String lastText;
+ private boolean lastForSearch;
private boolean lastUsernameOnly;
private int lastPosition;
private ArrayList messages;
@@ -147,7 +148,7 @@ public class MentionsAdapter extends RecyclerListView.SelectionAdapter {
@Override
public void onSetHashtags(ArrayList arrayList, HashMap hashMap) {
if (lastText != null) {
- searchUsernameOrHashtag(lastText, lastPosition, messages, lastUsernameOnly);
+ searchUsernameOrHashtag(lastText, lastPosition, messages, lastUsernameOnly, lastForSearch);
}
}
});
@@ -196,7 +197,7 @@ public class MentionsAdapter extends RecyclerListView.SelectionAdapter {
}
}
if (lastText != null) {
- searchUsernameOrHashtag(lastText, lastPosition, messages, lastUsernameOnly);
+ searchUsernameOrHashtag(lastText, lastPosition, messages, lastUsernameOnly, lastForSearch);
}
}
@@ -550,7 +551,7 @@ public class MentionsAdapter extends RecyclerListView.SelectionAdapter {
}
}
- public void searchUsernameOrHashtag(String text, int position, ArrayList messageObjects, boolean usernameOnly) {
+ public void searchUsernameOrHashtag(String text, int position, ArrayList messageObjects, boolean usernameOnly, boolean forSearch) {
if (cancelDelayRunnable != null) {
AndroidUtilities.cancelRunOnUIThread(cancelDelayRunnable);
cancelDelayRunnable = null;
@@ -575,6 +576,7 @@ public class MentionsAdapter extends RecyclerListView.SelectionAdapter {
}
lastText = null;
lastUsernameOnly = usernameOnly;
+ lastForSearch = forSearch;
StringBuilder result = new StringBuilder();
int foundType = -1;
if (!usernameOnly && needBotContext && text.charAt(0) == '@') {
@@ -695,7 +697,7 @@ public class MentionsAdapter extends RecyclerListView.SelectionAdapter {
if (user == null) {
continue;
}
- if (user.username != null && user.username.length() > 0 && (usernameString.length() > 0 && user.username.toLowerCase().startsWith(usernameString) || usernameString.length() == 0)) {
+ if (!TextUtils.isEmpty(user.username) && (usernameString.length() == 0 || user.username.toLowerCase().startsWith(usernameString))) {
newResult.add(user);
newResultsHashMap.put(user.id, user);
newMap.put(user.id, user);
@@ -719,7 +721,7 @@ public class MentionsAdapter extends RecyclerListView.SelectionAdapter {
threadId = 0;
}
if (chat != null && info != null && info.participants != null && (!ChatObject.isChannel(chat) || chat.megagroup)) {
- for (int a = -1; a < info.participants.participants.size(); a++) {
+ for (int a = (forSearch ? -1 : 0); a < info.participants.participants.size(); a++) {
String username;
String firstName;
String lastName;
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/StickersSearchAdapter.java b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/StickersSearchAdapter.java
index dcb2b5b6a..6eca09c77 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Adapters/StickersSearchAdapter.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Adapters/StickersSearchAdapter.java
@@ -445,10 +445,10 @@ public class StickersSearchAdapter extends RecyclerListView.SelectionAdapter {
if (payloads.contains(PAYLOAD_ANIMATED)) {
if (holder.getItemViewType() == 3) {
bindFeaturedStickerSetInfoCell((FeaturedStickerSetInfoCell) holder.itemView, position, true);
- } else {
- super.onBindViewHolder(holder, position, payloads);
+ return;
}
}
+ super.onBindViewHolder(holder, position, payloads);
}
public void installStickerSet(TLRPC.InputStickerSet inputSet) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java
index e78d7cfaf..0c1ef171a 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java
@@ -136,6 +136,7 @@ import org.telegram.ui.Components.AnchorSpan;
import org.telegram.ui.Components.AnimatedArrowDrawable;
import org.telegram.ui.Components.AnimationProperties;
import org.telegram.ui.Components.AvatarDrawable;
+import org.telegram.ui.Components.BulletinFactory;
import org.telegram.ui.Components.CloseProgressDrawable2;
import org.telegram.ui.Components.CombinedDrawable;
import org.telegram.ui.Components.ContextProgressView;
@@ -3705,7 +3706,7 @@ public class ArticleViewer implements NotificationCenter.NotificationCenterDeleg
@Override
public void onTextCopied() {
-
+ BulletinFactory.of(containerView).createCopyBulletin(LocaleController.getString("TextCopied", R.string.TextCopied)).show();
}
});
containerView.addView(textSelectionHelper.getOverlayView(activity));
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/CancelAccountDeletionActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/CancelAccountDeletionActivity.java
index 8e33fe1c6..ee083965c 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/CancelAccountDeletionActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/CancelAccountDeletionActivity.java
@@ -50,7 +50,6 @@ import android.widget.TextView;
import org.telegram.PhoneFormat.PhoneFormat;
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.ApplicationLoader;
-import org.telegram.messenger.BuildVars;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.NotificationCenter;
@@ -66,6 +65,8 @@ import org.telegram.ui.ActionBar.ThemeDescription;
import org.telegram.ui.Components.AlertsCreator;
import org.telegram.ui.Components.EditTextBoldCursor;
import org.telegram.ui.Components.LayoutHelper;
+import org.telegram.ui.Components.RLottieDrawable;
+import org.telegram.ui.Components.RLottieImageView;
import org.telegram.ui.Components.RadialProgressView;
import org.telegram.ui.Components.SlideView;
import org.telegram.ui.Components.URLSpanNoUnderline;
@@ -397,11 +398,13 @@ public class CancelAccountDeletionActivity extends BaseFragment {
private TextView confirmTextView;
private TextView titleTextView;
private ImageView blackImageView;
- private ImageView blueImageView;
+ private RLottieImageView blueImageView;
private TextView timeText;
private TextView problemText;
private ProgressView progressView;
+ RLottieDrawable hintDrawable;
+
private Timer timeTimer;
private Timer codeTimer;
private final Object timerSync = new Object();
@@ -466,17 +469,19 @@ public class CancelAccountDeletionActivity extends BaseFragment {
blackImageView.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_windowBackgroundWhiteBlackText), PorterDuff.Mode.SRC_IN));
frameLayout.addView(blackImageView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.LEFT | Gravity.TOP, 0, 0, 0, 0));
- blueImageView = new ImageView(context);
+ blueImageView = new RLottieImageView(context);
blueImageView.setImageResource(R.drawable.sms_bubble);
blueImageView.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_chats_actionBackground), PorterDuff.Mode.SRC_IN));
frameLayout.addView(blueImageView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.LEFT | Gravity.TOP, 0, 0, 0, 0));
titleTextView.setText(LocaleController.getString("SentAppCodeTitle", R.string.SentAppCodeTitle));
} else {
- blueImageView = new ImageView(context);
- blueImageView.setImageResource(R.drawable.sms_code);
- blueImageView.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_chats_actionBackground), PorterDuff.Mode.SRC_IN));
- frameLayout.addView(blueImageView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.LEFT | Gravity.TOP, 0, 0, 0, 0));
+ blueImageView = new RLottieImageView(context);
+ hintDrawable = new RLottieDrawable(R.raw.sms_incoming_info, "" + R.raw.sms_incoming_info, AndroidUtilities.dp(48), AndroidUtilities.dp(48), true, null);
+ hintDrawable.setLayerColor("Bubble.**", Theme.getColor(Theme.key_chats_actionBackground));
+ hintDrawable.setLayerColor("Phone.**", Theme.getColor(Theme.key_chats_actionBackground));
+ blueImageView.setAnimation(hintDrawable);
+ frameLayout.addView(blueImageView, LayoutHelper.createFrame(48, 48, Gravity.LEFT | Gravity.TOP, 0, 0, 0, 0));
titleTextView.setText(LocaleController.getString("SentSmsCodeTitle", R.string.SentSmsCodeTitle));
}
@@ -1031,6 +1036,9 @@ public class CancelAccountDeletionActivity extends BaseFragment {
if (currentType == 3) {
return;
}
+ if (hintDrawable != null) {
+ hintDrawable.setCurrentFrame(0);
+ }
AndroidUtilities.runOnUIThread(() -> {
if (codeField != null) {
for (int a = codeField.length - 1; a >= 0; a--) {
@@ -1042,6 +1050,9 @@ public class CancelAccountDeletionActivity extends BaseFragment {
}
}
}
+ if (hintDrawable != null) {
+ hintDrawable.start();
+ }
}, 100);
}
@@ -1076,6 +1087,18 @@ public class CancelAccountDeletionActivity extends BaseFragment {
ArrayList arrayList = new ArrayList<>();
+ ThemeDescription.ThemeDescriptionDelegate descriptionDelegate = () -> {
+ for (int i = 0; i < views.length; i++) {
+ if (views[i] instanceof LoginActivity.LoginActivitySmsView) {
+ LoginActivity.LoginActivitySmsView smsView = (LoginActivity.LoginActivitySmsView) views[i];
+ if (smsView.hintDrawable != null) {
+ smsView.hintDrawable.setLayerColor("Bubble.**", Theme.getColor(Theme.key_chats_actionBackground));
+ smsView.hintDrawable.setLayerColor("Phone.**", Theme.getColor(Theme.key_chats_actionBackground));
+ }
+ }
+ }
+ };
+
arrayList.add(new ThemeDescription(fragmentView, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_windowBackgroundWhite));
arrayList.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_actionBarDefault));
@@ -1146,6 +1169,7 @@ public class CancelAccountDeletionActivity extends BaseFragment {
arrayList.add(new ThemeDescription(smsView4.progressView, 0, new Class[]{ProgressView.class}, new String[]{"paint"}, null, null, null, Theme.key_login_progressOuter));
arrayList.add(new ThemeDescription(smsView4.blackImageView, ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_windowBackgroundWhiteBlackText));
arrayList.add(new ThemeDescription(smsView4.blueImageView, ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_chats_actionBackground));
+ arrayList.add(new ThemeDescription(smsView4.blueImageView, 0, null, null, null, descriptionDelegate, Theme.key_chats_actionBackground));
return arrayList;
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatActionCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatActionCell.java
index 5c57d2650..648626791 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatActionCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatActionCell.java
@@ -25,21 +25,21 @@ import android.view.accessibility.AccessibilityNodeInfo;
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.DownloadController;
+import org.telegram.messenger.FileLoader;
+import org.telegram.messenger.FileLog;
import org.telegram.messenger.ImageLoader;
import org.telegram.messenger.ImageLocation;
import org.telegram.messenger.ImageReceiver;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.MessageObject;
-import org.telegram.messenger.FileLoader;
-import org.telegram.messenger.FileLog;
import org.telegram.messenger.R;
import org.telegram.messenger.SharedConfig;
+import org.telegram.messenger.UserConfig;
import org.telegram.messenger.browser.Browser;
import org.telegram.tgnet.TLRPC;
-import org.telegram.messenger.UserConfig;
import org.telegram.ui.ActionBar.Theme;
-import org.telegram.ui.PhotoViewer;
import org.telegram.ui.Components.AvatarDrawable;
+import org.telegram.ui.PhotoViewer;
public class ChatActionCell extends BaseCell implements DownloadController.FileDownloadProgressListener {
@@ -489,8 +489,29 @@ public class ChatActionCell extends BaseCell implements DownloadController.FileD
int dx;
int dx2;
int dy;
+ int previousLineWidth = 0;
for (int a = 0; a < count; a++) {
int width = findMaxWidthAroundLine(a);
+ int nextWidth = a < count - 1 ? findMaxWidthAroundLine(a + 1) : 0;
+ int w1 = 0;
+ int w2 = 0;
+ if (previousLineWidth != 0) {
+ int dw = width - previousLineWidth;
+ if (dw > 0 && dw < AndroidUtilities.dp(15) * 2) {
+ width = w1 = previousLineWidth + AndroidUtilities.dp(15) * 2;
+ }
+
+ }
+ if (nextWidth != 0) {
+ int dw = width - nextWidth;
+ if (dw > 0 && dw < AndroidUtilities.dp(15) * 2) {
+ width = w2 = nextWidth + AndroidUtilities.dp(15) * 2;
+ }
+ }
+ if (w1 != 0 && w2 != 0) {
+ width = Math.max(w1, w2);
+ }
+ previousLineWidth = width;
int x = (getMeasuredWidth() - width - cornerRest) / 2;
width += cornerRest;
int lineBottom = textLayout.getLineBottom(a);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
index 61fbd4505..4b6e716aa 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java
@@ -3069,7 +3069,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
createSelectorDrawable(0);
}
photoImage.setAlpha(1.0f);
- if (messageChanged || dataChanged) {
+ if ((messageChanged || dataChanged) && !pollUnvoteInProgress) {
pollButtons.clear();
}
int captionNewLine = 0;
@@ -8370,7 +8370,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
} else {
buttonState = 2;
}
- } else if (documentAttachType == DOCUMENT_ATTACH_TYPE_VIDEO) {
+ } else if (documentAttachType == DOCUMENT_ATTACH_TYPE_VIDEO && !hasEmbed) {
buttonState = 3;
} else {
buttonState = -1;
@@ -8958,7 +8958,11 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
} else if (messageObject.messageOwner.fwd_from != null && messageObject.messageOwner.fwd_from.post_author != null) {
signString = messageObject.messageOwner.fwd_from.post_author.replace("\n", "");
} else if (messageObject.messageOwner.fwd_from != null && messageObject.messageOwner.fwd_from.imported) {
- signString = LocaleController.formatImportedDate(messageObject.messageOwner.fwd_from.date) + " " + LocaleController.getString("ImportedMessage", R.string.ImportedMessage);
+ if (messageObject.messageOwner.fwd_from.date == messageObject.messageOwner.date) {
+ signString = LocaleController.getString("ImportedMessage", R.string.ImportedMessage);
+ } else {
+ signString = LocaleController.formatImportedDate(messageObject.messageOwner.fwd_from.date) + " " + LocaleController.getString("ImportedMessage", R.string.ImportedMessage);
+ }
} else if (!messageObject.isOutOwner() && fromId > 0 && messageObject.messageOwner.post) {
TLRPC.User signUser = MessagesController.getInstance(currentAccount).getUser(fromId);
if (signUser != null) {
@@ -13591,9 +13595,24 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
animateMessageText = false;
if (currentMessageObject.textLayoutBlocks != lastDrawingTextBlocks) {
- animateMessageText = true;
- animateOutTextBlocks = lastDrawingTextBlocks;
- changed = true;
+ boolean sameText = true;
+ if (currentMessageObject.textLayoutBlocks != null && lastDrawingTextBlocks != null && currentMessageObject.textLayoutBlocks.size() == lastDrawingTextBlocks.size()) {
+ for (int i = 0; i < lastDrawingTextBlocks.size(); i++) {
+ String newText = currentMessageObject.textLayoutBlocks.get(i).textLayout == null ? null : currentMessageObject.textLayoutBlocks.get(i).textLayout.getText().toString();
+ String oldText = lastDrawingTextBlocks.get(i).textLayout == null ? null : lastDrawingTextBlocks.get(i).textLayout.getText().toString();
+ if ((newText == null && oldText != null) || (newText != null && oldText == null) || !newText.equals(oldText)) {
+ sameText = false;
+ break;
+ }
+ }
+ } else {
+ sameText = false;
+ }
+ if (!sameText) {
+ animateMessageText = true;
+ animateOutTextBlocks = lastDrawingTextBlocks;
+ changed = true;
+ }
}
if (edited && !lastDrawingEdited && timeLayout != null) {
String editedStr = LocaleController.getString("EditedMessage", R.string.EditedMessage);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
index 8f8151e44..5d61729f9 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogCell.java
@@ -35,33 +35,33 @@ import android.view.animation.OvershootInterpolator;
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.ChatObject;
-import org.telegram.messenger.DownloadController;
-import org.telegram.messenger.FileLoader;
-import org.telegram.messenger.MediaDataController;
+import org.telegram.messenger.ContactsController;
import org.telegram.messenger.DialogObject;
-import org.telegram.messenger.ImageLocation;
-import org.telegram.messenger.LocaleController;
-import org.telegram.messenger.MessageObject;
-import org.telegram.messenger.MessagesStorage;
-import org.telegram.messenger.SharedConfig;
-import org.telegram.messenger.UserObject;
+import org.telegram.messenger.DownloadController;
+import org.telegram.messenger.Emoji;
+import org.telegram.messenger.FileLoader;
import org.telegram.messenger.FileLog;
+import org.telegram.messenger.ImageLocation;
+import org.telegram.messenger.ImageReceiver;
+import org.telegram.messenger.LocaleController;
+import org.telegram.messenger.MediaDataController;
+import org.telegram.messenger.MessageObject;
+import org.telegram.messenger.MessagesController;
+import org.telegram.messenger.MessagesStorage;
+import org.telegram.messenger.R;
+import org.telegram.messenger.SharedConfig;
+import org.telegram.messenger.UserConfig;
+import org.telegram.messenger.UserObject;
import org.telegram.tgnet.ConnectionsManager;
import org.telegram.tgnet.TLRPC;
-import org.telegram.messenger.ContactsController;
-import org.telegram.messenger.Emoji;
-import org.telegram.messenger.MessagesController;
-import org.telegram.messenger.R;
-import org.telegram.messenger.UserConfig;
-import org.telegram.messenger.ImageReceiver;
import org.telegram.ui.ActionBar.Theme;
-import org.telegram.ui.Components.EmptyStubSpan;
-import org.telegram.ui.Components.ForegroundColorSpanThemable;
import org.telegram.ui.Adapters.DialogsAdapter;
-import org.telegram.ui.Components.PullForegroundDrawable;
import org.telegram.ui.Components.AvatarDrawable;
import org.telegram.ui.Components.CheckBox2;
import org.telegram.ui.Components.CubicBezierInterpolator;
+import org.telegram.ui.Components.EmptyStubSpan;
+import org.telegram.ui.Components.ForegroundColorSpanThemable;
+import org.telegram.ui.Components.PullForegroundDrawable;
import org.telegram.ui.Components.RLottieDrawable;
import org.telegram.ui.Components.StaticLayoutEx;
import org.telegram.ui.Components.StatusDrawable;
@@ -2709,7 +2709,7 @@ public class DialogCell extends BaseCell {
} else if (chat != null) {
hasCall = chat.call_active && chat.call_not_empty;
if (hasCall || chatCallProgress != 0) {
- float checkProgress = checkBox.isChecked() ? 1.0f - checkBox.getProgress() : 1.0f;
+ float checkProgress = checkBox != null && checkBox.isChecked() ? 1.0f - checkBox.getProgress() : 1.0f;
int top = (int) (avatarImage.getImageY2() - AndroidUtilities.dp(useForceThreeLines || SharedConfig.useThreeLinesLayout ? 6 : 8));
int left;
if (LocaleController.isRTL) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/GroupCreateUserCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/GroupCreateUserCell.java
index 0bcec29a4..07595cb9e 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/GroupCreateUserCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/GroupCreateUserCell.java
@@ -117,6 +117,11 @@ public class GroupCreateUserCell extends FrameLayout {
return currentObject;
}
+ public void setDrawDivider(boolean value) {
+ drawDivider = value;
+ invalidate();
+ }
+
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(currentObject instanceof String ? 50 : 58), MeasureSpec.EXACTLY));
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedPhotoVideoCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedPhotoVideoCell.java
index 42ff187fe..1411a8102 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedPhotoVideoCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/SharedPhotoVideoCell.java
@@ -27,12 +27,12 @@ import android.widget.ImageView;
import android.widget.TextView;
import org.telegram.messenger.AndroidUtilities;
+import org.telegram.messenger.ApplicationLoader;
import org.telegram.messenger.DownloadController;
+import org.telegram.messenger.FileLoader;
import org.telegram.messenger.ImageLocation;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.MessageObject;
-import org.telegram.messenger.ApplicationLoader;
-import org.telegram.messenger.FileLoader;
import org.telegram.messenger.R;
import org.telegram.messenger.UserConfig;
import org.telegram.tgnet.TLRPC;
@@ -193,7 +193,7 @@ public class SharedPhotoVideoCell extends FrameLayout {
} else if (messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaPhoto && messageObject.messageOwner.media.photo != null && !messageObject.photoThumbs.isEmpty()) {
videoInfoContainer.setVisibility(INVISIBLE);
TLRPC.PhotoSize currentPhotoObjectThumb = FileLoader.getClosestPhotoSizeWithSize(messageObject.photoThumbs, 50);
- TLRPC.PhotoSize currentPhotoObject = FileLoader.getClosestPhotoSizeWithSize(messageObject.photoThumbs, 320, false, currentPhotoObjectThumb);
+ TLRPC.PhotoSize currentPhotoObject = FileLoader.getClosestPhotoSizeWithSize(messageObject.photoThumbs, 320, false, currentPhotoObjectThumb, false);
if (messageObject.mediaExists || DownloadController.getInstance(currentAccount).canDownloadMedia(messageObject)) {
if (currentPhotoObject == currentPhotoObjectThumb) {
currentPhotoObjectThumb = null;
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextCell.java
index 427156afd..e1cc21080 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextCell.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextCell.java
@@ -80,6 +80,10 @@ public class TextCell extends FrameLayout {
return textView;
}
+ public ImageView getImageView() {
+ return imageView;
+ }
+
public SimpleTextView getValueTextView() {
return valueTextView;
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSelectionHelper.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSelectionHelper.java
index 5268aba04..f23d3dd70 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSelectionHelper.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSelectionHelper.java
@@ -131,6 +131,8 @@ public abstract class TextSelectionHelper top && y + yOffset < parentView.getMeasuredHeight()) {
+ if (y + yOffset > top + keyboardSize && y + yOffset < parentView.getMeasuredHeight()) {
if (!layout.isRtlCharAt(selectionEnd)) {
canvas.save();
canvas.translate(x, y);
@@ -1093,7 +1095,7 @@ public abstract class TextSelectionHelper top && y + yOffset < parentView.getMeasuredHeight()) {
+ if (y + yOffset > top + keyboardSize && y + yOffset < parentView.getMeasuredHeight()) {
if (!layout.isRtlCharAt(selectionStart)) {
canvas.save();
canvas.translate(x - handleViewSize, y);
@@ -2658,4 +2660,9 @@ public abstract class TextSelectionHelper {
if (codeField != null) {
for (int a = codeField.length - 1; a >= 0; a--) {
@@ -1521,6 +1530,9 @@ public class ChangePhoneActivity extends BaseFragment {
}
}
}
+ if (hintDrawable != null) {
+ hintDrawable.start();
+ }
}, 100);
}
@@ -1555,6 +1567,18 @@ public class ChangePhoneActivity extends BaseFragment {
ArrayList arrayList = new ArrayList<>();
+ ThemeDescription.ThemeDescriptionDelegate descriptionDelegate = () -> {
+ for (int i = 0; i < views.length; i++) {
+ if (views[i] instanceof LoginActivity.LoginActivitySmsView) {
+ LoginActivity.LoginActivitySmsView smsView = (LoginActivity.LoginActivitySmsView) views[i];
+ if (smsView.hintDrawable != null) {
+ smsView.hintDrawable.setLayerColor("Bubble.**", Theme.getColor(Theme.key_chats_actionBackground));
+ smsView.hintDrawable.setLayerColor("Phone.**", Theme.getColor(Theme.key_chats_actionBackground));
+ }
+ }
+ }
+ };
+
arrayList.add(new ThemeDescription(fragmentView, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_windowBackgroundWhite));
arrayList.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_actionBarDefault));
@@ -1635,6 +1659,7 @@ public class ChangePhoneActivity extends BaseFragment {
arrayList.add(new ThemeDescription(smsView4.progressView, 0, new Class[]{ProgressView.class}, new String[]{"paint"}, null, null, null, Theme.key_login_progressOuter));
arrayList.add(new ThemeDescription(smsView4.blackImageView, ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_windowBackgroundWhiteBlackText));
arrayList.add(new ThemeDescription(smsView4.blueImageView, ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_chats_actionBackground));
+ arrayList.add(new ThemeDescription(smsView4.blueImageView, 0, null, null, null, descriptionDelegate, Theme.key_chats_actionBackground));
return arrayList;
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChangeUsernameActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChangeUsernameActivity.java
index 4858c9211..c4559923c 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChangeUsernameActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChangeUsernameActivity.java
@@ -30,16 +30,16 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import org.telegram.messenger.AndroidUtilities;
+import org.telegram.messenger.ApplicationLoader;
+import org.telegram.messenger.FileLog;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.MessagesController;
import org.telegram.messenger.MessagesStorage;
import org.telegram.messenger.NotificationCenter;
-import org.telegram.messenger.ApplicationLoader;
-import org.telegram.messenger.FileLog;
import org.telegram.messenger.R;
+import org.telegram.messenger.UserConfig;
import org.telegram.tgnet.ConnectionsManager;
import org.telegram.tgnet.TLRPC;
-import org.telegram.messenger.UserConfig;
import org.telegram.ui.ActionBar.ActionBar;
import org.telegram.ui.ActionBar.ActionBarMenu;
import org.telegram.ui.ActionBar.AlertDialog;
@@ -182,8 +182,12 @@ public class ChangeUsernameActivity extends BaseFragment {
@Override
public void afterTextChanged(Editable editable) {
- if (firstNameField.length() > 0) {
- String url = "https://" + MessagesController.getInstance(currentAccount).linkPrefix + "/" + firstNameField.getText();
+ String name = firstNameField.getText().toString();
+ if (name.startsWith("@")) {
+ name = name.substring(1);
+ }
+ if (name.length() > 0) {
+ String url = "https://" + MessagesController.getInstance(currentAccount).linkPrefix + "/" + name;
String text = LocaleController.formatString("UsernameHelpLink", R.string.UsernameHelpLink, url);
int index = text.indexOf(url);
SpannableStringBuilder textSpan = new SpannableStringBuilder(text);
@@ -237,8 +241,11 @@ public class ChangeUsernameActivity extends BaseFragment {
}
}
- private boolean checkUserName(final String name, boolean alert) {
- if (name != null && name.length() > 0) {
+ private boolean checkUserName(String name, boolean alert) {
+ if (name != null && name.startsWith("@")) {
+ name = name.substring(1);
+ }
+ if (!TextUtils.isEmpty(name)) {
checkTextView.setVisibility(View.VISIBLE);
} else {
checkTextView.setVisibility(View.GONE);
@@ -323,14 +330,15 @@ public class ChangeUsernameActivity extends BaseFragment {
checkTextView.setTag(Theme.key_windowBackgroundWhiteGrayText8);
checkTextView.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteGrayText8));
lastCheckName = name;
+ final String nameFinal = name;
checkRunnable = () -> {
TLRPC.TL_account_checkUsername req = new TLRPC.TL_account_checkUsername();
- req.username = name;
+ req.username = nameFinal;
checkReqId = ConnectionsManager.getInstance(currentAccount).sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
checkReqId = 0;
- if (lastCheckName != null && lastCheckName.equals(name)) {
+ if (lastCheckName != null && lastCheckName.equals(nameFinal)) {
if (error == null && response instanceof TLRPC.TL_boolTrue) {
- checkTextView.setText(LocaleController.formatString("UsernameAvailable", R.string.UsernameAvailable, name));
+ checkTextView.setText(LocaleController.formatString("UsernameAvailable", R.string.UsernameAvailable, nameFinal));
checkTextView.setTag(Theme.key_windowBackgroundWhiteGreenText);
checkTextView.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteGreenText));
lastNameAvailable = true;
@@ -349,7 +357,11 @@ public class ChangeUsernameActivity extends BaseFragment {
}
private void saveName() {
- if (!checkUserName(firstNameField.getText().toString(), true)) {
+ String newName = firstNameField.getText().toString();
+ if (newName.startsWith("@")) {
+ newName = newName.substring(1);
+ }
+ if (!checkUserName(newName, true)) {
return;
}
TLRPC.User user = UserConfig.getInstance(currentAccount).getCurrentUser();
@@ -360,7 +372,6 @@ public class ChangeUsernameActivity extends BaseFragment {
if (currentName == null) {
currentName = "";
}
- String newName = firstNameField.getText().toString();
if (currentName.equals(newName)) {
finishFragment();
return;
@@ -374,7 +385,7 @@ public class ChangeUsernameActivity extends BaseFragment {
NotificationCenter.getInstance(currentAccount).postNotificationName(NotificationCenter.updateInterfaces, MessagesController.UPDATE_MASK_NAME);
final int reqId = ConnectionsManager.getInstance(currentAccount).sendRequest(req, (response, error) -> {
if (error == null) {
- final TLRPC.User user1 = (TLRPC.User)response;
+ final TLRPC.User user1 = (TLRPC.User) response;
AndroidUtilities.runOnUIThread(() -> {
try {
progressDialog.dismiss();
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChannelAdminLogActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChannelAdminLogActivity.java
index 60e727e9d..6d9ddc5b1 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChannelAdminLogActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChannelAdminLogActivity.java
@@ -94,7 +94,9 @@ import org.telegram.ui.Cells.ChatUnreadCell;
import org.telegram.ui.Components.AdminLogFilterAlert;
import org.telegram.ui.Components.AlertsCreator;
import org.telegram.ui.Components.ChatAvatarContainer;
+import org.telegram.ui.Components.ClearHistoryAlert;
import org.telegram.ui.Components.EmbedBottomSheet;
+import org.telegram.ui.Components.InviteLinkBottomSheet;
import org.telegram.ui.Components.LayoutHelper;
import org.telegram.ui.Components.PhonebookShareAlert;
import org.telegram.ui.Components.PipRoundVideoView;
@@ -107,6 +109,7 @@ import org.telegram.ui.Components.URLSpanMono;
import org.telegram.ui.Components.URLSpanNoUnderline;
import org.telegram.ui.Components.URLSpanReplacement;
import org.telegram.ui.Components.URLSpanUserMention;
+import org.telegram.ui.Components.UndoView;
import java.io.BufferedWriter;
import java.io.File;
@@ -130,6 +133,7 @@ public class ChannelAdminLogActivity extends BaseFragment implements Notificatio
private View progressView2;
private RadialProgressView progressBar;
private RecyclerListView chatListView;
+ private UndoView undoView;
private LinearLayoutManager chatLayoutManager;
private ChatActivityAdapter chatAdapter;
private TextView bottomOverlayChatText;
@@ -992,6 +996,10 @@ public class ChannelAdminLogActivity extends BaseFragment implements Notificatio
chatListView.setEmptyView(emptyViewContainer);
}
+ undoView = new UndoView(context);
+ undoView.setAdditionalTranslationY(AndroidUtilities.dp(51));
+ contentView.addView(undoView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.BOTTOM | Gravity.LEFT, 8, 0, 8, 8));
+
updateEmptyPlaceholder();
return fragmentView;
@@ -1032,6 +1040,21 @@ public class ChannelAdminLogActivity extends BaseFragment implements Notificatio
showDialog(new StickersAlert(getParentActivity(), ChannelAdminLogActivity.this, stickerSet, null, null));
return;
}
+ } else if (selectedObject.currentEvent != null && selectedObject.currentEvent.action instanceof TLRPC.TL_channelAdminLogEventActionChangeHistoryTTL) {
+ if (ChatObject.canUserDoAdminAction(currentChat, ChatObject.ACTION_DELETE_MESSAGES)) {
+ ClearHistoryAlert alert = new ClearHistoryAlert(getParentActivity(), null, currentChat, false);
+ alert.setDelegate(new ClearHistoryAlert.ClearHistoryAlertDelegate() {
+ @Override
+ public void onAutoDeleteHistory(int ttl, int action) {
+ getMessagesController().setDialogHistoryTTL(-currentChat.id, ttl);
+ TLRPC.ChatFull chatInfo = getMessagesController().getChatFull(currentChat.id);
+ if (chatInfo != null) {
+ undoView.showWithAction(-currentChat.id, action, null, chatInfo.ttl_period, null, null);
+ }
+ }
+ });
+ showDialog(alert);
+ }
}
} else if (type == 3) {
if (selectedObject.messageOwner.media instanceof TLRPC.TL_messageMediaWebPage && MessageObject.isNewGifDocument(selectedObject.messageOwner.media.webpage.document)) {
@@ -1752,6 +1775,9 @@ public class ChannelAdminLogActivity extends BaseFragment implements Notificatio
if (contentView != null) {
contentView.onPause();
}
+ if (undoView != null) {
+ undoView.hide(true, 0);
+ }
paused = true;
wasPaused = true;
if (AvatarPreviewer.hasVisibleInstance()) {
@@ -1759,6 +1785,13 @@ public class ChannelAdminLogActivity extends BaseFragment implements Notificatio
}
}
+ @Override
+ protected void onBecomeFullyHidden() {
+ if (undoView != null) {
+ undoView.hide(true, 0);
+ }
+ }
+
public void openVCard(TLRPC.User user, String vcard, String first_name, String last_name) {
try {
File f = AndroidUtilities.getSharingDirectory();
@@ -2230,6 +2263,12 @@ public class ChannelAdminLogActivity extends BaseFragment implements Notificatio
}
}
+ public void needOpenInviteLink(TLRPC.TL_chatInviteExported invite) {
+ TLRPC.ChatFull chatInfo = getMessagesController().getChatFull(currentChat.id);
+ InviteLinkBottomSheet inviteLinkBottomSheet = new InviteLinkBottomSheet(contentView.getContext(), invite, chatInfo, null, ChannelAdminLogActivity.this, chatInfo.id, false, ChatObject.isChannel(currentChat));
+ inviteLinkBottomSheet.show();
+ }
+
@Override
public void didPressReplyMessage(ChatActionCell cell, int id) {
@@ -2650,6 +2689,14 @@ public class ChannelAdminLogActivity extends BaseFragment implements Notificatio
themeDescriptions.add(new ThemeDescription(avatarContainer != null ? avatarContainer.getTimeItem() : null, 0, null, null, null, null, Theme.key_chat_secretTimerBackground));
themeDescriptions.add(new ThemeDescription(avatarContainer != null ? avatarContainer.getTimeItem() : null, 0, null, null, null, null, Theme.key_chat_secretTimerText));
+ themeDescriptions.add(new ThemeDescription(undoView, ThemeDescription.FLAG_BACKGROUNDFILTER, null, null, null, null, Theme.key_undo_background));
+ themeDescriptions.add(new ThemeDescription(undoView, 0, new Class[]{UndoView.class}, new String[]{"undoImageView"}, null, null, null, Theme.key_undo_cancelColor));
+ themeDescriptions.add(new ThemeDescription(undoView, 0, new Class[]{UndoView.class}, new String[]{"undoTextView"}, null, null, null, Theme.key_undo_cancelColor));
+ themeDescriptions.add(new ThemeDescription(undoView, 0, new Class[]{UndoView.class}, new String[]{"infoTextView"}, null, null, null, Theme.key_undo_infoColor));
+ themeDescriptions.add(new ThemeDescription(undoView, 0, new Class[]{UndoView.class}, new String[]{"textPaint"}, null, null, null, Theme.key_undo_infoColor));
+ themeDescriptions.add(new ThemeDescription(undoView, 0, new Class[]{UndoView.class}, new String[]{"progressPaint"}, null, null, null, Theme.key_undo_infoColor));
+ themeDescriptions.add(new ThemeDescription(undoView, ThemeDescription.FLAG_IMAGECOLOR, new Class[]{UndoView.class}, new String[]{"leftImageView"}, null, null, null, Theme.key_undo_infoColor));
+
return themeDescriptions;
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChannelCreateActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChannelCreateActivity.java
index f92603a8c..8e19753ad 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChannelCreateActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChannelCreateActivity.java
@@ -17,8 +17,6 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Canvas;
import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
import android.os.Bundle;
import android.text.Editable;
import android.text.InputFilter;
@@ -62,7 +60,6 @@ import org.telegram.ui.Cells.TextInfoPrivacyCell;
import org.telegram.ui.Components.AvatarDrawable;
import org.telegram.ui.Components.BackupImageView;
import org.telegram.ui.Components.EditTextBoldCursor;
-import org.telegram.ui.Components.BulletinFactory;
import org.telegram.ui.Components.EditTextEmoji;
import org.telegram.ui.Components.ImageUpdater;
import org.telegram.ui.Components.LayoutHelper;
@@ -718,8 +715,9 @@ public class ChannelCreateActivity extends BaseFragment implements NotificationC
privateContainer.setOrientation(LinearLayout.VERTICAL);
linkContainer.addView(privateContainer, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
- permanentLinkView = new LinkActionView(context, this, null, chatId, true);
- permanentLinkView.showOptions(false);
+ permanentLinkView = new LinkActionView(context, this, null, chatId, true, ChatObject.isChannel(getMessagesController().getChat(chatId)));
+ //permanentLinkView.showOptions(false);
+ permanentLinkView.showRevokeOption(true);
permanentLinkView.setUsers(0, null);
privateContainer.addView(permanentLinkView);
@@ -755,19 +753,15 @@ public class ChannelCreateActivity extends BaseFragment implements NotificationC
if (loadingInvite || invite != null) {
return;
}
+ TLRPC.ChatFull chatFull = getMessagesController().getChatFull(chatId);
+ if (chatFull != null) {
+ invite = chatFull.exported_invite;
+ }
+ if (invite != null) {
+ return;
+ }
loadingInvite = true;
- TLRPC.TL_messages_exportChatInvite req = new TLRPC.TL_messages_exportChatInvite();
- req.peer = getMessagesController().getInputPeer(-chatId);
- final int reqId = getConnectionsManager().sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
- if (error == null) {
- invite = (TLRPC.TL_chatInviteExported) response;
- }
- loadingInvite = false;
- permanentLinkView.setLink(invite != null ? invite.link : null);
- }));
- getConnectionsManager().bindRequestToGuid(reqId, classGuid);
-
- /*TLRPC.TL_messages_getExportedChatInvites req = new TLRPC.TL_messages_getExportedChatInvites(); TODO layer 124
+ TLRPC.TL_messages_getExportedChatInvites req = new TLRPC.TL_messages_getExportedChatInvites();
req.peer = getMessagesController().getInputPeer(-chatId);
req.admin_id = getMessagesController().getInputUser(getUserConfig().getCurrentUser());
req.limit = 1;
@@ -779,7 +773,7 @@ public class ChannelCreateActivity extends BaseFragment implements NotificationC
}
loadingInvite = false;
permanentLinkView.setLink(invite != null ? invite.link : null);
- }));*/
+ }));
}
private void updatePrivatePublic() {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
index 38d03e23e..0cc63f9a5 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -183,6 +183,7 @@ import org.telegram.ui.Components.ChatAvatarContainer;
import org.telegram.ui.Components.ChatBigEmptyView;
import org.telegram.ui.Components.ChatGreetingsView;
import org.telegram.ui.Components.ChecksHintView;
+import org.telegram.ui.Components.ClearHistoryAlert;
import org.telegram.ui.Components.ClippingImageView;
import org.telegram.ui.Components.CombinedDrawable;
import org.telegram.ui.Components.CorrectlyMeasuringTextView;
@@ -195,6 +196,7 @@ import org.telegram.ui.Components.EmojiView;
import org.telegram.ui.Components.ExtendedGridLayoutManager;
import org.telegram.ui.Components.FireworksOverlay;
import org.telegram.ui.Components.FragmentContextView;
+import org.telegram.ui.Components.GigagroupConvertAlert;
import org.telegram.ui.Components.HintView;
import org.telegram.ui.Components.ImportingAlert;
import org.telegram.ui.Components.InstantCameraView;
@@ -210,6 +212,8 @@ import org.telegram.ui.Components.RLottieDrawable;
import org.telegram.ui.Components.RadialProgressView;
import org.telegram.ui.Components.RecyclerAnimationScrollHelper;
import org.telegram.ui.Components.RecyclerListView;
+import org.telegram.ui.Components.ReportAlert;
+import org.telegram.ui.Components.SearchCounterView;
import org.telegram.ui.Components.ShareAlert;
import org.telegram.ui.Components.Size;
import org.telegram.ui.Components.SizeNotifierFrameLayout;
@@ -293,6 +297,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private GridLayoutManagerFixed chatLayoutManager;
public ChatActivityAdapter chatAdapter;
private UnreadCounterTextView bottomOverlayChatText;
+ private ImageView bottomOverlayImage;
private RadialProgressView bottomOverlayProgress;
private AnimatorSet bottomOverlayAnimation;
private FrameLayout bottomOverlayChat;
@@ -350,6 +355,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private boolean searchAsListHintShown;
private HintView slowModeHint;
private HintView pollHintView;
+ private HintView timerHintView;
private ChatMessageCell pollHintCell;
private int pollHintX;
private int pollHintY;
@@ -386,7 +392,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private ImageView searchUserButton;
private ImageView searchUpButton;
private ImageView searchDownButton;
- private SimpleTextView searchCountText;
+ private SearchCounterView searchCountText;
private ChatActionCell floatingDateView;
private ChatActionCell infoTopView;
private int hideDateDelay = 500;
@@ -421,6 +427,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private int chatMode;
private int scheduledMessagesCount = -1;
+ private int reportType = -1;
+
private MessageObject threadMessageObject;
private boolean threadMessageVisible = true;
private ArrayList threadMessageObjects;
@@ -639,6 +647,24 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private AnimatorSet scrimAnimatorSet;
private ActionBarPopupWindow scrimPopupWindow;
private ActionBarMenuSubItem[] scrimPopupWindowItems;
+ private ActionBarMenuSubItem menuDeleteItem;
+ private Runnable updateDeleteItemRunnable = new Runnable() {
+ @Override
+ public void run() {
+ if (selectedObject == null || menuDeleteItem == null) {
+ return;
+ }
+ int remaining = Math.max(0, selectedObject.messageOwner.ttl_period - (getConnectionsManager().getCurrentTime() - selectedObject.messageOwner.date));
+ String ramainingStr;
+ if (remaining < 24 * 60 * 60) {
+ ramainingStr = AndroidUtilities.formatDuration(remaining, false);
+ } else {
+ ramainingStr = LocaleController.formatPluralString("Days", Math.round(remaining / (24 * 60 * 60.0f)));
+ }
+ menuDeleteItem.setSubtext(LocaleController.formatString("AutoDeleteIn", R.string.AutoDeleteIn, ramainingStr));
+ AndroidUtilities.runOnUIThread(updateDeleteItemRunnable, 1000);
+ }
+ };
private ChatActivityDelegate chatActivityDelegate;
private RecyclerAnimationScrollHelper chatScrollHelper;
@@ -684,6 +710,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private TLRPC.Document preloadedGreetingsSticker;
private boolean forceHistoryEmpty;
private float bottomPanelTranslationY;
+ private float bottomPanelTranslationYReverse;
private boolean invalidateChatListViewTopPadding;
private long activityResumeTime;
@@ -735,6 +762,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
};
private int chatEmojiViewPadding;
private int fixedKeyboardHeight = -1;
+ private Runnable cancelFixedPositionRunnable;
private boolean invalidateMessagesVisiblePart;
private boolean scrollByTouch;
@@ -747,13 +775,21 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
private interface ChatActivityDelegate {
- void openReplyMessage(int mid);
+ default void openReplyMessage(int mid) {
- void openSearch(String text);
+ }
+
+ default void openSearch(String text) {
+
+ }
default void onUnpin(boolean all, boolean hide) {
}
+
+ default void onReport() {
+
+ }
}
private class UnreadCounterTextView extends View {
@@ -1045,6 +1081,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
private final static int edit = 23;
private final static int add_shortcut = 24;
private final static int save_to = 25;
+ private final static int auto_delete_timer = 26;
private final static int translate = 101;
private final static int show_pinned = 102;
@@ -1088,7 +1125,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
return false;
}
wasManualScroll = true;
- if (!actionBar.isActionModeShowed()) {
+ if (!actionBar.isActionModeShowed() && reportType < 0) {
createMenu(view, false, true, x, y);
} else {
boolean outside = false;
@@ -1115,7 +1152,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override
public void onItemClick(View view, int position, float x, float y) {
wasManualScroll = true;
- if (actionBar.isActionModeShowed()) {
+ if (actionBar.isActionModeShowed() || reportType >= 0) {
boolean outside = false;
if (view instanceof ChatMessageCell) {
if (textSelectionHelper.isSelected(((ChatMessageCell) view).getMessageObject())) {
@@ -1165,6 +1202,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
inlineReturn = arguments.getLong("inline_return", 0);
String inlineQuery = arguments.getString("inline_query");
startLoadFromMessageId = arguments.getInt("message_id", 0);
+ reportType = arguments.getInt("report", -1);
boolean historyPreloaded = arguments.getBoolean("historyPreloaded", false);
if (highlightMessageId != 0 && highlightMessageId != Integer.MAX_VALUE) {
startLoadFromMessageId = highlightMessageId;
@@ -1537,7 +1575,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
undoView.hide(true, 0);
}
if (pinBulletin != null) {
- pinBulletin.hide(false);
+ pinBulletin.hide(false, 0);
}
if (topUndoView != null) {
topUndoView.hide(true, 0);
@@ -1728,6 +1766,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
public View createView(Context context) {
textSelectionHelper = new TextSelectionHelper.ChatListTextSelectionHelper();
+ if (reportType >= 0) {
+ actionBar.setBackgroundColor(Theme.getColor(Theme.key_actionBarActionModeDefault));
+ actionBar.setItemsColor(Theme.getColor(Theme.key_actionBarActionModeDefaultIcon), false);
+ actionBar.setItemsBackgroundColor(Theme.getColor(Theme.key_actionBarActionModeDefaultSelector), false);
+ actionBar.setTitleColor(Theme.getColor(Theme.key_actionBarActionModeDefaultIcon));
+ actionBar.setSubtitleColor(Theme.getColor(Theme.key_actionBarActionModeDefaultIcon));
+ }
+
if (chatMessageCellsCache.isEmpty()) {
for (int a = 0; a < 15; a++) {
chatMessageCellsCache.add(new ChatMessageCell(context));
@@ -1751,6 +1797,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
emojiButtonRed = null;
gifHintTextView = null;
pollHintView = null;
+ timerHintView = null;
videoPlayerContainer = null;
voiceHintTextView = null;
blurredView = null;
@@ -1787,7 +1834,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (inPreviewMode) {
actionBar.setBackButtonDrawable(null);
} else {
- actionBar.setBackButtonDrawable(new BackDrawable(false));
+ actionBar.setBackButtonDrawable(new BackDrawable(reportType >= 0));
}
actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
@Override
@@ -1839,6 +1886,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
if (str.length() != 0) {
AndroidUtilities.addToClipboard(str);
+ undoView.showWithAction(0, UndoView.ACTION_TEXT_COPIED, null);
}
clearSelectionMode();
} else if (id == translate) {
@@ -1957,10 +2005,29 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (button != null) {
button.setTextColor(Theme.getColor(Theme.key_dialogTextRed2));
}
- } else if (id == clear_history || id == delete_chat) {
+ } else if (id == clear_history || id == delete_chat || id == auto_delete_timer) {
if (getParentActivity() == null) {
return;
}
+ if (id == auto_delete_timer || id == clear_history && currentEncryptedChat == null && (currentUser != null && !UserObject.isUserSelf(currentUser) && !UserObject.isDeleted(currentUser) || ChatObject.canUserDoAdminAction(currentChat, ChatObject.ACTION_DELETE_MESSAGES) && (!ChatObject.isChannel(currentChat) || currentChat.megagroup && TextUtils.isEmpty(currentChat.username)))) {
+ ClearHistoryAlert alert = new ClearHistoryAlert(getParentActivity(), currentUser, currentChat, id != auto_delete_timer);
+ alert.setDelegate(new ClearHistoryAlert.ClearHistoryAlertDelegate() {
+ @Override
+ public void onClearHistory(boolean revoke) {
+ performHistoryClear(revoke);
+ }
+
+ @Override
+ public void onAutoDeleteHistory(int ttl, int action) {
+ getMessagesController().setDialogHistoryTTL(dialog_id, ttl);
+ if (userInfo != null || chatInfo != null) {
+ undoView.showWithAction(dialog_id, action, currentUser, userInfo != null ? userInfo.ttl_period : chatInfo.ttl_period, null, null);
+ }
+ }
+ });
+ showDialog(alert);
+ return;
+ }
final boolean isChat = (int) dialog_id < 0 && (int) (dialog_id >> 32) != 1;
AlertsCreator.createClearOrDeleteDialogAlert(ChatActivity.this, id == clear_history, currentChat, currentUser, currentEncryptedChat != null, true, (param) -> {
@@ -1973,27 +2040,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
finishFragment();
getNotificationCenter().postNotificationName(NotificationCenter.needDeleteDialog, dialog_id, currentUser, currentChat, param);
} else {
- clearingHistory = true;
- undoView.showWithAction(dialog_id, UndoView.ACTION_CLEAR, () -> {
- if (!pinnedMessageIds.isEmpty()) {
- SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount);
- preferences.edit().putInt("pin_" + dialog_id, pinnedMessageIds.get(0)).commit();
- pinnedMessageIds.clear();
- pinnedMessageObjects.clear();
- currentPinnedMessageId = 0;
- loadedPinnedMessagesCount = 0;
- totalPinnedMessagesCount = 0;
- updatePinnedMessageView(true);
- }
- getMessagesController().deleteDialog(dialog_id, 1, param);
- clearingHistory = false;
- clearHistory(false);
- chatAdapter.notifyDataSetChanged();
- }, () -> {
- clearingHistory = false;
- chatAdapter.notifyDataSetChanged();
- });
- chatAdapter.notifyDataSetChanged();
+ performHistoryClear(param);
}
}
});
@@ -2143,11 +2190,24 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (inPreviewMode || inBubbleMode) {
avatarContainer.setOccupyStatusBar(false);
}
- actionBar.addView(avatarContainer, 0, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.MATCH_PARENT, Gravity.TOP | Gravity.LEFT, !inPreviewMode ? 56 : (chatMode == MODE_PINNED ? 10 : 0), 0, 40, 0));
+ if (reportType >= 0) {
+ if (reportType == 0) {
+ actionBar.setTitle(LocaleController.getString("ReportChatSpam", R.string.ReportChatSpam));
+ } else if (reportType == 2) {
+ actionBar.setTitle(LocaleController.getString("ReportChatViolence", R.string.ReportChatViolence));
+ } else if (reportType == 3) {
+ actionBar.setTitle(LocaleController.getString("ReportChatChild", R.string.ReportChatChild));
+ } else if (reportType == 4) {
+ actionBar.setTitle(LocaleController.getString("ReportChatPornography", R.string.ReportChatPornography));
+ }
+ actionBar.setSubtitle(LocaleController.getString("ReportSelectMessages", R.string.ReportSelectMessages));
+ } else {
+ actionBar.addView(avatarContainer, 0, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.MATCH_PARENT, Gravity.TOP | Gravity.LEFT, !inPreviewMode ? 56 : (chatMode == MODE_PINNED ? 10 : 0), 0, 40, 0));
+ }
ActionBarMenu menu = actionBar.createMenu();
- if (currentEncryptedChat == null && chatMode == 0) {
+ if (currentEncryptedChat == null && chatMode == 0 && reportType < 0) {
searchItem = menu.addItem(0, R.drawable.ic_ab_search).setIsSearchField(true).setActionBarMenuItemSearchListener(new ActionBarMenuItem.ActionBarMenuItemSearchListener() {
boolean searchWas;
@@ -2168,7 +2228,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
searchUserButton.setVisibility(View.VISIBLE);
}
if (searchingForUser) {
- mentionsAdapter.searchUsernameOrHashtag(null, 0, null, false);
+ mentionsAdapter.searchUsernameOrHashtag(null, 0, null, false, true);
searchingForUser = false;
}
mentionLayoutManager.setReverseLayout(false);
@@ -2231,11 +2291,13 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (!openSearchKeyboard) {
return;
}
+ saveKeyboardPositionBeforeTransition();
AndroidUtilities.requestAdjustResize(getParentActivity(), classGuid);
AndroidUtilities.runOnUIThread(() -> {
searchWas = false;
searchItem.getSearchField().requestFocus();
AndroidUtilities.showKeyboard(searchItem.getSearchField());
+ removeKeyboardPositionBeforeTransition();
}, 300);
}
@@ -2250,7 +2312,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
public void onTextChanged(EditText editText) {
showMessagesSearchListView(false);
if (searchingForUser) {
- mentionsAdapter.searchUsernameOrHashtag("@" + editText.getText().toString(), 0, messages, true);
+ mentionsAdapter.searchUsernameOrHashtag("@" + editText.getText().toString(), 0, messages, true, true);
} else if (searchingUserMessages == null && searchingChatMessages == null && searchUserButton != null && TextUtils.equals(editText.getText(), LocaleController.getString("SearchFrom", R.string.SearchFrom))) {
searchUserButton.callOnClick();
}
@@ -2262,7 +2324,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
searchUserButton.callOnClick();
} else {
if (searchingForUser) {
- mentionsAdapter.searchUsernameOrHashtag(null, 0, null, false);
+ mentionsAdapter.searchUsernameOrHashtag(null, 0, null, false, true);
searchingForUser = false;
searchItem.setSearchFieldText("", true);
}
@@ -2286,7 +2348,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
searchItemVisible = false;
}
- if (chatMode == 0 && threadMessageId == 0 && !UserObject.isReplyUser(currentUser)) {
+ if (chatMode == 0 && threadMessageId == 0 && !UserObject.isReplyUser(currentUser) && reportType < 0) {
headerItem = menu.addItem(0, R.drawable.ic_ab_other);
headerItem.setContentDescription(LocaleController.getString("AccDescrMoreOptions", R.string.AccDescrMoreOptions));
if (currentUser != null) {
@@ -2356,7 +2418,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (allowShowPinned) {
headerItem.addSubItem(show_pinned, R.drawable.deproko_baseline_pin_24, LocaleController.getString("PinnedMessage", R.string.PinnedMessage));
}
- if (currentChat != null && !currentChat.creator) {
+ if (currentChat != null && !currentChat.creator && !ChatObject.hasAdminRights(currentChat)) {
headerItem.addSubItem(report, R.drawable.baseline_report_24, LocaleController.getString("ReportChat", R.string.ReportChat));
}
@@ -2381,6 +2443,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
if (!ChatObject.isChannel(currentChat) || currentChat.megagroup && TextUtils.isEmpty(currentChat.username)) {
headerItem.addSubItem(clear_history, R.drawable.baseline_delete_sweep_24, LocaleController.getString("ClearHistory", R.string.ClearHistory));
+ } else if (ChatObject.canUserDoAdminAction(currentChat, ChatObject.ACTION_DELETE_MESSAGES)) {
+ headerItem.addSubItem(auto_delete_timer, R.drawable.msg_timer, LocaleController.getString("AutoDeleteSetTimer", R.string.AutoDeleteSetTimer));
}
if (currentUser == null || !currentUser.self) {
muteItem = headerItem.addSubItem(mute, R.drawable.baseline_volume_off_24_white, null);
@@ -2424,7 +2488,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
avatarContainer.updateSubtitle();
updateTitleIcons();
- if (chatMode == 0 && !isThreadChat()) {
+ if (chatMode == 0 && !isThreadChat() && reportType < 0) {
attachItem = menu.addItem(chat_menu_attach, R.drawable.ic_ab_other).setOverrideMenuClick(true).setAllowCloseAnimation(false);
attachItem.setContentDescription(LocaleController.getString("AccDescrAttachButton", R.string.AccDescrAttachButton));
attachItem.setVisibility(View.GONE);
@@ -2483,7 +2547,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
actionModeOtherItem.setSubItemVisibility(star, selectedMessagesCanStarIds[0].size() + selectedMessagesCanStarIds[1].size() != 0);
- checkActionBarMenu();
+ checkActionBarMenu(false);
scrimPaint = new Paint() {
@Override
@@ -2510,7 +2574,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
AdjustPanLayoutHelper adjustPanLayoutHelper = new AdjustPanLayoutHelper(this) {
@Override
- protected void onTransitionStart(boolean keyboardVisible) {
+ protected void onTransitionStart(boolean keyboardVisible, int contentHeight) {
wasManualScroll = true;
if (chatActivityEnterView != null) {
chatActivityEnterView.onAdjustPanTransitionStart(keyboardVisible);
@@ -3049,6 +3113,16 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
mentionListViewIgnoreLayout = false;
child.measure(MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(layoutParams.height, MeasureSpec.EXACTLY));
}
+ } else if (child == textSelectionHelper.getOverlayView(context)) {
+ int contentWidthSpec = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.EXACTLY);
+ int h = heightSize;
+ if (keyboardSize > AndroidUtilities.dp(20) && getLayoutParams().height < 0) {
+ h += keyboardSize;
+ textSelectionHelper.setKeyboardSize(keyboardSize);
+ } else {
+ textSelectionHelper.setKeyboardSize(0);
+ }
+ child.measure(contentWidthSpec, MeasureSpec.makeMeasureSpec(h, MeasureSpec.EXACTLY));
} else {
measureChildWithMargins(child, widthMeasureSpec, 0, heightMeasureSpec, 0);
}
@@ -3414,7 +3488,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
return false;
}
boolean result = super.onInterceptTouchEvent(e);
- if (actionBar.isActionModeShowed()) {
+ if (actionBar.isActionModeShowed() || reportType >= 0) {
return result;
}
processTouchEvent(e);
@@ -3579,7 +3653,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
return false;
}
boolean result = super.onTouchEvent(e);
- if (actionBar.isActionModeShowed()) {
+ if (actionBar.isActionModeShowed() || reportType >= 0) {
return result;
}
processTouchEvent(e);
@@ -4782,7 +4856,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
- if (getAlpha() == 0 || actionBar.isActionModeShowed()) {
+ if (getAlpha() == 0 || actionBar.isActionModeShowed() || reportType >= 0) {
return false;
}
return super.onInterceptTouchEvent(ev);
@@ -4790,7 +4864,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override
public boolean onTouchEvent(MotionEvent event) {
- if (getAlpha() == 0 || actionBar.isActionModeShowed()) {
+ if (getAlpha() == 0 || actionBar.isActionModeShowed() || reportType >= 0) {
return false;
}
return super.onTouchEvent(event);
@@ -4817,7 +4891,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
floatingDateView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
contentView.addView(floatingDateView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 0, 4, 0, 0));
floatingDateView.setOnClickListener(view -> {
- if (floatingDateView.getAlpha() == 0 || actionBar.isActionModeShowed()) {
+ if (floatingDateView.getAlpha() == 0 || actionBar.isActionModeShowed() || reportType >= 0) {
return;
}
Calendar calendar = Calendar.getInstance();
@@ -5437,7 +5511,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
int bottom = top + Theme.chat_composeShadowDrawable.getIntrinsicHeight();
Theme.chat_composeShadowDrawable.setBounds(0, top, getMeasuredWidth(), bottom);
Theme.chat_composeShadowDrawable.draw(canvas);
- canvas.drawRect(0, bottom, getMeasuredWidth(), getMeasuredHeight(), Theme.chat_composeBackgroundPaint);
+ canvas.drawRect(0, bottom, getMeasuredWidth(), bottomPanelTranslationYReverse + getMeasuredHeight(), Theme.chat_composeBackgroundPaint);
}
}
@@ -5664,7 +5738,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} else {
mentionListView.setLayoutManager(mentionLayoutManager);
}
- if (show && bottomOverlay.getVisibility() == View.VISIBLE) {
+ if (show && bottomOverlay.getVisibility() == View.VISIBLE && !searchingForUser) {
show = false;
}
if (show) {
@@ -6120,7 +6194,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override
public void checkAnimation() {
- if (actionBar.isActionModeShowed()) {
+ if (actionBar.isActionModeShowed() || reportType >= 0) {
if (messageEditTextAnimator != null) {
messageEditTextAnimator.cancel();
}
@@ -6324,7 +6398,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
stickersAdapter.loadStikersForEmoji(text, currentChat != null && !ChatObject.canSendStickers(currentChat) || chatActivityEnterView.isEditingMessage());
}
if (mentionsAdapter != null) {
- mentionsAdapter.searchUsernameOrHashtag(text.toString(), chatActivityEnterView.getCursorPosition(), messages, false);
+ mentionsAdapter.searchUsernameOrHashtag(text.toString(), chatActivityEnterView.getCursorPosition(), messages, false, false);
}
if (waitingForCharaterEnterRunnable != null) {
AndroidUtilities.cancelRunOnUIThread(waitingForCharaterEnterRunnable);
@@ -6548,6 +6622,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
wasManualScroll = true;
}
bottomPanelTranslationY = chatActivityEnterView.pannelAniamationInProgress() ? chatActivityEnterView.getEmojiPadding() - translation : 0;
+ bottomPanelTranslationYReverse = chatActivityEnterView.pannelAniamationInProgress() ? translation : 0;
chatActivityEnterView.setTranslationY(translation);
translation += chatActivityEnterView.getTopViewTranslation();
@@ -6984,10 +7059,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
});
searchCalendarButton.setContentDescription(LocaleController.getString("JumpToDate", R.string.JumpToDate));
- searchCountText = new SimpleTextView(context);
- searchCountText.setTextColor(Theme.getColor(Theme.key_chat_searchPanelText));
- searchCountText.setTextSize(15);
- searchCountText.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
+ searchCountText = new SearchCounterView(context);
+// searchCountText.setTextColor(Theme.getColor(Theme.key_chat_searchPanelText));
+// searchCountText.setTextSize(15);
+// searchCountText.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
searchCountText.setGravity(Gravity.LEFT);
searchContainer.addView(searchCountText, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_VERTICAL, 0, 0, 108, 0));
@@ -7046,7 +7121,21 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (getParentActivity() == null) {
return;
}
- if (chatMode == MODE_PINNED) {
+ if (reportType >= 0) {
+ showDialog(new ReportAlert(getParentActivity(), reportType) {
+ @Override
+ protected void onSend(int type, String message) {
+ ArrayList ids = new ArrayList<>();
+ for (int b = 0; b < selectedMessagesIds[0].size(); b++) {
+ ids.add(selectedMessagesIds[0].keyAt(b));
+ }
+ TLRPC.InputPeer peer = currentUser != null ? MessagesController.getInputPeer(currentUser) : MessagesController.getInputPeer(currentChat);
+ AlertsCreator.sendReport(peer, reportType, message, ids);
+ finishFragment();
+ chatActivityDelegate.onReport();
+ }
+ });
+ } else if (chatMode == MODE_PINNED) {
finishFragment();
chatActivityDelegate.onUnpin(true, bottomOverlayChatText.getTag() == null);
} else if (currentUser != null && userBlocked) {
@@ -7116,6 +7205,18 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
bottomOverlayProgress.setAlpha(1.0f);
bottomOverlayChat.addView(bottomOverlayProgress, LayoutHelper.createFrame(30, 30, Gravity.CENTER));
+ bottomOverlayImage = new ImageView(context);
+ int color = Theme.getColor(Theme.key_chat_fieldOverlayText);
+ bottomOverlayImage.setImageResource(R.drawable.log_info);
+ bottomOverlayImage.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY));
+ bottomOverlayImage.setScaleType(ImageView.ScaleType.CENTER);
+ if (Build.VERSION.SDK_INT >= 21) {
+ bottomOverlayImage.setBackgroundDrawable(Theme.createSelectorDrawable(Color.argb(24, Color.red(color), Color.green(color), Color.blue(color)), 1));
+ }
+ bottomOverlayChat.addView(bottomOverlayImage, LayoutHelper.createFrame(48, 48, Gravity.RIGHT | Gravity.TOP, 3, 1.5f, 0, 0));
+ bottomOverlayImage.setContentDescription(LocaleController.getString("SettingsHelp", R.string.SettingsHelp));
+ bottomOverlayImage.setOnClickListener(v -> undoView.showWithAction(dialog_id, UndoView.ACTION_TEXT_INFO, LocaleController.getString("BroadcastGroupInfo", R.string.BroadcastGroupInfo)));
+
replyButton = new TextView(context);
replyButton.setText(LocaleController.getString("Reply", R.string.Reply));
replyButton.setGravity(Gravity.CENTER_VERTICAL);
@@ -7233,6 +7334,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (actionBar != null && actionBar.isActionModeShowed()) {
clearSelectionMode();
}
+ undoView.showWithAction(0, UndoView.ACTION_TEXT_COPIED, null);
}
});
@@ -7297,7 +7399,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
Spannable spannable = new SpannableString(from + " " + name);
spannable.setSpan(new ForegroundColorSpan(Theme.getColor(Theme.key_actionBarDefaultSubtitle)), from.length() + 1, spannable.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
searchItem.setSearchFieldCaption(spannable);
- mentionsAdapter.searchUsernameOrHashtag(null, 0, null, false);
+ mentionsAdapter.searchUsernameOrHashtag(null, 0, null, false, true);
searchItem.setSearchFieldHint(null);
searchItem.clearSearchText();
getMediaDataController().searchMessagesInChat("", dialog_id, mergeDialogId, classGuid, 0, threadMessageId, searchingUserMessages, searchingChatMessages);
@@ -7715,12 +7817,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (topChatPanelView != null) {
topChatPanelView.setTranslationY(contentPanTranslation + contentPaddingTop + topChatPanelViewOffset);
}
- if (mentionListView != null && mentionLayoutManager != null) {
+ if (mentionListView != null && mentionLayoutManager != null && mentionsAdapter != null && !mentionsAdapter.isBotCommands()) {
if (mentionLayoutManager.getReverseLayout()) {
mentionListView.setTranslationY(contentPanTranslation + contentPaddingTop);
} else {
mentionListView.setTranslationY(contentPanTranslation);
}
+ } else if (mentionListView != null) {
+ mentionListView.setTranslationY(bottomPanelTranslationYReverse);
}
if (alertView != null && alertView.getVisibility() == View.VISIBLE) {
@@ -8227,6 +8331,30 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
NotificationCenter.getInstance(currentAccount).doOnIdle(runnable);
}
+ public void performHistoryClear(boolean revoke) {
+ clearingHistory = true;
+ undoView.showWithAction(dialog_id, UndoView.ACTION_CLEAR, () -> {
+ if (!pinnedMessageIds.isEmpty()) {
+ SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount);
+ preferences.edit().putInt("pin_" + dialog_id, pinnedMessageIds.get(0)).commit();
+ pinnedMessageIds.clear();
+ pinnedMessageObjects.clear();
+ currentPinnedMessageId = 0;
+ loadedPinnedMessagesCount = 0;
+ totalPinnedMessagesCount = 0;
+ updatePinnedMessageView(true);
+ }
+ getMessagesController().deleteDialog(dialog_id, 1, revoke);
+ clearingHistory = false;
+ clearHistory(false);
+ chatAdapter.notifyDataSetChanged();
+ }, () -> {
+ clearingHistory = false;
+ chatAdapter.notifyDataSetChanged();
+ });
+ chatAdapter.notifyDataSetChanged();
+ }
+
public long getDialogId() {
return dialog_id;
}
@@ -8705,6 +8833,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (pollHintView != null) {
pollHintView.hide();
}
+ if (timerHintView != null) {
+ timerHintView.hide();
+ }
if (checksHintView != null) {
checksHintView.hide();
}
@@ -8720,6 +8851,31 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
}
+ public void showTimerHint() {
+ if (getParentActivity() == null || fragmentView == null || chatInfo == null) {
+ return;
+ }
+ if (timerHintView == null) {
+ timerHintView = new HintView(getParentActivity(), 7, true);
+ timerHintView.setAlpha(0.0f);
+ timerHintView.setVisibility(View.INVISIBLE);
+ timerHintView.setShowingDuration(4000);
+ contentView.addView(timerHintView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.LEFT | Gravity.TOP, 19, 0, 19, 0));
+ }
+ String time;
+ if (chatInfo.ttl_period > 24 * 60 * 60) {
+ time = LocaleController.formatPluralString("Days", chatInfo.ttl_period / (24 * 60 * 60));
+ } else if (chatInfo.ttl_period >= 60 * 60) {
+ time = LocaleController.formatPluralString("Hours", chatInfo.ttl_period / (60 * 60));
+ } else if (chatInfo.ttl_period >= 60) {
+ time = LocaleController.formatPluralString("Minutes", chatInfo.ttl_period / 60);
+ } else {
+ time = LocaleController.formatPluralString("Seconds", chatInfo.ttl_period);
+ }
+ timerHintView.setText(LocaleController.formatString("AutoDeleteSetInfo", R.string.AutoDeleteSetInfo, time));
+ timerHintView.showForView(avatarContainer.getTimeItem(), true);
+ }
+
private void showSearchAsListHint() {
if (getParentActivity() == null || fragmentView == null || searchCountText == null) {
return;
@@ -8886,7 +9042,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
continue;
}
if (checksHintView.showForMessageCell(messageCell, true)) {
- getMessagesController().removeSuggestion("NEWCOMER_TICKS");
+ getMessagesController().removeSuggestion(0, "NEWCOMER_TICKS");
break;
}
}
@@ -10442,9 +10598,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
int maxNegativeUnreadId = Integer.MAX_VALUE;
int maxUnreadDate = Integer.MIN_VALUE;
int recyclerChatViewHeight = (contentView.getHeightWithKeyboard() - (inPreviewMode ? 0 : AndroidUtilities.dp(48)) - chatListView.getTop());
- if (contentView.getKeyboardHeight() == 0) {
- recyclerChatViewHeight -= chatActivityEnterView.getEmojiPadding();
- }
pollsToCheck.clear();
float cilpTop = chatListViewPaddingTop;
for (int a = 0; a < count; a++) {
@@ -10469,7 +10622,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (viewBottom > height) {
viewBottom = viewTop + height;
}
- messageCell.setVisiblePart(viewTop, viewBottom - viewTop, recyclerChatViewHeight, contentView.getKeyboardHeight());
+ int keyboardOffset = contentView.getKeyboardHeight();
+ if (keyboardOffset < AndroidUtilities.dp(20) && chatActivityEnterView.isPopupShowing() || chatActivityEnterView.pannelAniamationInProgress()) {
+ keyboardOffset = chatActivityEnterView.getEmojiPadding();
+ }
+ messageCell.setVisiblePart(viewTop, viewBottom - viewTop, recyclerChatViewHeight, keyboardOffset);
if (!threadMessageVisible && threadMessageObject != null && messageObject == threadMessageObject && messageCell.getBottom() > chatListViewPaddingTop) {
threadMessageVisible = true;
@@ -11193,7 +11350,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
return;
}
boolean hideKeyboard = false;
- if (currentChat != null && !ChatObject.canSendMessages(currentChat) && (!ChatObject.isChannel(currentChat) || currentChat.megagroup)) {
+ if (currentChat != null && !ChatObject.canSendMessages(currentChat) && !currentChat.gigagroup && (!ChatObject.isChannel(currentChat) || currentChat.megagroup)) {
if (currentChat.default_banned_rights != null && currentChat.default_banned_rights.send_messages) {
bottomOverlayText.setText(LocaleController.getString("GlobalSendMessageRestricted", R.string.GlobalSendMessageRestricted));
} else if (AndroidUtilities.isBannedForever(currentChat.banned_rights)) {
@@ -11239,7 +11396,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
bottomOverlay.setVisibility(View.INVISIBLE);
}
checkRaiseSensors();
- checkActionBarMenu();
+ checkActionBarMenu(false);
}
if (inPreviewMode) {
bottomOverlay.setVisibility(View.INVISIBLE);
@@ -11310,26 +11467,32 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
}
- private void checkActionBarMenu() {
+ private void checkActionBarMenu(boolean animated) {
if (currentEncryptedChat != null && !(currentEncryptedChat instanceof TLRPC.TL_encryptedChat) ||
- currentChat != null && ChatObject.isNotInChat(currentChat) ||
- currentUser != null && UserObject.isDeleted(currentUser)) {
+ currentChat != null && (chatInfo == null || chatInfo.ttl_period == 0) ||
+ currentUser != null && (UserObject.isDeleted(currentUser) || currentEncryptedChat == null && (userInfo == null || userInfo.ttl_period == 0))) {
if (timeItem2 != null) {
timeItem2.setVisibility(View.GONE);
}
if (avatarContainer != null) {
- avatarContainer.hideTimeItem();
+ avatarContainer.hideTimeItem(animated);
}
} else {
if (timeItem2 != null) {
timeItem2.setVisibility(View.VISIBLE);
}
if (avatarContainer != null) {
- avatarContainer.showTimeItem();
+ avatarContainer.showTimeItem(animated);
}
}
- if (avatarContainer != null && currentEncryptedChat != null) {
- avatarContainer.setTime(currentEncryptedChat.ttl);
+ if (avatarContainer != null) {
+ if (currentEncryptedChat != null) {
+ avatarContainer.setTime(currentEncryptedChat.ttl);
+ } else if (userInfo != null) {
+ avatarContainer.setTime(userInfo.ttl_period);
+ } else if (chatInfo != null) {
+ avatarContainer.setTime(chatInfo.ttl_period);
+ }
}
checkAndUpdateAvatar();
}
@@ -11528,61 +11691,65 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
if (selectedMessagesIds[index].indexOfKey(messageObject.getId()) >= 0) {
selectedMessagesIds[index].remove(messageObject.getId());
- if (messageObject.type == 0 || messageObject.isAnimatedEmoji() || messageObject.caption != null) {
- selectedMessagesCanCopyIds[index].remove(messageObject.getId());
- }
- if (!messageObject.isAnimatedEmoji() && (messageObject.isSticker() || messageObject.isAnimatedSticker()) && MessageObject.isStickerHasSet(messageObject.getDocument())) {
- selectedMessagesCanStarIds[index].remove(messageObject.getId());
- }
- if (messageObject.canEditMessage(currentChat)) {
- canEditMessagesCount--;
- }
- if (!messageObject.canDeleteMessage(chatMode == MODE_SCHEDULED, currentChat)) {
- cantDeleteMessagesCount--;
- }
- if (chatMode == MODE_SCHEDULED || !messageObject.canForwardMessage()) {
- cantForwardMessagesCount--;
- } else {
- canForwardMessagesCount--;
- }
- if (messageObject.isMusic()) {
- canSaveMusicCount--;
- } else if (messageObject.isDocument()) {
- canSaveDocumentsCount--;
- } else {
- cantSaveMessagesCount--;
+ if (reportType < 0) {
+ if (messageObject.type == 0 || messageObject.isAnimatedEmoji() || messageObject.caption != null) {
+ selectedMessagesCanCopyIds[index].remove(messageObject.getId());
+ }
+ if (!messageObject.isAnimatedEmoji() && (messageObject.isSticker() || messageObject.isAnimatedSticker()) && MessageObject.isStickerHasSet(messageObject.getDocument())) {
+ selectedMessagesCanStarIds[index].remove(messageObject.getId());
+ }
+ if (messageObject.canEditMessage(currentChat)) {
+ canEditMessagesCount--;
+ }
+ if (!messageObject.canDeleteMessage(chatMode == MODE_SCHEDULED, currentChat)) {
+ cantDeleteMessagesCount--;
+ }
+ if (chatMode == MODE_SCHEDULED || !messageObject.canForwardMessage()) {
+ cantForwardMessagesCount--;
+ } else {
+ canForwardMessagesCount--;
+ }
+ if (messageObject.isMusic()) {
+ canSaveMusicCount--;
+ } else if (messageObject.isDocument()) {
+ canSaveDocumentsCount--;
+ } else {
+ cantSaveMessagesCount--;
+ }
}
} else {
if (selectedMessagesIds[0].size() + selectedMessagesIds[1].size() >= 100) {
return;
}
selectedMessagesIds[index].put(messageObject.getId(), messageObject);
- if (messageObject.type == 0 || messageObject.isAnimatedEmoji() || messageObject.caption != null) {
- selectedMessagesCanCopyIds[index].put(messageObject.getId(), messageObject);
- }
- if (!messageObject.isAnimatedEmoji() && (messageObject.isSticker() || messageObject.isAnimatedSticker()) && MessageObject.isStickerHasSet(messageObject.getDocument())) {
- selectedMessagesCanStarIds[index].put(messageObject.getId(), messageObject);
- }
- if (messageObject.canEditMessage(currentChat)) {
- canEditMessagesCount++;
- }
- if (!messageObject.canDeleteMessage(chatMode == MODE_SCHEDULED, currentChat)) {
- cantDeleteMessagesCount++;
- }
- if (chatMode == MODE_SCHEDULED || !messageObject.canForwardMessage()) {
- cantForwardMessagesCount++;
- } else {
- canForwardMessagesCount++;
- }
- if (messageObject.isMusic()) {
- canSaveMusicCount++;
- } else if (messageObject.isDocument()) {
- canSaveDocumentsCount++;
- } else {
- cantSaveMessagesCount++;
- }
- if (outside) {
- showTextSelectionHint(messageObject);
+ if (reportType < 0) {
+ if (messageObject.type == 0 || messageObject.isAnimatedEmoji() || messageObject.caption != null) {
+ selectedMessagesCanCopyIds[index].put(messageObject.getId(), messageObject);
+ }
+ if (!messageObject.isAnimatedEmoji() && (messageObject.isSticker() || messageObject.isAnimatedSticker()) && MessageObject.isStickerHasSet(messageObject.getDocument())) {
+ selectedMessagesCanStarIds[index].put(messageObject.getId(), messageObject);
+ }
+ if (messageObject.canEditMessage(currentChat)) {
+ canEditMessagesCount++;
+ }
+ if (!messageObject.canDeleteMessage(chatMode == MODE_SCHEDULED, currentChat)) {
+ cantDeleteMessagesCount++;
+ }
+ if (chatMode == MODE_SCHEDULED || !messageObject.canForwardMessage()) {
+ cantForwardMessagesCount++;
+ } else {
+ canForwardMessagesCount++;
+ }
+ if (messageObject.isMusic()) {
+ canSaveMusicCount++;
+ } else if (messageObject.isDocument()) {
+ canSaveDocumentsCount++;
+ } else {
+ cantSaveMessagesCount++;
+ }
+ if (outside) {
+ showTextSelectionHint(messageObject);
+ }
}
}
}
@@ -11590,7 +11757,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
forwardButtonAnimation.cancel();
forwardButtonAnimation = null;
}
- if (last && actionBar.isActionModeShowed()) {
+ if (last && actionBar.isActionModeShowed() && reportType < 0) {
int selectedCount = selectedMessagesIds[0].size() + selectedMessagesIds[1].size();
if (selectedCount == 0) {
hideActionMode();
@@ -11847,11 +12014,24 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
private void updateActionModeTitle() {
- if (!actionBar.isActionModeShowed()) {
- return;
- }
- if (selectedMessagesIds[0].size() != 0 || selectedMessagesIds[1].size() != 0) {
- selectedMessagesCountTextView.setNumber(selectedMessagesIds[0].size() + selectedMessagesIds[1].size(), true);
+ if (reportType < 0) {
+ if (!actionBar.isActionModeShowed()) {
+ return;
+ }
+ if (selectedMessagesIds[0].size() != 0 || selectedMessagesIds[1].size() != 0) {
+ selectedMessagesCountTextView.setNumber(selectedMessagesIds[0].size() + selectedMessagesIds[1].size(), true);
+ }
+ } else {
+ int size = selectedMessagesIds[0].size() + selectedMessagesIds[1].size();
+ if (size == 0) {
+ bottomOverlayChatText.setText(LocaleController.getString("ReportMessages", R.string.ReportMessages));
+ bottomOverlayChatText.setAlpha(0.5f);
+ bottomOverlayChatText.setEnabled(false);
+ } else {
+ bottomOverlayChatText.setText(LocaleController.formatString("ReportMessagesCount", R.string.ReportMessagesCount, LocaleController.formatPluralString("messages", size)).toUpperCase());
+ bottomOverlayChatText.setAlpha(1.0f);
+ bottomOverlayChatText.setEnabled(true);
+ }
}
}
@@ -12141,8 +12321,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (getParentActivity() == null) {
return;
}
- Toast toast = Toast.makeText(getParentActivity(), LocaleController.getString("UnsupportedAttachment", R.string.UnsupportedAttachment), Toast.LENGTH_SHORT);
- toast.show();
+ BulletinFactory.of(this).createErrorBulletin(LocaleController.getString("UnsupportedAttachment", R.string.UnsupportedAttachment)).show();
}
private void fillEditingMediaWithCaption(CharSequence caption, ArrayList entities) {
@@ -12432,7 +12611,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
}
if (!found) {
- AlertsCreator.showSimpleToast(ChatActivity.this, LocaleController.getString("MessageNotFound", R.string.MessageNotFound));
+ BulletinFactory.of(this).createErrorBulletin(LocaleController.getString("MessageNotFound", R.string.MessageNotFound)).show();
return;
}
showScrollToMessageError = false;
@@ -12878,7 +13057,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
highlightMessageId = messageId;
}
if (showScrollToMessageError && messageId != startLoadFromMessageId) {
- AlertsCreator.showSimpleToast(ChatActivity.this, LocaleController.getString("MessageNotFound", R.string.MessageNotFound));
+ BulletinFactory.of(this).createErrorBulletin(LocaleController.getString("MessageNotFound", R.string.MessageNotFound)).show();
}
scrollToMessage = obj;
if (postponedScroll) {
@@ -13765,6 +13944,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
chatFull.participants = chatInfo.participants;
}
}
+ showGigagroupConvertAlert();
int prevLinkedChatId = chatInfo != null ? chatInfo.linked_chat_id : 0;
chatInfo = chatFull;
groupCall = getMessagesController().getGroupCall(currentChat.id, true);
@@ -13783,9 +13963,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
}
}
+ boolean animated = openAnimationStartTime != 0 && SystemClock.elapsedRealtime() >= openAnimationStartTime + 150;
+ checkActionBarMenu(animated);
if (chatInviterId == 0) {
fillInviterId(true);
- updateInfoTopView(openAnimationStartTime != 0 && SystemClock.elapsedRealtime() >= openAnimationStartTime + 150);
+ updateInfoTopView(animated);
}
if (chatActivityEnterView != null) {
chatActivityEnterView.setChatInfo(chatInfo);
@@ -13879,6 +14061,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
builder.setMessage(LocaleController.getString("ChannelCantOpenNa", R.string.ChannelCantOpenNa));
} else if (reason == 2) {
builder.setMessage(LocaleController.getString("ChannelCantOpenBanned", R.string.ChannelCantOpenBanned));
+ } else if (reason == 3) {
+ builder.setMessage(LocaleController.getString("JoinByPeekChannelText", R.string.JoinByPeekChannelText));
}
builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), null);
if (showDialog(closeChatDialog = builder.create()) == null) {
@@ -14766,6 +14950,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
headerItem.hideSubItem(video_call);
}
}
+ checkActionBarMenu(false);
if (!loadingPinnedMessagesList && !pinnedMessageIds.isEmpty() && userInfo.pinned_msg_id > pinnedMessageIds.get(0)) {
getMediaDataController().loadPinnedMessages(dialog_id, 0, userInfo.pinned_msg_id);
loadingPinnedMessagesList = true;
@@ -14826,6 +15011,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
chatActivityEnterView.checkChannelRights();
checkRaiseSensors();
updateSecretStatus();
+ if (currentChat.gigagroup) {
+ updateBottomOverlay();
+ }
}
} else if (id == NotificationCenter.updateMentionsCount) {
if (dialog_id == (Long) args[0]) {
@@ -15108,6 +15296,42 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
return true;
}
+ private void showGigagroupConvertAlert() {
+ if (chatInfo != null && !paused && currentChat.creator && currentChat.megagroup && !currentChat.gigagroup && chatInfo.pending_suggestions.contains("CONVERT_GIGAGROUP") && visibleDialog == null) {
+ AndroidUtilities.runOnUIThread(() -> { //TODO
+ if (chatInfo != null && !paused && currentChat.creator && currentChat.megagroup && !currentChat.gigagroup && chatInfo.pending_suggestions.contains("CONVERT_GIGAGROUP") && visibleDialog == null) {
+ SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount);
+ int lastShowTime = preferences.getInt("group_convert_time", 0);
+ int timeout = BuildVars.DEBUG_PRIVATE_VERSION ? 120 : 60 * 60 * 24 * 7;
+ int currentTime = getConnectionsManager().getCurrentTime();
+ if (Math.abs(currentTime - lastShowTime) >= timeout) {
+ if (visibleDialog == null && getParentActivity() != null) {
+ preferences.edit().putInt("group_convert_time", currentTime).commit();
+ showDialog(AlertsCreator.createGigagroupConvertAlert(getParentActivity(), (dialog, which) -> {
+ showDialog(new GigagroupConvertAlert(getParentActivity(), ChatActivity.this) {
+ @Override
+ protected void onCovert() {
+ getMessagesController().convertToGigaGroup(getParentActivity(), currentChat, ChatActivity.this, (result) -> {
+ if (result) {
+ undoView.showWithAction(0, UndoView.ACTION_GIGAGROUP_SUCCESS, null);
+ }
+ });
+ }
+
+ @Override
+ protected void onCancel() {
+ undoView.showWithAction(0, UndoView.ACTION_GIGAGROUP_CANCEL, null);
+ getMessagesController().removeSuggestion(dialog_id, "CONVERT_GIGAGROUP");
+ }
+ });
+ }, (dialog, which) -> undoView.showWithAction(0, UndoView.ACTION_GIGAGROUP_CANCEL, null)).create());
+ }
+ }
+ }
+ }, 1000);
+ }
+ }
+
private void processNewMessages(ArrayList arr) {
int currentUserId = getUserConfig().getClientUserId();
boolean updateChat = false;
@@ -15152,18 +15376,24 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
notifiedSearch = true;
NotificationCenter.getGlobalInstance().postNotificationName(NotificationCenter.closeSearchByActiveAction);
}
- if (currentChat != null && currentChat.slowmode_enabled && messageObject.isSent() && chatMode != MODE_SCHEDULED) {
- if (chatInfo != null) {
- int date = messageObject.messageOwner.date + chatInfo.slowmode_seconds;
- int currentTime = getConnectionsManager().getCurrentTime();
- if (date > getConnectionsManager().getCurrentTime()) {
- chatInfo.slowmode_next_send_date = Math.max(chatInfo.slowmode_next_send_date, Math.min(currentTime + chatInfo.slowmode_seconds, date));
- if (chatActivityEnterView != null) {
- chatActivityEnterView.setSlowModeTimer(chatInfo.slowmode_next_send_date);
+ if (currentChat != null) {
+ TLRPC.Chat newChat = getMessagesController().getChat(currentChat.id);
+ if (newChat != null) {
+ currentChat = newChat;
+ if (!newChat.gigagroup && newChat.slowmode_enabled && messageObject.isSent() && chatMode != MODE_SCHEDULED) {
+ if (chatInfo != null) {
+ int date = messageObject.messageOwner.date + chatInfo.slowmode_seconds;
+ int currentTime = getConnectionsManager().getCurrentTime();
+ if (date > getConnectionsManager().getCurrentTime()) {
+ chatInfo.slowmode_next_send_date = Math.max(chatInfo.slowmode_next_send_date, Math.min(currentTime + chatInfo.slowmode_seconds, date));
+ if (chatActivityEnterView != null) {
+ chatActivityEnterView.setSlowModeTimer(chatInfo.slowmode_next_send_date);
+ }
+ }
}
+ getMessagesController().loadFullChat(currentChat.id, 0, true);
}
}
- getMessagesController().loadFullChat(currentChat.id, 0, true);
}
}
if (currentChat != null) {
@@ -15172,7 +15402,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
TLRPC.Chat newChat = getMessagesController().getChat(currentChat.id);
if (newChat != null) {
currentChat = newChat;
- checkActionBarMenu();
+ checkActionBarMenu(false);
updateBottomOverlay();
if (avatarContainer != null) {
avatarContainer.updateSubtitle(true);
@@ -15719,6 +15949,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
for (int a = 0; a < size; a++) {
Integer mid = markAsDeletedMessages.get(a);
MessageObject obj = messagesDict[loadIndex].get(mid);
+ if ((selectedObject != null && obj == selectedObject || obj != null && selectedObjectGroup != null && selectedObjectGroup == groupedMessagesMap.get(obj.getGroupId())) && scrimPopupWindow != null) {
+ scrimPopupWindow.dismiss();
+ }
if (loadIndex == 0) {
if (pinnedMessageObjects.containsKey(mid)) {
pinnedMessageObjects.remove(mid);
@@ -16181,11 +16414,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
searchUpButton.setAlpha(searchUpButton.isEnabled() ? 1.0f : 0.5f);
searchDownButton.setAlpha(searchDownButton.isEnabled() ? 1.0f : 0.5f);
if (count < 0) {
- searchCountText.setText("");
+ searchCountText.setCount("", 0, false);
} else if (count == 0) {
- searchCountText.setText(LocaleController.getString("NoResult", R.string.NoResult));
+ searchCountText.setCount(LocaleController.getString("NoResult", R.string.NoResult), 0, false);
} else {
- searchCountText.setText(LocaleController.formatString("Of", R.string.Of, num + 1, count));
+ searchCountText.setCount(LocaleController.formatString("OfCounted", R.string.OfCounted, num + 1, count), num + 1, true);
}
}
}
@@ -16215,11 +16448,24 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
public void saveKeyboardPositionBeforeTransition() {
+ if (cancelFixedPositionRunnable != null) {
+ AndroidUtilities.cancelRunOnUIThread(cancelFixedPositionRunnable);
+ }
if (chatActivityEnterView != null && contentView != null && chatActivityEnterView.getAdjustPanLayoutHelper() != null && !chatActivityEnterView.getAdjustPanLayoutHelper().animationInProgress()) {
fixedKeyboardHeight = contentView.getKeyboardHeight();
}
}
+ public void removeKeyboardPositionBeforeTransition() {
+ if (fixedKeyboardHeight > 0) {
+ AndroidUtilities.runOnUIThread(cancelFixedPositionRunnable = () -> {
+ cancelFixedPositionRunnable = null;
+ fixedKeyboardHeight = -1;
+ fragmentView.requestLayout();
+ }, 200);
+ }
+ }
+
@Override
public void onTransitionAnimationStart(boolean isOpen, boolean backward) {
int[] alowedNotifications = null;
@@ -16280,6 +16526,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
}
}
+ if (cancelFixedPositionRunnable != null) {
+ AndroidUtilities.cancelRunOnUIThread(cancelFixedPositionRunnable);
+ }
fixedKeyboardHeight = -1;
if (isOpen) {
if (blurredView != null && blurredView.getVisibility() == View.VISIBLE) {
@@ -16313,7 +16562,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
BaseFragment fragment = parentLayout.fragmentsStack.get(a);
if (fragment != this && fragment instanceof ChatActivity) {
ChatActivity chatActivity = (ChatActivity) fragment;
- if (chatActivity.needRemovePreviousSameChatActivity && chatActivity.dialog_id == dialog_id && chatActivity.getChatMode() == getChatMode() && chatActivity.threadMessageId == threadMessageId) {
+ if (chatActivity.needRemovePreviousSameChatActivity && chatActivity.dialog_id == dialog_id && chatActivity.getChatMode() == getChatMode() && chatActivity.threadMessageId == threadMessageId && chatActivity.reportType == reportType) {
fragment.removeSelfFromStack();
break;
}
@@ -16457,7 +16706,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (bottomOverlayChatText == null || chatMode == MODE_SCHEDULED) {
return;
}
- if (chatMode == MODE_PINNED) {
+ if (reportType >= 0) {
+ updateActionModeTitle();
+ } else if (chatMode == MODE_PINNED) {
boolean allowPin;
if (currentChat != null) {
allowPin = ChatObject.canPinMessages(currentChat);
@@ -16534,6 +16785,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
}
+ if (currentChat != null && currentChat.gigagroup && reportType < 0 && chatMode == 0) {
+ bottomOverlayImage.setVisibility(View.VISIBLE);
+ } else {
+ bottomOverlayImage.setVisibility(View.INVISIBLE);
+ }
if (inPreviewMode) {
searchContainer.setVisibility(View.INVISIBLE);
bottomOverlayChat.setVisibility(View.INVISIBLE);
@@ -16559,7 +16815,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
muteItem.setVisibility(View.VISIBLE);
}
}
- if (chatMode == MODE_PINNED ||
+ if (reportType >= 0) {
+ bottomOverlayChat.setVisibility(View.VISIBLE);
+ chatActivityEnterView.setVisibility(View.INVISIBLE);
+ } else if (chatMode == MODE_PINNED ||
currentChat != null && !isThreadChat() && (ChatObject.isNotInChat(currentChat) || !ChatObject.canWriteToChat(currentChat)) ||
currentUser != null && (UserObject.isDeleted(currentUser) || userBlocked || UserObject.isReplyUser(currentUser))) {
if (chatActivityEnterView.isEditingMessage()) {
@@ -16890,7 +17149,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
pinned_msg_id = 0;
}
SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount);
- if (threadMessageObject == null && (chatInfo == null && userInfo == null || pinned_msg_id == 0 || actionBar != null && (actionBar.isActionModeShowed() || actionBar.isSearchFieldVisible()))) {
+ if (threadMessageObject == null && (chatInfo == null && userInfo == null || pinned_msg_id == 0 || actionBar != null && (actionBar.isActionModeShowed() || actionBar.isSearchFieldVisible() || reportType >= 0))) {
changed = hidePinnedMessageView(animated);
if (headerItem != null) headerItem.hideSubItem(show_pinned);
} else if (pinned_msg_id == preferences.getInt("pin_" + dialog_id, 0)) {
@@ -17726,7 +17985,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
openImport = false;
}
- AndroidUtilities.requestAdjustResize(getParentActivity(), classGuid);
+ if (reportType >= 0) {
+ AndroidUtilities.setAdjustResizeToNothing(getParentActivity(), classGuid);
+ } else {
+ AndroidUtilities.requestAdjustResize(getParentActivity(), classGuid);
+ }
MediaController.getInstance().startRaiseToEarSensors(this);
checkRaiseSensors();
if (chatAttachAlert != null) {
@@ -17759,7 +18022,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
});
- checkActionBarMenu();
+ checkActionBarMenu(false);
if (replyImageLocation != null && replyImageView != null) {
replyImageView.setImage(ImageLocation.getForObject(replyImageLocation, replyImageLocationObject), "50_50", ImageLocation.getForObject(replyImageThumbLocation, replyImageLocationObject), "50_50_b", null, replyImageSize, replyImageCacheType, replyingMessageObject);
}
@@ -17833,12 +18096,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
checkBotCommands();
updateTitle();
+ showGigagroupConvertAlert();
}
@Override
public void finishFragment() {
super.finishFragment();
if (scrimPopupWindow != null) {
+ scrimPopupWindow.setPauseNotifications(false);
scrimPopupWindow.dismiss();
}
}
@@ -17847,6 +18112,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
public void onPause() {
super.onPause();
if (scrimPopupWindow != null) {
+ scrimPopupWindow.setPauseNotifications(false);
scrimPopupWindow.dismiss();
}
long replyId = threadMessageId;
@@ -18095,7 +18361,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
View child = chatListView.getChildAt(a);
if (child instanceof ChatMessageCell) {
MessageObject.GroupedMessages groupedMessages = ((ChatMessageCell) child).getCurrentMessagesGroup();
- if (groupedMessages != null && groupedMessages.hasSibling) {
+ if (groupedMessages != null && groupedMessages.hasSibling && !groupedMessages.messages.isEmpty()) {
if (newGroups == null) {
newGroups = new HashMap<>();
}
@@ -18113,21 +18379,21 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
}
- /*if (AndroidUtilities.isTablet()) {
+ if (AndroidUtilities.isTablet()) {
if (AndroidUtilities.isSmallTablet() && ApplicationLoader.applicationContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
actionBar.setBackButtonDrawable(new BackDrawable(false));
- if (fragmentContextView != null && fragmentContextView.getParent() == null) {
+ /*if (fragmentContextView != null && fragmentContextView.getParent() == null) {
((ViewGroup) fragmentView).addView(fragmentContextView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 38, Gravity.TOP | Gravity.LEFT, 0, -36, 0, 0));
- }
+ }*/
} else {
actionBar.setBackButtonDrawable(new BackDrawable(parentLayout == null || parentLayout.fragmentsStack.isEmpty() || parentLayout.fragmentsStack.get(0) == ChatActivity.this || parentLayout.fragmentsStack.size() == 1));
- if (fragmentContextView != null && fragmentContextView.getParent() != null) {
+ /*if (fragmentContextView != null && fragmentContextView.getParent() != null) {
fragmentView.setPadding(0, 0, 0, 0);
((ViewGroup) fragmentView).removeView(fragmentContextView);
- }
+ }*/
}
return false;
- }*/
+ }
return true;
}
@@ -18329,7 +18595,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
private void createMenu(View v, boolean single, boolean listView, float x, float y, boolean searchGroup) {
- if (actionBar.isActionModeShowed()) {
+ if (actionBar.isActionModeShowed() || reportType >= 0) {
return;
}
@@ -18351,6 +18617,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
Toast.makeText(getParentActivity(), LocaleController.getString("MessageNotFound", R.string.MessageNotFound), Toast.LENGTH_SHORT).show();
}
return;
+ } else if (message.messageOwner.action instanceof TLRPC.TL_messageActionSetMessagesTTL) {
+ if (avatarContainer.openSetTimer()) {
+ return;
+ }
} else if (message.messageOwner.action instanceof TLRPC.TL_messageActionGroupCall || message.messageOwner.action instanceof TLRPC.TL_messageActionInviteToGroupCall) {
if (getParentActivity() == null) {
return;
@@ -18472,7 +18742,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
icons.add(R.drawable.baseline_replay_24);
items.add(LocaleController.getString("Delete", R.string.Delete));
options.add(1);
- icons.add(R.drawable.baseline_delete_24);
+ icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.baseline_delete_24);
} else if (type == 1) {
if (currentChat != null) {
/*if (selectedObject.messageOwner.action instanceof TLRPC.TL_messageActionGroupCall) {
@@ -18519,7 +18789,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (message.canDeleteMessage(chatMode == MODE_SCHEDULED, currentChat) && (threadMessageObjects == null || !threadMessageObjects.contains(message))) {
items.add(LocaleController.getString("Delete", R.string.Delete));
options.add(1);
- icons.add(R.drawable.baseline_delete_24);
+ icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.baseline_delete_24);
}
} else if (type == 20) {
items.add(LocaleController.getString("Retry", R.string.Retry));
@@ -18530,7 +18800,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
icons.add(R.drawable.baseline_content_copy_24);
items.add(LocaleController.getString("Delete", R.string.Delete));
options.add(1);
- icons.add(R.drawable.baseline_delete_24);
+ icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.baseline_delete_24);
} else {
if (currentEncryptedChat == null) {
if (chatMode == MODE_SCHEDULED) {
@@ -18903,7 +19173,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (message.canDeleteMessage(chatMode == MODE_SCHEDULED, currentChat) && (threadMessageObjects == null || !threadMessageObjects.contains(message))) {
items.add(LocaleController.getString("Delete", R.string.Delete));
options.add(1);
- icons.add(R.drawable.baseline_delete_24);
+ icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.baseline_delete_24);
}
} else {
if (allowChatActions) {
@@ -19027,7 +19297,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
items.add(LocaleController.getString("Delete", R.string.Delete));
options.add(1);
- icons.add(R.drawable.baseline_delete_24);
+ icons.add(selectedObject.messageOwner.ttl_period != 0 ? R.drawable.msg_delete_auto : R.drawable.baseline_delete_24);
}
if (chatInfo != null && chatInfo.participants != null && chatInfo.participants.participants != null) {
selectedParticipant = null;
@@ -19080,6 +19350,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (scrimPopupWindow != null) {
scrimPopupWindow.dismiss();
scrimPopupWindow = null;
+ menuDeleteItem = null;
scrimPopupWindowItems = null;
return;
}
@@ -19143,6 +19414,12 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
for (int a = 0, N = items.size(); a < N; a++) {
ActionBarMenuSubItem cell = new ActionBarMenuSubItem(getParentActivity(), a == 0, a == N - 1);
cell.setTextAndIcon(items.get(a), icons.get(a));
+ Integer option = options.get(a);
+ if (option == 1 && selectedObject.messageOwner.ttl_period != 0) {
+ menuDeleteItem = cell;
+ updateDeleteItemRunnable.run();
+ cell.setSubtextColor(Theme.getColor(Theme.key_windowBackgroundWhiteGrayText6));
+ }
scrimPopupWindowItems[a] = cell;
linearLayout.addView(cell);
final int i = a;
@@ -19182,6 +19459,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
return;
}
scrimPopupWindow = null;
+ menuDeleteItem = null;
scrimPopupWindowItems = null;
if (scrimAnimatorSet != null) {
scrimAnimatorSet.cancel();
@@ -19320,14 +19598,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (stickersPanel != null && stickersPanel.getVisibility() == View.VISIBLE) {
views.add(stickersPanel);
}
- actionBar.showActionMode(null, null, null, new boolean[]{false, true, true}, chatListView, translationY);
+ actionBar.showActionMode(true, null, null, null, new boolean[]{false, true, true}, chatListView, translationY);
if (getParentActivity() instanceof LaunchActivity) {
((LaunchActivity) getParentActivity()).hideVisibleActionMode();
}
} else if (bottomOverlayChat.getVisibility() == View.VISIBLE) {
- actionBar.showActionMode(null, null, null, new boolean[]{true}, chatListView, translationY);
+ actionBar.showActionMode(true, null, null, null, new boolean[]{true}, chatListView, translationY);
} else {
- actionBar.showActionMode(null, null, null, null, chatListView, translationY);
+ actionBar.showActionMode(true, null, null, null, null, chatListView, translationY);
}
if (scrimPopupWindow != null) {
scrimPopupWindow.dismiss();
@@ -19478,7 +19756,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
return;
}
if (pinBulletin != null) {
- pinBulletin.hide(false);
+ pinBulletin.hide(false, 0);
}
ArrayList objects = new ArrayList<>();
objects.add(selectedObject);
@@ -19497,6 +19775,25 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}).show();
}
+ public void openReportChat(int type) {
+ Bundle args = new Bundle();
+ int lowerId = (int) dialog_id;
+ if (lowerId > 0) {
+ args.putInt("user_id", lowerId);
+ } else {
+ args.putInt("chat_id", -lowerId);
+ }
+ args.putInt("report", type);
+ ChatActivity fragment = new ChatActivity(args);
+ presentFragment(fragment);
+ fragment.chatActivityDelegate = new ChatActivityDelegate() {
+ @Override
+ public void onReport() {
+ undoView.showWithAction(0, UndoView.ACTION_REPORT_SENT, null);
+ }
+ };
+ }
+
private void saveMessageToGallery(MessageObject messageObject) {
String path = messageObject.messageOwner.attachPath;
if (!TextUtils.isEmpty(path)) {
@@ -19629,7 +19926,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
AndroidUtilities.addToClipboard(getMessageContent(selectedObject, 0, false));
}
}
- undoView.showWithAction(0, UndoView.ACTION_TEXT_COPIED, null);
+ undoView.showWithAction(0, UndoView.ACTION_MESSAGE_COPIED, null);
break;
}
case 4: {
@@ -20666,7 +20963,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
boolean disableSelection = false;
boolean selected = false;
- if (actionBar.isActionModeShowed()) {
+ if (actionBar.isActionModeShowed() || reportType >= 0) {
cell.setCheckBoxVisible(threadMessageObjects == null || !threadMessageObjects.contains(messageObject), true);
int idx = messageObject.getDialogId() == dialog_id ? 0 : 1;
if (selectedMessagesIds[idx].indexOfKey(messageObject.getId()) >= 0) {
@@ -20844,6 +21141,10 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
return threadMessageObject;
}
+ public MessageObject getReplyMessage() {
+ return replyingMessageObject;
+ }
+
public int getThreadId() {
return threadMessageId;
}
@@ -21031,7 +21332,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
openOriginalReplyChat(fallbackMessage);
} else {
if (getParentActivity() != null) {
- Toast.makeText(getParentActivity(), LocaleController.getString("ChannelPostDeleted", R.string.ChannelPostDeleted), Toast.LENGTH_SHORT).show();
+ BulletinFactory.of(this).createErrorBulletin(LocaleController.getString("ChannelPostDeleted", R.string.ChannelPostDeleted)).show();
}
}
}
@@ -21097,6 +21398,17 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
savedHistory.messages.remove(0);
}
} else {
+ if ("CHANNEL_PRIVATE".equals(error.text)) {
+ if (getParentActivity() != null) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
+ builder.setTitle(LocaleController.getString("AppName", R.string.AppName));
+ builder.setMessage(LocaleController.getString("JoinByPeekChannelText", R.string.JoinByPeekChannelText));
+ builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), null);
+ AlertDialog alertDialog = builder.create();
+ showDialog(builder.create());
+ }
+ return;
+ }
savedNoHistory = true;
}
processLoadedDiscussionMessage(savedNoDiscussion, savedDiscussionMessage, savedNoHistory, savedHistory, maxReadId, fallbackMessage, progressRunnable, req, chat, highlightMsgId, originalMessage);
@@ -21316,7 +21628,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
} else if (str.startsWith("#") || str.startsWith("$")) {
if (ChatObject.isChannel(currentChat)) {
- if (chatMode == MODE_SCHEDULED) {
+ if (chatMode == MODE_SCHEDULED || chatMode == MODE_PINNED) {
chatActivityDelegate.openSearch(str);
finishFragment();
} else {
@@ -21457,6 +21769,14 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} else if (which == 1) {
AndroidUtilities.addToClipboard(str);
+ if (str.startsWith("@")) {
+ undoView.showWithAction(0, UndoView.ACTION_USERNAME_COPIED, null);
+ } else if (str.startsWith("#") || str.startsWith("$")) {
+ undoView.showWithAction(0, UndoView.ACTION_HASHTAG_COPIED, null);
+ } else {
+ undoView.showWithAction(0, UndoView.ACTION_LINK_COPIED, null);
+ }
+
}
return Unit.INSTANCE;
});
@@ -21485,13 +21805,19 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
}
} else if (which == 1) {
String url1 = urlFinal;
+ boolean tel = false;
if (url1.startsWith("mailto:")) {
url1 = url1.substring(7);
} else if (url1.startsWith("tel:")) {
url1 = url1.substring(4);
+ tel = true;
}
AndroidUtilities.addToClipboard(url1);
- AlertUtil.showToast(LocaleController.getString("LinkCopied", R.string.LinkCopied));
+ if (tel) {
+ undoView.showWithAction(0, UndoView.ACTION_PHONE_COPIED, null);
+ } else {
+ undoView.showWithAction(0, UndoView.ACTION_LINK_COPIED, null);
+ }
}
return Unit.INSTANCE;
});
@@ -21841,7 +22167,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (chat == null) {
return;
}
- if (actionBar.isActionModeShowed()) {
+ if (actionBar.isActionModeShowed() || reportType >= 0) {
processRowSelect(cell, true, touchX, touchY);
return;
}
@@ -21871,7 +22197,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override
public void didPressUserAvatar(ChatMessageCell cell, TLRPC.User user, float touchX, float touchY) {
- if (actionBar.isActionModeShowed()) {
+ if (actionBar.isActionModeShowed() || reportType >= 0) {
processRowSelect(cell, true, touchX, touchY);
return;
}
@@ -22093,7 +22419,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
@Override
public boolean canPerformActions() {
- return actionBar != null && !actionBar.isActionModeShowed();
+ return actionBar != null && !actionBar.isActionModeShowed() && reportType < 0;
}
@Override
@@ -22162,11 +22488,12 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
} else if (message.isAnimatedEmoji()) {
restartSticker(cell);
} else if (message.needDrawBluredPreview()) {
- if (sendSecretMessageRead(message)) {
- cell.invalidate();
- }
SecretMediaViewer.getInstance().setParentActivity(getParentActivity());
- SecretMediaViewer.getInstance().openMedia(message, photoViewerProvider);
+ SecretMediaViewer.getInstance().openMedia(message, photoViewerProvider, () -> {
+ if (sendSecretMessageRead(message)) {
+ cell.invalidate();
+ }
+ });
} else if (message.type == MessageObject.TYPE_STICKER || message.type == MessageObject.TYPE_ANIMATED_STICKER) {
StickersAlert alert = new StickersAlert(getParentActivity(), ChatActivity.this, message.getInputStickerSet(), null, bottomOverlayChat.getVisibility() != View.VISIBLE && (currentChat == null || ChatObject.canSendStickers(currentChat)) ? chatActivityEnterView : null);
alert.setCalcMandatoryInsets(isKeyboardVisible());
@@ -22766,7 +23093,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
boolean selected = false;
boolean disableSelection = false;
- if (actionBar.isActionModeShowed()) {
+ if (actionBar.isActionModeShowed() || reportType >= 0) {
messageCell.setCheckBoxVisible(threadMessageObjects == null || !threadMessageObjects.contains(message), false);
int idx = message.getDialogId() == dialog_id ? 0 : 1;
if (selectedMessagesIds[idx].indexOfKey(message.getId()) >= 0) {
@@ -22804,10 +23131,12 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
viewBottom = viewTop + height;
}
int recyclerChatViewHeight = (contentView.getHeightWithKeyboard() - (inPreviewMode ? 0 : AndroidUtilities.dp(48)) - chatListView.getTop());
- if (contentView.getKeyboardHeight() == 0) {
- recyclerChatViewHeight -= chatActivityEnterView.getEmojiPadding();
+ int keyboardOffset = contentView.getKeyboardHeight();
+ int parentHeight = viewBottom - viewTop;
+ if (keyboardOffset < AndroidUtilities.dp(20) && chatActivityEnterView.isPopupShowing() || chatActivityEnterView.pannelAniamationInProgress()) {
+ keyboardOffset = chatActivityEnterView.getEmojiPadding();
}
- messageCell.setVisiblePart(viewTop, viewBottom - viewTop, recyclerChatViewHeight, contentView.getKeyboardHeight());
+ messageCell.setVisiblePart(viewTop, viewBottom - viewTop, recyclerChatViewHeight, keyboardOffset);
return true;
}
@@ -23289,17 +23618,22 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
themeDescriptions.add(new ThemeDescription(messagesSearchListView, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_windowBackgroundWhite));
- themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_actionBarDefault));
- themeDescriptions.add(new ThemeDescription(chatListView, ThemeDescription.FLAG_LISTGLOWCOLOR, null, null, null, null, Theme.key_actionBarDefault));
- themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_ITEMSCOLOR, null, null, null, null, Theme.key_actionBarDefaultIcon));
- themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SELECTORCOLOR, null, null, null, null, Theme.key_actionBarDefaultSelector));
+ if (reportType < 0) {
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_actionBarDefault));
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_ITEMSCOLOR, null, null, null, null, Theme.key_actionBarDefaultIcon));
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SELECTORCOLOR, null, null, null, null, Theme.key_actionBarDefaultSelector));
+ } else {
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_actionBarActionModeDefault));
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_ITEMSCOLOR, null, null, null, null, Theme.key_actionBarActionModeDefaultIcon));
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SELECTORCOLOR, null, null, null, null, Theme.key_actionBarActionModeDefaultSelector));
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_TITLECOLOR, null, null, null, null, Theme.key_actionBarActionModeDefaultIcon));
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SUBTITLECOLOR, null, null, null, null, Theme.key_actionBarActionModeDefaultIcon));
+ }
themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SUBMENUBACKGROUND, null, null, null, selectedBackgroundDelegate, Theme.key_actionBarDefaultSubmenuBackground));
themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SUBMENUITEM, null, null, null, selectedBackgroundDelegate, Theme.key_actionBarDefaultSubmenuItem));
themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SUBMENUITEM | ThemeDescription.FLAG_IMAGECOLOR, null, null, null, selectedBackgroundDelegate, Theme.key_actionBarDefaultSubmenuItemIcon));
-
- themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_actionBarDefault));
themeDescriptions.add(new ThemeDescription(chatListView, ThemeDescription.FLAG_LISTGLOWCOLOR, null, null, null, null, Theme.key_actionBarDefault));
- themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_ITEMSCOLOR, null, null, null, null, Theme.key_actionBarDefaultIcon));
+
themeDescriptions.add(new ThemeDescription(avatarContainer != null ? avatarContainer.getTitleTextView() : null, ThemeDescription.FLAG_TEXTCOLOR, null, null, null, null, Theme.key_actionBarDefaultTitle));
themeDescriptions.add(new ThemeDescription(avatarContainer != null ? avatarContainer.getTitleTextView() : null, ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_actionBarDefaultSubtitle));
themeDescriptions.add(new ThemeDescription(avatarContainer != null ? avatarContainer.getSubtitleTextView() : null, ThemeDescription.FLAG_TEXTCOLOR | ThemeDescription.FLAG_CHECKTAG, null, new Paint[]{Theme.chat_statusPaint, Theme.chat_statusRecordPaint}, null, null, Theme.key_chat_status, null));
@@ -23309,7 +23643,6 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SEARCHPLACEHOLDER, null, null, null, null, Theme.key_actionBarDefaultSearchPlaceholder));
themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SEARCHPLACEHOLDER, null, null, null, null, Theme.key_actionBarDefaultSearchPlaceholder));
-
themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_AM_ITEMSCOLOR, null, null, null, null, Theme.key_actionBarActionModeDefaultIcon));
themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_AM_BACKGROUND, null, null, null, null, Theme.key_actionBarActionModeDefault));
themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_AM_TOPBACKGROUND, null, null, null, null, Theme.key_actionBarActionModeDefaultTop));
@@ -23704,6 +24037,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
themeDescriptions.add(new ThemeDescription(bottomOverlayChatText, 0, null, null, null, null, Theme.key_chat_goDownButtonCounterBackground));
themeDescriptions.add(new ThemeDescription(bottomOverlayChatText, 0, null, null, null, null, Theme.key_chat_messagePanelBackground));
themeDescriptions.add(new ThemeDescription(bottomOverlayProgress, 0, null, null, null, null, Theme.key_chat_fieldOverlayText));
+ themeDescriptions.add(new ThemeDescription(bottomOverlayImage, ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_chat_fieldOverlayText));
themeDescriptions.add(new ThemeDescription(bigEmptyView, ThemeDescription.FLAG_TEXTCOLOR, null, null, null, null, Theme.key_chat_serviceText));
themeDescriptions.add(new ThemeDescription(emptyView, ThemeDescription.FLAG_TEXTCOLOR, null, null, null, null, Theme.key_chat_serviceText));
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java
index 10e1211b3..760b2b733 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java
@@ -17,8 +17,6 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Canvas;
import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
import android.os.Build;
import android.os.Bundle;
import android.text.Editable;
@@ -70,6 +68,7 @@ import org.telegram.ui.Components.ImageUpdater;
import org.telegram.ui.Components.LayoutHelper;
import org.telegram.ui.Components.RadialProgressView;
import org.telegram.ui.Components.SizeNotifierFrameLayout;
+import org.telegram.ui.Components.UndoView;
import java.util.ArrayList;
import java.util.concurrent.CountDownLatch;
@@ -82,6 +81,8 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
private AlertDialog progressDialog;
+ private UndoView undoView;
+
private LinearLayout avatarContainer;
private BackupImageView avatarImage;
private View avatarOverlay;
@@ -222,18 +223,18 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
}
private void loadLinksCount() {
-// TLRPC.TL_messages_getExportedChatInvites req = new TLRPC.TL_messages_getExportedChatInvites();
-// req.peer = getMessagesController().getInputPeer(-chatId);
-// req.admin_id = getMessagesController().getInputUser(getUserConfig().getCurrentUser());
-// req.limit = 0;
-// getConnectionsManager().sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
-// if (error == null) {
-// TLRPC.TL_messages_exportedChatInvites invites = (TLRPC.TL_messages_exportedChatInvites) response;
-// info.invitesCount = invites.count;
-// getMessagesStorage().saveChatLinksCount(chatId, info.invitesCount);
-// updateFields(false);
-// }
-// }));
+ TLRPC.TL_messages_getExportedChatInvites req = new TLRPC.TL_messages_getExportedChatInvites();
+ req.peer = getMessagesController().getInputPeer(-chatId);
+ req.admin_id = getMessagesController().getInputUser(getUserConfig().getCurrentUser());
+ req.limit = 0;
+ getConnectionsManager().sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
+ if (error == null) {
+ TLRPC.TL_messages_exportedChatInvites invites = (TLRPC.TL_messages_exportedChatInvites) response;
+ info.invitesCount = invites.count;
+ getMessagesStorage().saveChatLinksCount(chatId, info.invitesCount);
+ updateFields(false);
+ }
+ }));
}
@Override
@@ -267,9 +268,19 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
if (nameTextView != null) {
nameTextView.onPause();
}
+ if (undoView != null) {
+ undoView.hide(true, 0);
+ }
imageUpdater.onPause();
}
+ @Override
+ protected void onBecomeFullyHidden() {
+ if (undoView != null) {
+ undoView.hide(true, 0);
+ }
+ }
+
@Override
public void dismissCurrentDialog() {
if (imageUpdater.dismissCurrentDialog(visibleDialog)) {
@@ -771,19 +782,19 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
blockCell.setOnClickListener(v -> {
Bundle args = new Bundle();
args.putInt("chat_id", chatId);
- args.putInt("type", !isChannel ? ChatUsersActivity.TYPE_KICKED : ChatUsersActivity.TYPE_BANNED);
+ args.putInt("type", !isChannel && !currentChat.gigagroup ? ChatUsersActivity.TYPE_KICKED : ChatUsersActivity.TYPE_BANNED);
ChatUsersActivity fragment = new ChatUsersActivity(args);
fragment.setInfo(info);
presentFragment(fragment);
});
-// inviteLinksCell = new TextCell(context);
-// inviteLinksCell.setBackgroundDrawable(Theme.getSelectorDrawable(false));
-// inviteLinksCell.setOnClickListener(v -> {
-// ManageLinksActivity fragment = new ManageLinksActivity(chatId);
-// fragment.setInfo(info, info.exported_invite);
-// presentFragment(fragment);
-// });
+ inviteLinksCell = new TextCell(context);
+ inviteLinksCell.setBackgroundDrawable(Theme.getSelectorDrawable(false));
+ inviteLinksCell.setOnClickListener(v -> {
+ ManageLinksActivity fragment = new ManageLinksActivity(chatId, 0, 0);
+ fragment.setInfo(info, info.exported_invite);
+ presentFragment(fragment);
+ });
adminCell = new TextCell(context);
adminCell.setBackgroundDrawable(Theme.getSelectorDrawable(false));
@@ -807,20 +818,25 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
presentFragment(fragment);
});
- if (ChatObject.isChannel(currentChat) && ChatObject.hasAdminRights(currentChat)) {
+ if (ChatObject.isChannel(currentChat) || currentChat.gigagroup) {
logCell = new TextCell(context);
logCell.setText(LocaleController.getString("EventLog", R.string.EventLog), false);
logCell.setBackgroundDrawable(Theme.getSelectorDrawable(false));
logCell.setOnClickListener(v -> presentFragment(new ChannelAdminLogActivity(currentChat)));
}
- if (!isChannel) {
+ if (!isChannel && !currentChat.gigagroup) {
infoContainer.addView(blockCell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
}
- // infoContainer.addView(inviteLinksCell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
+ if (!isChannel) {
+ infoContainer.addView(inviteLinksCell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
+ }
infoContainer.addView(adminCell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
infoContainer.addView(membersCell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
if (isChannel) {
+ infoContainer.addView(inviteLinksCell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
+ }
+ if (isChannel || currentChat.gigagroup) {
infoContainer.addView(blockCell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
}
if (logCell != null) {
@@ -898,6 +914,9 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
}
}
+ undoView = new UndoView(context);
+ sizeNotifierFrameLayout.addView(undoView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.BOTTOM | Gravity.LEFT, 8, 0, 8, 8));
+
nameTextView.setText(currentChat.title);
nameTextView.setSelection(nameTextView.length());
if (info != null) {
@@ -1012,6 +1031,10 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
return nameTextView.getText().toString();
}
+ public void showConvertTooltip() {
+ undoView.showWithAction(0, UndoView.ACTION_GIGAGROUP_SUCCESS, null);
+ }
+
private boolean checkDiscard() {
String about = info != null && info.about != null ? info.about : "";
if (info != null && ChatObject.isChannel(currentChat) && info.hidden_prehistory != historyHidden ||
@@ -1247,7 +1270,7 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
}
if (logCell != null) {
- logCell.setVisibility(!currentChat.megagroup || info != null ? View.VISIBLE : View.GONE);
+ logCell.setVisibility(!currentChat.megagroup || currentChat.gigagroup || info != null ? View.VISIBLE : View.GONE);
}
if (linkedCell != null) {
@@ -1318,7 +1341,7 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
}
}
- if (info != null && historyCell != null) {
+ if (historyCell != null) {
String type = historyHidden ? LocaleController.getString("ChatHistoryHidden", R.string.ChatHistoryHidden) : LocaleController.getString("ChatHistoryVisible", R.string.ChatHistoryVisible);
historyCell.setTextAndValue(LocaleController.getString("ChatHistory", R.string.ChatHistory), type, false);
}
@@ -1342,39 +1365,43 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
} else {
membersCell.setTextAndValue(LocaleController.getString("ChannelMembers", R.string.ChannelMembers), String.format("%d", info.participants.participants.size()), logCell != null && logCell.getVisibility() == View.VISIBLE);
}
- int count = 0;
- if (currentChat.default_banned_rights != null) {
- if (!currentChat.default_banned_rights.send_stickers) {
- count++;
- }
- if (!currentChat.default_banned_rights.send_gifs) {
- count++;
- }
- if (!currentChat.default_banned_rights.send_media) {
- count++;
- }
- if (!currentChat.default_banned_rights.embed_links) {
- count++;
- }
- if (!currentChat.default_banned_rights.send_messages) {
- count++;
- }
- if (!currentChat.default_banned_rights.pin_messages) {
- count++;
- }
- if (!currentChat.default_banned_rights.send_polls) {
- count++;
- }
- if (!currentChat.default_banned_rights.invite_users) {
- count++;
- }
- if (!currentChat.default_banned_rights.change_info) {
- count++;
- }
+ if (currentChat.gigagroup) {
+ blockCell.setTextAndValueAndIcon(LocaleController.getString("ChannelBlacklist", R.string.ChannelBlacklist), String.format("%d", Math.max(info.banned_count, info.kicked_count)), R.drawable.actions_removed, logCell != null && logCell.getVisibility() == View.VISIBLE);
} else {
- count = 9;
+ int count = 0;
+ if (currentChat.default_banned_rights != null) {
+ if (!currentChat.default_banned_rights.send_stickers) {
+ count++;
+ }
+ if (!currentChat.default_banned_rights.send_gifs) {
+ count++;
+ }
+ if (!currentChat.default_banned_rights.send_media) {
+ count++;
+ }
+ if (!currentChat.default_banned_rights.embed_links) {
+ count++;
+ }
+ if (!currentChat.default_banned_rights.send_messages) {
+ count++;
+ }
+ if (!currentChat.default_banned_rights.pin_messages) {
+ count++;
+ }
+ if (!currentChat.default_banned_rights.send_polls) {
+ count++;
+ }
+ if (!currentChat.default_banned_rights.invite_users) {
+ count++;
+ }
+ if (!currentChat.default_banned_rights.change_info) {
+ count++;
+ }
+ } else {
+ count = 9;
+ }
+ blockCell.setTextAndValue(LocaleController.getString("ChannelPermissions", R.string.ChannelPermissions), count + " / 9", true);
}
- blockCell.setTextAndValue(LocaleController.getString("ChannelPermissions", R.string.ChannelPermissions), count + " / 9", true);
}
adminCell.setText(LocaleController.getString("ChannelAdministrators", R.string.ChannelAdministrators), true);
if (info.participants != null) {
@@ -1393,15 +1420,23 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
blockCell.setText(LocaleController.getString("ChannelBlacklist", R.string.ChannelBlacklist), logCell != null && logCell.getVisibility() == View.VISIBLE);
} else {
membersCell.setText(LocaleController.getString("ChannelMembers", R.string.ChannelMembers), logCell != null && logCell.getVisibility() == View.VISIBLE);
- blockCell.setText(LocaleController.getString("ChannelPermissions", R.string.ChannelPermissions), true);
+ if (currentChat.gigagroup) {
+ blockCell.setTextAndIcon(LocaleController.getString("ChannelBlacklist", R.string.ChannelBlacklist), R.drawable.actions_removed, logCell != null && logCell.getVisibility() == View.VISIBLE);
+ } else {
+ blockCell.setText(LocaleController.getString("ChannelPermissions", R.string.ChannelPermissions), true);
+ }
}
adminCell.setText(LocaleController.getString("ChannelAdministrators", R.string.ChannelAdministrators), true);
}
-// if (info != null && info.invitesCount >= 0) {
-// inviteLinksCell.setTextAndValueAndIcon(LocaleController.getString("InviteLinks", R.string.InviteLinks), Integer.toString(info.invitesCount), R.drawable.actions_link, true);
-// } else {
-// inviteLinksCell.setTextAndIcon(LocaleController.getString("InviteLinks", R.string.InviteLinks), R.drawable.actions_link, true);
-// }
+ if (info == null || !ChatObject.canUserDoAdminAction(currentChat, ChatObject.ACTION_INVITE) || (!isPrivate && currentChat.creator)) {
+ inviteLinksCell.setVisibility(View.GONE);
+ } else {
+ if (info.invitesCount > 0) {
+ inviteLinksCell.setTextAndValueAndIcon(LocaleController.getString("InviteLinks", R.string.InviteLinks), Integer.toString(info.invitesCount), R.drawable.actions_link, true);
+ } else {
+ inviteLinksCell.setTextAndValueAndIcon(LocaleController.getString("InviteLinks", R.string.InviteLinks), "1", R.drawable.actions_link, true);
+ }
+ }
}
if (stickersCell != null && info != null) {
@@ -1439,9 +1474,9 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
themeDescriptions.add(new ThemeDescription(adminCell, ThemeDescription.FLAG_SELECTOR, null, null, null, null, Theme.key_listSelector));
themeDescriptions.add(new ThemeDescription(adminCell, ThemeDescription.FLAG_TEXTCOLOR, new Class[]{TextCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteBlackText));
themeDescriptions.add(new ThemeDescription(adminCell, 0, new Class[]{TextCell.class}, new String[]{"imageView"}, null, null, null, Theme.key_windowBackgroundWhiteGrayIcon));
-// themeDescriptions.add(new ThemeDescription(inviteLinksCell, ThemeDescription.FLAG_SELECTOR, null, null, null, null, Theme.key_listSelector));
-// themeDescriptions.add(new ThemeDescription(inviteLinksCell, ThemeDescription.FLAG_TEXTCOLOR, new Class[]{TextCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteBlackText));
-// themeDescriptions.add(new ThemeDescription(inviteLinksCell, 0, new Class[]{TextCell.class}, new String[]{"imageView"}, null, null, null, Theme.key_windowBackgroundWhiteGrayIcon));
+ themeDescriptions.add(new ThemeDescription(inviteLinksCell, ThemeDescription.FLAG_SELECTOR, null, null, null, null, Theme.key_listSelector));
+ themeDescriptions.add(new ThemeDescription(inviteLinksCell, ThemeDescription.FLAG_TEXTCOLOR, new Class[]{TextCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteBlackText));
+ themeDescriptions.add(new ThemeDescription(inviteLinksCell, 0, new Class[]{TextCell.class}, new String[]{"imageView"}, null, null, null, Theme.key_windowBackgroundWhiteGrayIcon));
themeDescriptions.add(new ThemeDescription(blockCell, ThemeDescription.FLAG_SELECTOR, null, null, null, null, Theme.key_listSelector));
themeDescriptions.add(new ThemeDescription(blockCell, ThemeDescription.FLAG_TEXTCOLOR, new Class[]{TextCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteBlackText));
@@ -1501,6 +1536,14 @@ public class ChatEditActivity extends BaseFragment implements ImageUpdater.Image
themeDescriptions.add(new ThemeDescription(null, 0, null, null, null, cellDelegate, Theme.key_avatar_backgroundBlue));
themeDescriptions.add(new ThemeDescription(null, 0, null, null, null, cellDelegate, Theme.key_avatar_backgroundPink));
+ themeDescriptions.add(new ThemeDescription(undoView, ThemeDescription.FLAG_BACKGROUNDFILTER, null, null, null, null, Theme.key_undo_background));
+ themeDescriptions.add(new ThemeDescription(undoView, 0, new Class[]{UndoView.class}, new String[]{"undoImageView"}, null, null, null, Theme.key_undo_cancelColor));
+ themeDescriptions.add(new ThemeDescription(undoView, 0, new Class[]{UndoView.class}, new String[]{"undoTextView"}, null, null, null, Theme.key_undo_cancelColor));
+ themeDescriptions.add(new ThemeDescription(undoView, 0, new Class[]{UndoView.class}, new String[]{"infoTextView"}, null, null, null, Theme.key_undo_infoColor));
+ themeDescriptions.add(new ThemeDescription(undoView, 0, new Class[]{UndoView.class}, new String[]{"textPaint"}, null, null, null, Theme.key_undo_infoColor));
+ themeDescriptions.add(new ThemeDescription(undoView, 0, new Class[]{UndoView.class}, new String[]{"progressPaint"}, null, null, null, Theme.key_undo_infoColor));
+ themeDescriptions.add(new ThemeDescription(undoView, ThemeDescription.FLAG_IMAGECOLOR, new Class[]{UndoView.class}, new String[]{"leftImageView"}, null, null, null, Theme.key_undo_infoColor));
+
return themeDescriptions;
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatEditTypeActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatEditTypeActivity.java
index a517d09e7..a187d9255 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatEditTypeActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatEditTypeActivity.java
@@ -74,8 +74,8 @@ public class ChatEditTypeActivity extends BaseFragment implements NotificationCe
private LinearLayout publicContainer;
private LinearLayout privateContainer;
private LinkActionView permanentLinkView;
- // private TextCell manageLinksTextView;
- // private TextInfoPrivacyCell manageLinksInfoCell;
+ private TextCell manageLinksTextView;
+ private TextInfoPrivacyCell manageLinksInfoCell;
private TextSettingsCell shareQRCell;
private ShadowSectionCell sectionCell2;
private TextInfoPrivacyCell infoCell;
@@ -351,7 +351,7 @@ public class ChatEditTypeActivity extends BaseFragment implements NotificationCe
privateContainer.setOrientation(LinearLayout.VERTICAL);
linkContainer.addView(privateContainer, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
- permanentLinkView = new LinkActionView(context, this, null, chatId, true);
+ permanentLinkView = new LinkActionView(context, this, null, chatId, true, ChatObject.isChannel(currentChat));
permanentLinkView.setDelegate(new LinkActionView.Delegate() {
@Override
public void revokeLink() {
@@ -360,7 +360,7 @@ public class ChatEditTypeActivity extends BaseFragment implements NotificationCe
@Override
public void showUsersForPermanentLink() {
- inviteLinkBottomSheet = new InviteLinkBottomSheet(context, invite, info, usersMap, ChatEditTypeActivity.this, chatId, true);
+ inviteLinkBottomSheet = new InviteLinkBottomSheet(context, invite, info, usersMap, ChatEditTypeActivity.this, chatId, true, ChatObject.isChannel(currentChat));
inviteLinkBottomSheet.show();
}
});
@@ -398,23 +398,23 @@ public class ChatEditTypeActivity extends BaseFragment implements NotificationCe
linearLayout.addView(adminedInfoCell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
-// manageLinksTextView = new TextCell(context);
-// manageLinksTextView.setBackgroundDrawable(Theme.getSelectorDrawable(true));
-// manageLinksTextView.setOnClickListener(v -> {
-// if (invite == null) {
-// return;
-// }
-// });
-// manageLinksTextView.setTextAndIcon(LocaleController.getString("ManageInviteLinks", R.string.ManageInviteLinks), R.drawable.actions_link, false);
-// manageLinksTextView.setOnClickListener(v -> {
-// ManageLinksActivity fragment = new ManageLinksActivity(chatId);
-// fragment.setInfo(info, invite);
-// presentFragment(fragment);
-// });
-// linearLayout.addView(manageLinksTextView, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
-//
-// manageLinksInfoCell = new TextInfoPrivacyCell(context);
-// linearLayout.addView(manageLinksInfoCell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
+ manageLinksTextView = new TextCell(context);
+ manageLinksTextView.setBackgroundDrawable(Theme.getSelectorDrawable(true));
+ manageLinksTextView.setOnClickListener(v -> {
+ if (invite == null) {
+ return;
+ }
+ });
+ manageLinksTextView.setTextAndIcon(LocaleController.getString("ManageInviteLinks", R.string.ManageInviteLinks), R.drawable.actions_link, false);
+ manageLinksTextView.setOnClickListener(v -> {
+ ManageLinksActivity fragment = new ManageLinksActivity(chatId, 0, 0);
+ fragment.setInfo(info, invite);
+ presentFragment(fragment);
+ });
+ linearLayout.addView(manageLinksTextView, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
+
+ manageLinksInfoCell = new TextInfoPrivacyCell(context);
+ linearLayout.addView(manageLinksInfoCell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
if (!isPrivate && currentChat.username != null) {
ignoreTextChanges = true;
@@ -591,16 +591,16 @@ public class ChatEditTypeActivity extends BaseFragment implements NotificationCe
}
publicContainer.setVisibility(isPrivate ? View.GONE : View.VISIBLE);
privateContainer.setVisibility(isPrivate ? View.VISIBLE : View.GONE);
- //manageLinksTextView.setVisibility(isPrivate ? View.VISIBLE : View.GONE);
- // manageLinksInfoCell.setVisibility(isPrivate ? View.VISIBLE : View.GONE);
+ manageLinksTextView.setVisibility(View.VISIBLE);
+ manageLinksInfoCell.setVisibility(View.VISIBLE);
linkContainer.setPadding(0, 0, 0, isPrivate ? 0 : AndroidUtilities.dp(7));
permanentLinkView.setLink(invite != null ? invite.link : null);
permanentLinkView.loadUsers(invite, chatId);
checkTextView.setVisibility(!isPrivate && checkTextView.length() != 0 ? View.VISIBLE : View.GONE);
if (isPrivate) {
typeInfoCell.setBackgroundDrawable(Theme.getThemedDrawable(typeInfoCell.getContext(), R.drawable.greydivider, Theme.key_windowBackgroundGrayShadow));
- // manageLinksInfoCell.setBackground(Theme.getThemedDrawable(typeInfoCell.getContext(), R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow));
- // manageLinksInfoCell.setText(LocaleController.getString("ManageLinksInfoHelp", R.string.ManageLinksInfoHelp));
+ manageLinksInfoCell.setBackground(Theme.getThemedDrawable(typeInfoCell.getContext(), R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow));
+ manageLinksInfoCell.setText(LocaleController.getString("ManageLinksInfoHelp", R.string.ManageLinksInfoHelp));
} else {
typeInfoCell.setBackgroundDrawable(checkTextView.getVisibility() == View.VISIBLE ? null : Theme.getThemedDrawable(typeInfoCell.getContext(), R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow));
}
@@ -699,7 +699,7 @@ public class ChatEditTypeActivity extends BaseFragment implements NotificationCe
private void generateLink(final boolean newRequest) {
loadingInvite = true;
TLRPC.TL_messages_exportChatInvite req = new TLRPC.TL_messages_exportChatInvite();
- //req.legacy_revoke_permanent = true; TODO layer 124
+ req.legacy_revoke_permanent = true;
req.peer = getMessagesController().getInputPeer(-chatId);
final int reqId = getConnectionsManager().sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
if (error == null) {
@@ -742,7 +742,7 @@ public class ChatEditTypeActivity extends BaseFragment implements NotificationCe
}
permanentLinkView.updateColors();
- // manageLinksTextView.setBackgroundDrawable(Theme.getSelectorDrawable(true));
+ manageLinksTextView.setBackgroundDrawable(Theme.getSelectorDrawable(true));
if (inviteLinkBottomSheet != null) {
inviteLinkBottomSheet.updateColors();
}
@@ -783,9 +783,9 @@ public class ChatEditTypeActivity extends BaseFragment implements NotificationCe
themeDescriptions.add(new ThemeDescription(typeInfoCell, ThemeDescription.FLAG_CHECKTAG, new Class[]{TextInfoPrivacyCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteGrayText4));
themeDescriptions.add(new ThemeDescription(typeInfoCell, ThemeDescription.FLAG_CHECKTAG, new Class[]{TextInfoPrivacyCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteRedText4));
-// themeDescriptions.add(new ThemeDescription(manageLinksInfoCell, ThemeDescription.FLAG_BACKGROUNDFILTER, new Class[]{TextInfoPrivacyCell.class}, null, null, null, Theme.key_windowBackgroundGrayShadow));
-// themeDescriptions.add(new ThemeDescription(manageLinksInfoCell, ThemeDescription.FLAG_CHECKTAG, new Class[]{TextInfoPrivacyCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteGrayText4));
-// themeDescriptions.add(new ThemeDescription(manageLinksInfoCell, ThemeDescription.FLAG_CHECKTAG, new Class[]{TextInfoPrivacyCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteRedText4));
+ themeDescriptions.add(new ThemeDescription(manageLinksInfoCell, ThemeDescription.FLAG_BACKGROUNDFILTER, new Class[]{TextInfoPrivacyCell.class}, null, null, null, Theme.key_windowBackgroundGrayShadow));
+ themeDescriptions.add(new ThemeDescription(manageLinksInfoCell, ThemeDescription.FLAG_CHECKTAG, new Class[]{TextInfoPrivacyCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteGrayText4));
+ themeDescriptions.add(new ThemeDescription(manageLinksInfoCell, ThemeDescription.FLAG_CHECKTAG, new Class[]{TextInfoPrivacyCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteRedText4));
themeDescriptions.add(new ThemeDescription(adminedInfoCell, ThemeDescription.FLAG_BACKGROUNDFILTER, new Class[]{TextInfoPrivacyCell.class}, null, null, null, Theme.key_windowBackgroundGrayShadow));
themeDescriptions.add(new ThemeDescription(adminnedChannelsLayout, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_windowBackgroundWhite));
@@ -814,9 +814,9 @@ public class ChatEditTypeActivity extends BaseFragment implements NotificationCe
themeDescriptions.add(new ThemeDescription(null, 0, null, null, null, cellDelegate, Theme.key_avatar_backgroundBlue));
themeDescriptions.add(new ThemeDescription(null, 0, null, null, null, cellDelegate, Theme.key_avatar_backgroundPink));
-// themeDescriptions.add(new ThemeDescription(manageLinksTextView, ThemeDescription.FLAG_SELECTOR, null, null, null, null, Theme.key_listSelector));
-// themeDescriptions.add(new ThemeDescription(manageLinksTextView, ThemeDescription.FLAG_TEXTCOLOR, new Class[]{TextCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteBlackText));
-// themeDescriptions.add(new ThemeDescription(manageLinksTextView, 0, new Class[]{TextCell.class}, new String[]{"imageView"}, null, null, null, Theme.key_windowBackgroundWhiteGrayIcon));
+ themeDescriptions.add(new ThemeDescription(manageLinksTextView, ThemeDescription.FLAG_SELECTOR, null, null, null, null, Theme.key_listSelector));
+ themeDescriptions.add(new ThemeDescription(manageLinksTextView, ThemeDescription.FLAG_TEXTCOLOR, new Class[]{TextCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteBlackText));
+ themeDescriptions.add(new ThemeDescription(manageLinksTextView, 0, new Class[]{TextCell.class}, new String[]{"imageView"}, null, null, null, Theme.key_windowBackgroundWhiteGrayIcon));
return themeDescriptions;
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java
index 264ffa0cc..f33214866 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java
@@ -954,12 +954,20 @@ public class ChatRightsEditActivity extends BaseFragment {
} else {
adminRights.post_messages = adminRights.edit_messages = false;
}
+ if (!adminRights.change_info && !adminRights.post_messages && !adminRights.edit_messages &&
+ !adminRights.delete_messages && !adminRights.ban_users && !adminRights.invite_users &&
+ !adminRights.pin_messages && !adminRights.add_admins && !adminRights.anonymous && !adminRights.manage_call) {
+ adminRights.other = true;
+ } else {
+ adminRights.other = false;
+ }
MessagesController.getInstance(currentAccount).setUserAdminRole(chatId, currentUser, adminRights, currentRank, isChannel, getFragmentForAlert(1), isAddingNew);
if (delegate != null) {
delegate.didSetRights(
adminRights.change_info || adminRights.post_messages || adminRights.edit_messages ||
adminRights.delete_messages || adminRights.ban_users || adminRights.invite_users ||
- adminRights.pin_messages || adminRights.add_admins || adminRights.anonymous || adminRights.manage_call ? 1 : 0, adminRights, bannedRights, currentRank);
+ adminRights.pin_messages || adminRights.add_admins || adminRights.anonymous || adminRights.manage_call ||
+ adminRights.other ? 1 : 0, adminRights, bannedRights, currentRank);
}
} else if (currentType == TYPE_BANNED) {
MessagesController.getInstance(currentAccount).setUserBannedRole(chatId, currentUser, bannedRights, isChannel, getFragmentForAlert(1));
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java
index a10e462c1..71820530a 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java
@@ -37,7 +37,6 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
-import android.widget.Toast;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.DiffUtil;
@@ -74,6 +73,7 @@ import org.telegram.ui.Cells.TextInfoPrivacyCell;
import org.telegram.ui.Cells.TextSettingsCell;
import org.telegram.ui.Components.BulletinFactory;
import org.telegram.ui.Components.FlickerLoadingView;
+import org.telegram.ui.Components.GigagroupConvertAlert;
import org.telegram.ui.Components.IntSeekBarAccessibilityDelegate;
import org.telegram.ui.Components.LayoutHelper;
import org.telegram.ui.Components.RadialProgressView;
@@ -130,6 +130,10 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
private int addUsersRow;
private int pinMessagesRow;
+ private int gigaHeaderRow;
+ private int gigaConvertRow;
+ private int gigaInfoRow;
+
private int recentActionsRow;
private int addNewRow;
private int addNew2Row;
@@ -443,6 +447,9 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
participantsStartRow = -1;
participantsDividerRow = -1;
participantsDivider2Row = -1;
+ gigaInfoRow = -1;
+ gigaConvertRow = -1;
+ gigaHeaderRow = -1;
participantsEndRow = -1;
participantsInfoRow = -1;
blockedEmptyRow = -1;
@@ -479,16 +486,29 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
sendMessagesRow = rowCount++;
sendMediaRow = rowCount++;
sendStickersRow = rowCount++;
- sendGamesRow = rowCount ++;
- sendInlineRow = rowCount ++;
+ sendGamesRow = rowCount++;
+ sendInlineRow = rowCount++;
sendGifsRow = rowCount++;
sendPollsRow = rowCount++;
embedLinksRow = rowCount++;
addUsersRow = rowCount++;
pinMessagesRow = rowCount++;
changeInfoRow = rowCount++;
- if (!ChatObject.isChannel(currentChat) && currentChat.creator || currentChat.megagroup && ChatObject.canBlockUsers(currentChat)) {
- participantsDivider2Row = rowCount++;
+
+ if (ChatObject.isChannel(currentChat) && currentChat.creator && currentChat.megagroup && !currentChat.gigagroup) {
+ int count = Math.max(currentChat.participants_count, info != null ? info.participants_count : 0);
+ if (count >= getMessagesController().maxMegagroupCount - 1000) {
+ participantsDivider2Row = rowCount++;
+ gigaHeaderRow = rowCount++;
+ gigaConvertRow = rowCount++;
+ gigaInfoRow = rowCount++;
+ }
+ }
+
+ if (!ChatObject.isChannel(currentChat) && currentChat.creator || currentChat.megagroup && !currentChat.gigagroup && ChatObject.canBlockUsers(currentChat)) {
+ if (participantsDivider2Row == -1) {
+ participantsDivider2Row = rowCount++;
+ }
slowmodeRow = rowCount++;
slowmodeSelectRow = rowCount++;
slowmodeInfoRow = rowCount++;
@@ -499,14 +519,20 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
}
removedUsersRow = rowCount++;
}
- if (slowmodeInfoRow == -1 || removedUsersRow != -1) {
+ if (slowmodeInfoRow == -1 && gigaHeaderRow == -1 || removedUsersRow != -1) {
participantsDividerRow = rowCount++;
}
if (ChatObject.canBlockUsers(currentChat)) {
addNewRow = rowCount++;
}
- if (!(loadingUsers && !firstLoaded)) {
+ if (loadingUsers && !firstLoaded) {
+ if (!firstLoaded) {
+ if (info != null && info.banned_count > 0) {
+ loadingUserCellRow = rowCount++;
+ }
+ }
+ } else {
if (!participants.isEmpty()) {
participantsStartRow = rowCount;
rowCount += participants.size();
@@ -515,10 +541,6 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
if (addNewRow != -1 || participantsStartRow != -1) {
addNewSectionRow = rowCount++;
}
- } else if (!firstLoaded) {
- if (info != null && info.banned_count > 0) {
- loadingUserCellRow = rowCount++;
- }
}
} else if (type == TYPE_BANNED) {
if (ChatObject.canBlockUsers(currentChat)) {
@@ -541,7 +563,7 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
addNewSectionRow = rowCount++;
}
} else {
- restricted1SectionRow = rowCount++;
+ //restricted1SectionRow = rowCount++;
blockedEmptyRow = rowCount++;
}
} else if (!firstLoaded) {
@@ -549,8 +571,8 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
loadingUserCellRow = rowCount++;
}
} else if (type == TYPE_ADMIN) {
- if (ChatObject.isChannel(currentChat) && currentChat.megagroup && (info == null || info.participants_count <= 200)
- && ChatObject.hasAdminRights(currentChat)) {
+ if (ChatObject.isChannel(currentChat) && currentChat.megagroup && !currentChat.gigagroup && (info == null || info.participants_count <= 200)
+ && ChatObject.hasAdminRights(currentChat)) {
recentActionsRow = rowCount++;
addNewSectionRow = rowCount++;
}
@@ -763,7 +785,7 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
listView.setLayoutManager(layoutManager = new LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) {
@Override
public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler, RecyclerView.State state) {
- if (!firstLoaded && type != TYPE_KICKED) {
+ if (!firstLoaded && type == TYPE_BANNED && participants.size() == 0) {
return 0;
}
return super.scrollVerticallyBy(dy, recycler, state);
@@ -795,6 +817,26 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
public long getAddDuration() {
return 220;
}
+
+ int animationIndex = -1;
+
+ @Override
+ protected void onAllAnimationsDone() {
+ super.onAllAnimationsDone();
+ getNotificationCenter().onAnimationFinish(animationIndex);
+ }
+
+ @Override
+ public void runPendingAnimations() {
+ boolean removalsPending = !mPendingRemovals.isEmpty();
+ boolean movesPending = !mPendingMoves.isEmpty();
+ boolean changesPending = !mPendingChanges.isEmpty();
+ boolean additionsPending = !mPendingAdditions.isEmpty();
+ if (removalsPending || movesPending || additionsPending || changesPending) {
+ animationIndex = getNotificationCenter().setAnimationInProgress(animationIndex, null);
+ }
+ super.runPendingAnimations();
+ }
};
listView.setItemAnimator(itemAnimator);
itemAnimator.setSupportsChangeAnimations(false);
@@ -959,6 +1001,35 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
fragment.setInfo(info);
presentFragment(fragment);
return;
+ } else if (position == gigaConvertRow) {
+ showDialog(new GigagroupConvertAlert(getParentActivity(), ChatUsersActivity.this) {
+ @Override
+ protected void onCovert() {
+ getMessagesController().convertToGigaGroup(getParentActivity(), currentChat, ChatUsersActivity.this, (result) -> {
+ if (result && parentLayout != null) {
+ BaseFragment editActivity = parentLayout.fragmentsStack.get(parentLayout.fragmentsStack.size() - 2);
+ if (editActivity instanceof ChatEditActivity) {
+ editActivity.removeSelfFromStack();
+
+ Bundle args = new Bundle();
+ args.putInt("chat_id", chatId);
+ ChatEditActivity fragment = new ChatEditActivity(args);
+ fragment.setInfo(info);
+ parentLayout.addFragmentToStack(fragment, parentLayout.fragmentsStack.size() - 1);
+ finishFragment();
+ fragment.showConvertTooltip();
+ } else {
+ finishFragment();
+ }
+ }
+ });
+ }
+
+ @Override
+ protected void onCancel() {
+
+ }
+ });
} else if (position == addNew2Row) {
presentFragment(new GroupInviteActivity(chatId));
return;
@@ -969,9 +1040,9 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
}
if (checkCell.hasIcon()) {
if (!TextUtils.isEmpty(currentChat.username) && (position == pinMessagesRow || position == changeInfoRow)) {
- Toast.makeText(getParentActivity(), LocaleController.getString("EditCantEditPermissionsPublic", R.string.EditCantEditPermissionsPublic), Toast.LENGTH_SHORT).show();
+ BulletinFactory.of(this).createErrorBulletin(LocaleController.getString("EditCantEditPermissionsPublic", R.string.EditCantEditPermissionsPublic)).show();
} else {
- Toast.makeText(getParentActivity(), LocaleController.getString("EditCantEditPermissions", R.string.EditCantEditPermissions), Toast.LENGTH_SHORT).show();
+ BulletinFactory.of(this).createErrorBulletin(LocaleController.getString("EditCantEditPermissions", R.string.EditCantEditPermissions)).show();
}
return;
}
@@ -1719,7 +1790,7 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
getMessagesController().deleteUserFromChat(chatId, user, null);
removeParticipants(userId);
if (currentChat != null && user != null && BulletinFactory.canShowBulletin(this)) {
- BulletinFactory.createRemoveFromChatBulletin(this, user.first_name, currentChat.title).show();
+ BulletinFactory.createRemoveFromChatBulletin(this, user, currentChat.title).show();
}
} else {
if (actions.get(i) == 1 && canEditAdmin && (participant instanceof TLRPC.TL_channelParticipantAdmin || participant instanceof TLRPC.TL_chatParticipantAdmin)) {
@@ -3109,6 +3180,8 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
} else {
privacyCell.setText(LocaleController.formatString("SlowmodeInfoSelected", R.string.SlowmodeInfoSelected, formatSeconds(seconds)));
}
+ } else if (position == gigaInfoRow) {
+ privacyCell.setText(LocaleController.getString("BroadcastGroupConvertInfo", R.string.BroadcastGroupConvertInfo));
}
break;
case 2:
@@ -3137,6 +3210,9 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
actionCell.setText(LocaleController.getString("EventLog", R.string.EventLog), null, R.drawable.baseline_content_copy_24, false);
} else if (position == addNew2Row) {
actionCell.setText(LocaleController.getString("ChannelInviteViaLink", R.string.ChannelInviteViaLink), null, R.drawable.profile_link, true);
+ } else if (position == gigaConvertRow) {
+ actionCell.setColors(Theme.key_windowBackgroundWhiteBlueIcon, Theme.key_windowBackgroundWhiteBlueButton);
+ actionCell.setText(LocaleController.getString("BroadcastGroupConvert", R.string.BroadcastGroupConvert), null, R.drawable.msg_channel, false);
}
break;
case 3:
@@ -3163,6 +3239,8 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
headerCell.setText(LocaleController.getString("ChannelPermissionsHeader", R.string.ChannelPermissionsHeader));
} else if (position == slowmodeRow) {
headerCell.setText(LocaleController.getString("Slowmode", R.string.Slowmode));
+ } else if (position == gigaHeaderRow) {
+ headerCell.setText(LocaleController.getString("BroadcastGroup", R.string.BroadcastGroup));
}
break;
case 6:
@@ -3253,7 +3331,7 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
@Override
public int getItemViewType(int position) {
- if (position == addNewRow || position == addNew2Row || position == recentActionsRow) {
+ if (position == addNewRow || position == addNew2Row || position == recentActionsRow || position == gigaConvertRow) {
return 2;
} else if (position >= participantsStartRow && position < participantsEndRow ||
position >= botStartRow && position < botEndRow ||
@@ -3261,9 +3339,9 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
return 0;
} else if (position == addNewSectionRow || position == participantsDividerRow || position == participantsDivider2Row) {
return 3;
- } else if (position == restricted1SectionRow || position == permissionsSectionRow || position == slowmodeRow) {
+ } else if (position == restricted1SectionRow || position == permissionsSectionRow || position == slowmodeRow || position == gigaHeaderRow) {
return 5;
- } else if (position == participantsInfoRow || position == slowmodeInfoRow) {
+ } else if (position == participantsInfoRow || position == slowmodeInfoRow || position == gigaInfoRow) {
return 1;
} else if (position == blockedEmptyRow) {
return 4;
@@ -3404,6 +3482,9 @@ public class ChatUsersActivity extends BaseFragment implements NotificationCente
put(++pointer, restricted1SectionRow, sparseIntArray);
put(++pointer, participantsDividerRow, sparseIntArray);
put(++pointer, participantsDivider2Row, sparseIntArray);
+ put(++pointer, gigaHeaderRow, sparseIntArray);
+ put(++pointer, gigaConvertRow, sparseIntArray);
+ put(++pointer, gigaInfoRow, sparseIntArray);
put(++pointer, participantsInfoRow, sparseIntArray);
put(++pointer, blockedEmptyRow, sparseIntArray);
put(++pointer, permissionsSectionRow, sparseIntArray);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatsWidgetConfigActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatsWidgetConfigActivity.java
new file mode 100644
index 000000000..cd502ffff
--- /dev/null
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatsWidgetConfigActivity.java
@@ -0,0 +1,58 @@
+package org.telegram.ui;
+
+import android.appwidget.AppWidgetManager;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import org.telegram.messenger.AndroidUtilities;
+
+public class ChatsWidgetConfigActivity extends ExternalActionActivity {
+
+ private int creatingAppWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
+
+ @Override
+ protected boolean handleIntent(Intent intent, boolean isNew, boolean restore, boolean fromPassword, int intentAccount, int state) {
+ if (!checkPasscode(intent, isNew, restore, fromPassword, intentAccount, state)) {
+ return false;
+ }
+ Bundle extras = intent.getExtras();
+ if (extras != null) {
+ creatingAppWidgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
+ }
+ if (creatingAppWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID) {
+ Bundle args = new Bundle();
+ args.putBoolean("onlySelect", true);
+ args.putInt("dialogsType", 10);
+ args.putBoolean("allowSwitchAccount", true);
+ EditWidgetActivity fragment = new EditWidgetActivity(EditWidgetActivity.TYPE_CHATS, creatingAppWidgetId, false);
+ fragment.setDelegate(dialogs -> {
+ Intent resultValue = new Intent();
+ resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, creatingAppWidgetId);
+ setResult(RESULT_OK, resultValue);
+ finish();
+ });
+
+ if (AndroidUtilities.isTablet()) {
+ if (layersActionBarLayout.fragmentsStack.isEmpty()) {
+ layersActionBarLayout.addFragmentToStack(fragment);
+ }
+ } else {
+ if (actionBarLayout.fragmentsStack.isEmpty()) {
+ actionBarLayout.addFragmentToStack(fragment);
+ }
+ }
+ if (!AndroidUtilities.isTablet()) {
+ backgroundTablet.setVisibility(View.GONE);
+ }
+ actionBarLayout.showLastFragment();
+ if (AndroidUtilities.isTablet()) {
+ layersActionBarLayout.showLastFragment();
+ }
+ intent.setAction(null);
+ } else {
+ finish();
+ }
+ return true;
+ }
+}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/AdminLogFilterAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/AdminLogFilterAlert.java
index b1cfedcb1..36af11242 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/AdminLogFilterAlert.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/AdminLogFilterAlert.java
@@ -22,6 +22,9 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.MessagesController;
@@ -37,9 +40,6 @@ import org.telegram.ui.ContentPreviewViewer;
import java.util.ArrayList;
import java.util.regex.Pattern;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
public class AdminLogFilterAlert extends BottomSheet {
public interface AdminLogFilterAlertDelegate {
@@ -67,6 +67,7 @@ public class AdminLogFilterAlert extends BottomSheet {
private int restrictionsRow;
private int adminsRow;
private int membersRow;
+ private int invitesRow;
private int infoRow;
private int deleteRow;
private int editRow;
@@ -94,6 +95,7 @@ public class AdminLogFilterAlert extends BottomSheet {
currentFilter.edit = filter.edit;
currentFilter.delete = filter.delete;
currentFilter.group_call = filter.group_call;
+ currentFilter.invites = filter.invites;
}
if (admins != null) {
selectedAdmins = admins.clone();
@@ -108,6 +110,7 @@ public class AdminLogFilterAlert extends BottomSheet {
}
adminsRow = rowCount++;
membersRow = rowCount++;
+ invitesRow = rowCount++;
infoRow = rowCount++;
deleteRow = rowCount++;
editRow = rowCount++;
@@ -117,8 +120,12 @@ public class AdminLogFilterAlert extends BottomSheet {
pinnedRow = -1;
}
leavingRow = rowCount++;
- callsRow = rowCount;
- rowCount += 2;
+ if (isMegagroup) {
+ callsRow = rowCount++;
+ } else {
+ callsRow = -1;
+ }
+ rowCount += 1;
allAdminsRow = rowCount;
shadowDrawable = context.getResources().getDrawable(R.drawable.sheet_shadow_round).mutate();
@@ -147,7 +154,7 @@ public class AdminLogFilterAlert extends BottomSheet {
height -= AndroidUtilities.statusBarHeight;
}
int measuredWidth = getMeasuredWidth();
- int contentSize = AndroidUtilities.dp(48) + (isMegagroup ? 10 : 7) * AndroidUtilities.dp(48) + backgroundPaddingTop;
+ int contentSize = AndroidUtilities.dp(48) + (isMegagroup ? 11 : 7) * AndroidUtilities.dp(48) + backgroundPaddingTop + AndroidUtilities.dp(17);
if (currentAdmins != null) {
contentSize += (currentAdmins.size() + 1) * AndroidUtilities.dp(48) + AndroidUtilities.dp(20);
}
@@ -226,9 +233,9 @@ public class AdminLogFilterAlert extends BottomSheet {
if (isChecked) {
currentFilter = new TLRPC.TL_channelAdminLogEventsFilter();
currentFilter.join = currentFilter.leave = currentFilter.invite = currentFilter.ban =
- currentFilter.unban = currentFilter.kick = currentFilter.unkick = currentFilter.promote =
- currentFilter.demote = currentFilter.info = currentFilter.settings = currentFilter.pinned =
- currentFilter.edit = currentFilter.delete = currentFilter.group_call = false;
+ currentFilter.unban = currentFilter.kick = currentFilter.unkick = currentFilter.promote =
+ currentFilter.demote = currentFilter.info = currentFilter.settings = currentFilter.pinned =
+ currentFilter.edit = currentFilter.delete = currentFilter.group_call = currentFilter.invites = false;
} else {
currentFilter = null;
}
@@ -261,9 +268,9 @@ public class AdminLogFilterAlert extends BottomSheet {
if (currentFilter == null) {
currentFilter = new TLRPC.TL_channelAdminLogEventsFilter();
currentFilter.join = currentFilter.leave = currentFilter.invite = currentFilter.ban =
- currentFilter.unban = currentFilter.kick = currentFilter.unkick = currentFilter.promote =
- currentFilter.demote = currentFilter.info = currentFilter.settings = currentFilter.pinned =
- currentFilter.edit = currentFilter.delete = currentFilter.group_call = true;
+ currentFilter.unban = currentFilter.kick = currentFilter.unkick = currentFilter.promote =
+ currentFilter.demote = currentFilter.info = currentFilter.settings = currentFilter.pinned =
+ currentFilter.edit = currentFilter.delete = currentFilter.group_call = currentFilter.invites = true;
RecyclerView.ViewHolder holder = listView.findViewHolderForAdapterPosition(0);
if (holder != null) {
((CheckBoxCell) holder.itemView).setChecked(false, true);
@@ -287,14 +294,15 @@ public class AdminLogFilterAlert extends BottomSheet {
currentFilter.leave = !currentFilter.leave;
} else if (position == callsRow) {
currentFilter.group_call = !currentFilter.group_call;
+ } else if (position == invitesRow) {
+ currentFilter.invites = !currentFilter.invites;
}
}
- if (currentFilter != null && !currentFilter.join && !currentFilter.leave &&
- !currentFilter.leave && !currentFilter.invite && !currentFilter.ban &&
- !currentFilter.unban && !currentFilter.kick && !currentFilter.unkick &&
- !currentFilter.promote && !currentFilter.demote && !currentFilter.info &&
- !currentFilter.settings && !currentFilter.pinned && !currentFilter.edit &&
- !currentFilter.delete && !currentFilter.group_call) {
+ if (currentFilter != null &&
+ !currentFilter.join && !currentFilter.leave && !currentFilter.invite && !currentFilter.ban &&
+ !currentFilter.invites && !currentFilter.unban && !currentFilter.kick && !currentFilter.unkick &&
+ !currentFilter.promote && !currentFilter.demote && !currentFilter.info && !currentFilter.settings &&
+ !currentFilter.pinned && !currentFilter.edit && !currentFilter.delete && !currentFilter.group_call) {
saveButton.setEnabled(false);
saveButton.setAlpha(0.5f);
} else {
@@ -386,7 +394,7 @@ public class AdminLogFilterAlert extends BottomSheet {
@Override
public int getItemCount() {
- return (isMegagroup ? 10 : 7) + (currentAdmins != null ? 2 + currentAdmins.size() : 0);
+ return (isMegagroup ? 11 : 7) + (currentAdmins != null ? 2 + currentAdmins.size() : 0);
}
@Override
@@ -452,6 +460,8 @@ public class AdminLogFilterAlert extends BottomSheet {
cell.setChecked(currentFilter == null || currentFilter.leave, false);
} else if (position == callsRow) {
cell.setChecked(currentFilter == null || currentFilter.group_call, false);
+ } else if (position == invitesRow) {
+ cell.setChecked(currentFilter == null || currentFilter.invites, false);
} else if (position == allAdminsRow) {
cell.setChecked(selectedAdmins == null, false);
}
@@ -492,9 +502,11 @@ public class AdminLogFilterAlert extends BottomSheet {
} else if (position == pinnedRow) {
cell.setText(LocaleController.getString("EventLogFilterPinnedMessages", R.string.EventLogFilterPinnedMessages), "", currentFilter == null || currentFilter.pinned, true);
} else if (position == leavingRow) {
- cell.setText(LocaleController.getString("EventLogFilterLeavingMembers", R.string.EventLogFilterLeavingMembers), "", currentFilter == null || currentFilter.leave, true);
+ cell.setText(LocaleController.getString("EventLogFilterLeavingMembers", R.string.EventLogFilterLeavingMembers), "", currentFilter == null || currentFilter.leave, callsRow != -1);
} else if (position == callsRow) {
cell.setText(LocaleController.getString("EventLogFilterCalls", R.string.EventLogFilterCalls), "", currentFilter == null || currentFilter.group_call, false);
+ } else if (position == invitesRow) {
+ cell.setText(LocaleController.getString("EventLogFilterInvites", R.string.EventLogFilterInvites), "", currentFilter == null || currentFilter.invites, true);
} else if (position == allAdminsRow) {
cell.setText(LocaleController.getString("EventLogAllAdmins", R.string.EventLogAllAdmins), "", selectedAdmins == null, true);
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
index 94c7f3f33..20d270fae 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
@@ -92,7 +92,6 @@ import org.telegram.ui.LaunchActivity;
import org.telegram.ui.NotificationsCustomSettingsActivity;
import org.telegram.ui.NotificationsSettingsActivity;
import org.telegram.ui.ProfileNotificationsActivity;
-import org.telegram.ui.ReportOtherActivity;
import org.telegram.ui.ThemePreviewActivity;
import org.telegram.ui.TooManyCommunitiesActivity;
@@ -117,7 +116,7 @@ public class AlertsCreator {
if (error.code == 406 || error.text == null) {
return null;
}
- if (request instanceof TLRPC.TL_messages_initHistoryImport || request instanceof TLRPC.TL_messages_checkHistoryImport || request instanceof TLRPC.TL_messages_startHistoryImport) {
+ if (request instanceof TLRPC.TL_messages_initHistoryImport || request instanceof TLRPC.TL_messages_checkHistoryImportPeer || request instanceof TLRPC.TL_messages_checkHistoryImport || request instanceof TLRPC.TL_messages_startHistoryImport) {
TLRPC.InputPeer peer;
if (request instanceof TLRPC.TL_messages_initHistoryImport) {
peer = ((TLRPC.TL_messages_initHistoryImport) request).peer;
@@ -140,6 +139,8 @@ public class AlertsCreator {
showSimpleAlert(fragment, LocaleController.getString("ImportErrorTitle", R.string.ImportErrorTitle), LocaleController.getString("ImportErrorNotAdmin", R.string.ImportErrorNotAdmin));
} else if (error.text.startsWith("IMPORT_FORMAT")) {
showSimpleAlert(fragment, LocaleController.getString("ImportErrorTitle", R.string.ImportErrorTitle), LocaleController.getString("ImportErrorFileFormatInvalid", R.string.ImportErrorFileFormatInvalid));
+ } else if (error.text.startsWith("PEER_ID_INVALID")) {
+ showSimpleAlert(fragment, LocaleController.getString("ImportErrorTitle", R.string.ImportErrorTitle), LocaleController.getString("ImportErrorPeerInvalid", R.string.ImportErrorPeerInvalid));
} else if (error.text.contains("IMPORT_LANG_NOT_FOUND")) {
showSimpleAlert(fragment, LocaleController.getString("ImportErrorTitle", R.string.ImportErrorTitle), LocaleController.getString("ImportErrorFileLang", R.string.ImportErrorFileLang));
} else if (error.text.contains("IMPORT_UPLOAD_FAILED")) {
@@ -233,6 +234,8 @@ public class AlertsCreator {
showSimpleAlert(fragment, LocaleController.getString("JoinToGroupErrorFull", R.string.JoinToGroupErrorFull));
} else if (error.text.equals("CHANNELS_TOO_MUCH")) {
fragment.presentFragment(new TooManyCommunitiesActivity(TooManyCommunitiesActivity.TYPE_JOIN));
+ } else if (error.text.equals("INVITE_HASH_EXPIRED")) {
+ showSimpleAlert(fragment, LocaleController.getString("ExpiredLink", R.string.ExpiredLink), LocaleController.getString("InviteExpired", R.string.InviteExpired));
} else {
showSimpleAlert(fragment, LocaleController.getString("JoinToGroupErrorNotExist", R.string.JoinToGroupErrorNotExist));
}
@@ -579,7 +582,13 @@ public class AlertsCreator {
if (cells[0].isChecked()) {
request.report_spam = true;
if (fragment.getParentActivity() != null) {
- Toast.makeText(fragment.getParentActivity(), LocaleController.getString("ReportChatSent", R.string.ReportChatSent), Toast.LENGTH_SHORT).show();
+ if (fragment instanceof ChatActivity) {
+ fragment.getUndoView().showWithAction(0, UndoView.ACTION_REPORT_SENT, null);
+ } else if (fragment != null) {
+ BulletinFactory.of(fragment).createReportSent().show();
+ } else {
+ Toast.makeText(fragment.getParentActivity(), LocaleController.getString("ReportChatSent", R.string.ReportChatSent), Toast.LENGTH_SHORT).show();
+ }
}
}
accountInstance.getConnectionsManager().sendRequest(request, (response, error) -> {
@@ -1088,7 +1097,7 @@ public class AlertsCreator {
}
}
- public static void createImportDialogAlert(BaseFragment fragment, String title, TLRPC.User user, TLRPC.Chat chat, Runnable onProcessRunnable) {
+ public static void createImportDialogAlert(BaseFragment fragment, String title, String message, TLRPC.User user, TLRPC.Chat chat, Runnable onProcessRunnable) {
if (fragment == null || fragment.getParentActivity() == null || chat == null && user == null) {
return;
}
@@ -1122,7 +1131,7 @@ public class AlertsCreator {
textView.setSingleLine(true);
textView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.CENTER_VERTICAL);
textView.setEllipsize(TextUtils.TruncateAt.END);
- textView.setText(LocaleController.formatString("ImportMessages", R.string.ImportMessages));
+ textView.setText(LocaleController.getString("ImportMessages", R.string.ImportMessages));
frameLayout.addView(textView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.TOP, (LocaleController.isRTL ? 21 : 76), 11, (LocaleController.isRTL ? 76 : 21), 0));
frameLayout.addView(messageTextView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.TOP, 24, 57, 24, 9));
@@ -1146,7 +1155,8 @@ public class AlertsCreator {
imageView.setImage(ImageLocation.getForChat(chat, false), "50_50", avatarDrawable, chat);
}
- if (chat != null) {
+ messageTextView.setText(AndroidUtilities.replaceTags(message));
+ /*if (chat != null) {
if (TextUtils.isEmpty(title)) {
messageTextView.setText(AndroidUtilities.replaceTags(LocaleController.formatString("ImportToChatNoTitle", R.string.ImportToChatNoTitle, chat.title)));
} else {
@@ -1158,7 +1168,7 @@ public class AlertsCreator {
} else {
messageTextView.setText(AndroidUtilities.replaceTags(LocaleController.formatString("ImportToUser", R.string.ImportToUser, title, ContactsController.formatName(user.first_name, user.last_name))));
}
- }
+ }*/
builder.setPositiveButton(LocaleController.getString("Import", R.string.Import), (dialogInterface, i) -> {
if (onProcessRunnable != null) {
@@ -1271,13 +1281,10 @@ public class AlertsCreator {
final boolean[] deleteForAll = {true};
boolean deleteChatForAll = false;
- if (!second && (secret || canDeleteInbox) && !UserObject.isDeleted(user) || (deleteChatForAll = checkDeleteForAll && !clear && chat != null && chat.creator)) {
+ if (!second && (secret && !clear || canDeleteInbox) && !UserObject.isDeleted(user) || (deleteChatForAll = checkDeleteForAll && !clear && chat != null && chat.creator)) {
cell[0] = new CheckBoxCell(context, 1);
cell[0].setBackgroundDrawable(Theme.getSelectorDrawable(false));
- if (secret) {
- cell[0].setText(LocaleController.formatString("DeleteForUser", R.string.DeleteForUser, UserObject.getFirstName(user)), "", deleteForAll[0], false);
- } else if (deleteChatForAll) {
- deleteForAll[0] = false;
+ if (deleteChatForAll) {
if (ChatObject.isChannel(chat) && !chat.megagroup) {
cell[0].setText(LocaleController.getString("DeleteChannelForAll", R.string.DeleteChannelForAll), "", deleteForAll[0], false);
} else {
@@ -2419,6 +2426,29 @@ public class AlertsCreator {
return builder.create();
}
+ public static void sendReport(TLRPC.InputPeer peer, int type, String message, ArrayList messages) {
+ TLRPC.TL_messages_report request = new TLRPC.TL_messages_report();
+ request.peer = peer;
+ request.id.addAll(messages);
+ request.message = message;
+ if (type == 0) {
+ request.reason = new TLRPC.TL_inputReportReasonSpam();
+ } else if (type == 1) {
+ request.reason = new TLRPC.TL_inputReportReasonFake();
+ } else if (type == 2) {
+ request.reason = new TLRPC.TL_inputReportReasonViolence();
+ } else if (type == 3) {
+ request.reason = new TLRPC.TL_inputReportReasonChildAbuse();
+ } else if (type == 4) {
+ request.reason = new TLRPC.TL_inputReportReasonPornography();
+ } else if (type == 5) {
+ request.reason = new TLRPC.TL_inputReportReasonOther();
+ }
+ ConnectionsManager.getInstance(UserConfig.selectedAccount).sendRequest(request, (response, error) -> {
+
+ });
+ }
+
public static void createReportAlert(final Context context, final long dialog_id, final int messageId, final BaseFragment parentFragment) {
if (context == null || parentFragment == null) {
return;
@@ -2427,6 +2457,7 @@ public class AlertsCreator {
BottomBuilder builder = new BottomBuilder(context);
builder.addTitle(LocaleController.getString("ReportChat", R.string.ReportChat), true);
String[] items;
+ int[] icons;
if (messageId != 0) {
items = new String[]{
LocaleController.getString("ReportChatSpam", R.string.ReportChatSpam),
@@ -2435,6 +2466,13 @@ public class AlertsCreator {
LocaleController.getString("ReportChatPornography", R.string.ReportChatPornography),
LocaleController.getString("ReportChatOther", R.string.ReportChatOther)
};
+ icons = new int[]{
+ R.drawable.msg_report_spam,
+ R.drawable.msg_report_violence,
+ R.drawable.msg_report_abuse,
+ R.drawable.msg_report_xxx,
+ R.drawable.msg_report_other
+ };
} else {
items = new String[]{
LocaleController.getString("ReportChatSpam", R.string.ReportChatSpam),
@@ -2444,53 +2482,81 @@ public class AlertsCreator {
LocaleController.getString("ReportChatPornography", R.string.ReportChatPornography),
LocaleController.getString("ReportChatOther", R.string.ReportChatOther)
};
+ icons = new int[]{
+ R.drawable.msg_report_spam,
+ R.drawable.msg_report_fake,
+ R.drawable.msg_report_violence,
+ R.drawable.msg_report_abuse,
+ R.drawable.msg_report_xxx,
+ R.drawable.msg_report_other
+ };
}
builder.addItems(items, null, (i, text, cell) -> {
- if (i == 4) {
- Bundle args = new Bundle();
- args.putLong("dialog_id", dialog_id);
- args.putLong("message_id", messageId);
- parentFragment.presentFragment(new ReportOtherActivity(args));
- return Unit.INSTANCE;
- }
- TLObject req;
- TLRPC.InputPeer peer = MessagesController.getInstance(UserConfig.selectedAccount).getInputPeer((int) dialog_id);
- if (messageId != 0) {
- TLRPC.TL_messages_report request = new TLRPC.TL_messages_report();
- request.peer = peer;
- request.id.add(messageId);
- if (i == 0) {
- request.reason = new TLRPC.TL_inputReportReasonSpam();
- } else if (i == 1) {
- request.reason = new TLRPC.TL_inputReportReasonViolence();
- } else if (i == 2) {
- request.reason = new TLRPC.TL_inputReportReasonChildAbuse();
- } else if (i == 3) {
- request.reason = new TLRPC.TL_inputReportReasonPornography();
+ if (messageId == 0 && (i == 0 || i == 2 || i == 3 || i == 4) && parentFragment instanceof ChatActivity) {
+ ((ChatActivity) parentFragment).openReportChat(i);
+ return Unit.INSTANCE;
+ } else if (messageId == 0 && (i == 5 || i == 1) || messageId != 0 && i == 4) {
+ parentFragment.showDialog(new ReportAlert(context, i == 4 ? 5 : i) {
+ @Override
+ protected void onSend(int type, String message) {
+ ArrayList ids = new ArrayList<>();
+ if (messageId != 0) {
+ ids.add(messageId);
}
- req = request;
- } else {
- TLRPC.TL_account_reportPeer request = new TLRPC.TL_account_reportPeer();
- request.peer = peer;
- if (i == 0) {
- request.reason = new TLRPC.TL_inputReportReasonSpam();
- } else if (i == 1) {
- request.reason = new TLRPC.TL_inputReportReasonFake();
- } else if (i == 2) {
- request.reason = new TLRPC.TL_inputReportReasonViolence();
- } else if (i == 3) {
- request.reason = new TLRPC.TL_inputReportReasonChildAbuse();
- } else if (i == 4) {
- request.reason = new TLRPC.TL_inputReportReasonPornography();
+ TLRPC.InputPeer peer = MessagesController.getInstance(UserConfig.selectedAccount).getInputPeer((int) dialog_id);
+ sendReport(peer, type, message, ids);
+ if (parentFragment instanceof ChatActivity) {
+ ((ChatActivity) parentFragment).getUndoView().showWithAction(0, UndoView.ACTION_REPORT_SENT, null);
}
- req = request;
}
- ConnectionsManager.getInstance(UserConfig.selectedAccount).sendRequest(req, (response, error) -> AlertUtil.showToast(error));
- Toast.makeText(context, LocaleController.getString("ReportChatSent", R.string.ReportChatSent), Toast.LENGTH_SHORT).show();
-
- return Unit.INSTANCE;
+ });
+ return Unit.INSTANCE;
+ }
+ TLObject req;
+ TLRPC.InputPeer peer = MessagesController.getInstance(UserConfig.selectedAccount).getInputPeer((int) dialog_id);
+ if (messageId != 0) {
+ TLRPC.TL_messages_report request = new TLRPC.TL_messages_report();
+ request.peer = peer;
+ request.id.add(messageId);
+ request.message = "";
+ if (i == 0) {
+ request.reason = new TLRPC.TL_inputReportReasonSpam();
+ } else if (i == 1) {
+ request.reason = new TLRPC.TL_inputReportReasonViolence();
+ } else if (i == 2) {
+ request.reason = new TLRPC.TL_inputReportReasonChildAbuse();
+ } else if (i == 3) {
+ request.reason = new TLRPC.TL_inputReportReasonPornography();
}
- );
+ req = request;
+ } else {
+ TLRPC.TL_account_reportPeer request = new TLRPC.TL_account_reportPeer();
+ request.peer = peer;
+ request.message = "";
+ if (i == 0) {
+ request.reason = new TLRPC.TL_inputReportReasonSpam();
+ } else if (i == 1) {
+ request.reason = new TLRPC.TL_inputReportReasonFake();
+ } else if (i == 2) {
+ request.reason = new TLRPC.TL_inputReportReasonViolence();
+ } else if (i == 3) {
+ request.reason = new TLRPC.TL_inputReportReasonChildAbuse();
+ } else if (i == 4) {
+ request.reason = new TLRPC.TL_inputReportReasonPornography();
+ }
+ req = request;
+ }
+ ConnectionsManager.getInstance(UserConfig.selectedAccount).sendRequest(req, (response, error) -> AlertUtil.showToast(error));
+ if (parentFragment instanceof ChatActivity) {
+ ((ChatActivity) parentFragment).getUndoView().showWithAction(0, UndoView.ACTION_REPORT_SENT, null);
+ } else {
+ BulletinFactory.of(parentFragment).createReportSent().show();
+
+ return Unit.INSTANCE;
+ }
+
+ return Unit.INSTANCE;
+ });
BottomSheet sheet = builder.create();
parentFragment.showDialog(sheet);
}
@@ -2966,6 +3032,33 @@ public class AlertsCreator {
return builder;
}
+ public static AlertDialog.Builder createGigagroupConvertAlert(Activity activity, DialogInterface.OnClickListener onProcess, DialogInterface.OnClickListener onCancel) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+ String svg = RLottieDrawable.readRes(null, R.raw.gigagroup);
+ FrameLayout frameLayout = new FrameLayout(activity);
+ if (Build.VERSION.SDK_INT >= 21) {
+ frameLayout.setClipToOutline(true);
+ frameLayout.setOutlineProvider(new ViewOutlineProvider() {
+ @Override
+ public void getOutline(View view, Outline outline) {
+ outline.setRoundRect(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight() + AndroidUtilities.dp(6), AndroidUtilities.dp(6));
+ }
+ });
+ }
+ float aspectRatio = 372f / 936f;
+ View background = new View(activity);
+ background.setBackground(new BitmapDrawable(SvgHelper.getBitmap(svg, AndroidUtilities.dp(320), AndroidUtilities.dp(320 * aspectRatio), false)));
+ frameLayout.addView(background, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, 0, -1, -1, -1, -1));
+
+ builder.setTopView(frameLayout);
+ builder.setTopViewAspectRatio(aspectRatio);
+ builder.setTitle(LocaleController.getString("GigagroupAlertTitle", R.string.GigagroupAlertTitle));
+ builder.setMessage(AndroidUtilities.replaceTags(LocaleController.getString("GigagroupAlertText", R.string.GigagroupAlertText)));
+ builder.setPositiveButton(LocaleController.getString("GigagroupAlertLearnMore", R.string.GigagroupAlertLearnMore), onProcess);
+ builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), onCancel);
+ return builder;
+ }
+
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
public static AlertDialog.Builder createDrawOverlayPermissionDialog(Activity activity, DialogInterface.OnClickListener onCancel) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/AudioPlayerAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/AudioPlayerAlert.java
index 9fb16c6fa..de77a0fe0 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/AudioPlayerAlert.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/AudioPlayerAlert.java
@@ -583,10 +583,10 @@ public class AudioPlayerAlert extends BottomSheet implements NotificationCenter.
textView.setOnClickListener(view -> {
int dialogsCount = MessagesController.getInstance(currentAccount).getTotalDialogsCount();
- if (dialogsCount <= 10) {
+ if (dialogsCount <= 10 || TextUtils.isEmpty(textView.getText().toString())) {
return;
}
- String query = (String) textView.getText();
+ String query = textView.getText().toString();
if (parentActivity.getActionBarLayout().getLastFragment() instanceof DialogsActivity) {
DialogsActivity dialogsActivity = (DialogsActivity) parentActivity.getActionBarLayout().getLastFragment();
if (!dialogsActivity.onlyDialogsAdapter()) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/BackgroundGradientDrawable.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/BackgroundGradientDrawable.java
index bc86a7a10..622d7a91a 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/BackgroundGradientDrawable.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/BackgroundGradientDrawable.java
@@ -240,6 +240,9 @@ public class BackgroundGradientDrawable extends GradientDrawable {
for (int i = 0; i < sizesArr.length; i++) {
final IntSize size = sizesArr[i];
+ if (size.width == 0 || size.height == 0) {
+ continue;
+ }
final int index = i;
Utilities.globalQueue.postRunnable(runnables[i] = () -> {
Bitmap gradientBitmap = null;
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/Bulletin.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/Bulletin.java
index ebabd512f..dbfc9d2b4 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/Bulletin.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/Bulletin.java
@@ -59,6 +59,9 @@ public final class Bulletin {
public static final int DURATION_SHORT = 1500;
public static final int DURATION_LONG = 2750;
+ public static final int TYPE_STICKER = 0;
+ public static final int TYPE_ERROR = 1;
+
public static Bulletin make(@NonNull ViewGroup containerLayout, @NonNull Layout contentLayout, int duration) {
return new Bulletin(containerLayout, contentLayout, duration);
}
@@ -90,7 +93,7 @@ public final class Bulletin {
public static void hide(@NonNull FrameLayout containerLayout, boolean animated) {
final Bulletin bulletin = find(containerLayout);
if (bulletin != null) {
- bulletin.hide(animated && isTransitionsEnabled());
+ bulletin.hide(animated && isTransitionsEnabled(), 0);
}
}
@@ -194,7 +197,7 @@ public final class Bulletin {
@Override
public void onViewDetachedFromWindow(View v) {
layout.removeOnAttachStateChangeListener(this);
- hide(false);
+ hide(false, 0);
}
});
@@ -221,10 +224,14 @@ public final class Bulletin {
}
public void hide() {
- hide(isTransitionsEnabled());
+ hide(isTransitionsEnabled(), 0);
}
- public void hide(boolean animated) {
+ public void hide(long duration) {
+ hide(isTransitionsEnabled(), duration);
+ }
+
+ public void hide(boolean animated, long duration) {
if (showing) {
showing = false;
@@ -241,7 +248,13 @@ public final class Bulletin {
layout.transitionRunning = true;
layout.delegate = currentDelegate;
layout.invalidate();
- ensureLayoutTransitionCreated();
+ if (duration >= 0) {
+ Layout.DefaultTransition transition = new Layout.DefaultTransition();
+ transition.duration = duration;
+ layoutTransition = transition;
+ } else {
+ ensureLayoutTransitionCreated();
+ }
layoutTransition.animateExit(layout, layout::onExitTransitionStart, () -> {
if (currentDelegate != null) {
currentDelegate.onOffsetChange(0);
@@ -682,6 +695,8 @@ public final class Bulletin {
public static class DefaultTransition implements Transition {
+ long duration = 255;
+
@Override
public void animateEnter(@NonNull Layout layout, @Nullable Runnable startAction, @Nullable Runnable endAction, @Nullable Consumer onUpdate, int bottomOffset) {
layout.setInOutOffset(layout.getMeasuredHeight());
@@ -689,7 +704,7 @@ public final class Bulletin {
onUpdate.accept(layout.getTranslationY());
}
final ObjectAnimator animator = ObjectAnimator.ofFloat(layout, IN_OUT_OFFSET_Y2, 0);
- animator.setDuration(225);
+ animator.setDuration(duration);
animator.setInterpolator(Easings.easeOutQuad);
if (startAction != null || endAction != null) {
animator.addListener(new AnimatorListenerAdapter() {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/BulletinFactory.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/BulletinFactory.java
index dd6583b48..feda9ab7f 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/BulletinFactory.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/BulletinFactory.java
@@ -10,6 +10,7 @@ import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.NotificationsController;
import org.telegram.messenger.R;
+import org.telegram.tgnet.TLRPC;
import org.telegram.ui.ActionBar.BaseFragment;
public final class BulletinFactory {
@@ -26,6 +27,9 @@ public final class BulletinFactory {
return fragment != null && fragment.getParentActivity() != null && fragment.getLayoutContainer() != null;
}
+ public static final int ICON_TYPE_NOT_FOUND = 0;
+ public static final int ICON_TYPE_WARNING = 1;
+
public enum FileType {
PHOTO("PhotoSavedHint", R.string.PhotoSavedHint, Icon.SAVED_TO_GALLERY),
@@ -109,6 +113,12 @@ public final class BulletinFactory {
this.fragment = null;
}
+ public Bulletin createSimpleBulletin(int iconRawId, String text) {
+ final Bulletin.LottieLayout layout = new Bulletin.LottieLayout(getContext());
+ layout.setAnimation(iconRawId, 36, 36);
+ layout.textView.setText(text);
+ return create(layout, Bulletin.DURATION_SHORT);
+ }
@CheckResult
public Bulletin createDownloadBulletin(FileType fileType) {
@@ -120,6 +130,13 @@ public final class BulletinFactory {
return createDownloadBulletin(fileType, filesAmount, 0, 0);
}
+ public Bulletin createReportSent() {
+ final Bulletin.LottieLayout layout = new Bulletin.LottieLayout(getContext());
+ layout.setAnimation(R.raw.chats_infotip);
+ layout.textView.setText(LocaleController.getString("ReportChatSent", R.string.ReportChatSent));
+ return create(layout, Bulletin.DURATION_SHORT);
+ }
+
@CheckResult
public Bulletin createDownloadBulletin(FileType fileType, int filesAmount, int backgroundColor, int textColor) {
final Bulletin.LottieLayout layout;
@@ -136,11 +153,29 @@ public final class BulletinFactory {
return create(layout, Bulletin.DURATION_SHORT);
}
+
+ public Bulletin createErrorBulletin(String errorMessage) {
+ Bulletin.LottieLayout layout = new Bulletin.LottieLayout(getContext());
+ layout.setAnimation(R.raw.chats_infotip);
+ layout.textView.setText(errorMessage);
+ layout.textView.setSingleLine(false);
+ layout.textView.setMaxLines(2);
+ return create(layout, Bulletin.DURATION_SHORT);
+ }
+
@CheckResult
public Bulletin createCopyLinkBulletin() {
return createCopyLinkBulletin(false);
}
+ @CheckResult
+ public Bulletin createCopyBulletin(String message) {
+ final Bulletin.LottieLayout layout = new Bulletin.LottieLayout(getContext());
+ layout.setAnimation(R.raw.copy, 36, 36, "NULL ROTATION", "Back", "Front");
+ layout.textView.setText(message);
+ return create(layout, Bulletin.DURATION_SHORT);
+ }
+
@CheckResult
public Bulletin createCopyLinkBulletin(boolean isPrivate) {
if (isPrivate) {
@@ -270,10 +305,16 @@ public final class BulletinFactory {
}
@CheckResult
- public static Bulletin createRemoveFromChatBulletin(BaseFragment fragment, String userFirstName, String chatName) {
+ public static Bulletin createRemoveFromChatBulletin(BaseFragment fragment, TLRPC.User user, String chatName) {
final Bulletin.LottieLayout layout = new Bulletin.LottieLayout(fragment.getParentActivity());
layout.setAnimation(R.raw.ic_ban, "Hand");
- layout.textView.setText(AndroidUtilities.replaceTags(LocaleController.formatString("UserRemovedFromChatHint", R.string.UserRemovedFromChatHint, userFirstName, chatName)));
+ String name;
+ if (user.deleted) {
+ name = LocaleController.formatString("HiddenName", R.string.HiddenName);
+ } else {
+ name = user.first_name;
+ }
+ layout.textView.setText(AndroidUtilities.replaceTags(LocaleController.formatString("UserRemovedFromChatHint", R.string.UserRemovedFromChatHint, name, chatName)));
return Bulletin.make(fragment, layout, Bulletin.DURATION_SHORT);
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java
index 321b15c0d..fcb16b04f 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlert.java
@@ -598,8 +598,8 @@ public class ChatAttachAlert extends BottomSheet implements NotificationCenter.N
AdjustPanLayoutHelper adjustPanLayoutHelper = new AdjustPanLayoutHelper(this) {
@Override
- protected void onTransitionStart(boolean keyboardVisible) {
- super.onTransitionStart(keyboardVisible);
+ protected void onTransitionStart(boolean keyboardVisible, int contentHeight) {
+ super.onTransitionStart(keyboardVisible, contentHeight);
if (previousScrollOffsetY > 0 && previousScrollOffsetY != scrollOffsetY[0] && keyboardVisible) {
fromScrollY = previousScrollOffsetY;
toScrollY = scrollOffsetY[0];
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java
index a3d9b9380..10dac14f2 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java
@@ -65,6 +65,8 @@ public class ChatAvatarContainer extends FrameLayout implements NotificationCent
private boolean[] isOnline = new boolean[1];
+ private boolean secretChatTimer;
+
private int onlineCount = -1;
private int currentConnectionState;
private CharSequence lastSubtitle;
@@ -119,14 +121,30 @@ public class ChatAvatarContainer extends FrameLayout implements NotificationCent
subtitleTextView.setGravity(Gravity.LEFT);
addView(subtitleTextView);
- if (needTime) {
+ if (parentFragment != null) {
timeItem = new ImageView(context);
timeItem.setPadding(AndroidUtilities.dp(10), AndroidUtilities.dp(10), AndroidUtilities.dp(5), AndroidUtilities.dp(5));
timeItem.setScaleType(ImageView.ScaleType.CENTER);
+ timeItem.setAlpha(0.0f);
+ timeItem.setScaleY(0.0f);
+ timeItem.setScaleX(0.0f);
+ timeItem.setVisibility(GONE);
timeItem.setImageDrawable(timerDrawable = new TimerDrawable(context));
addView(timeItem);
- timeItem.setOnClickListener(v -> parentFragment.showDialog(AlertsCreator.createTTLAlert(getContext(), parentFragment.getCurrentEncryptedChat()).create()));
- timeItem.setContentDescription(LocaleController.getString("SetTimer", R.string.SetTimer));
+ secretChatTimer = needTime;
+
+ timeItem.setOnClickListener(v -> {
+ if (secretChatTimer) {
+ parentFragment.showDialog(AlertsCreator.createTTLAlert(getContext(), parentFragment.getCurrentEncryptedChat()).create());
+ } else {
+ openSetTimer();
+ }
+ });
+ if (secretChatTimer) {
+ timeItem.setContentDescription(LocaleController.getString("SetTimer", R.string.SetTimer));
+ } else {
+ timeItem.setContentDescription(LocaleController.getString("AccAutoDeleteTimer", R.string.AccAutoDeleteTimer));
+ }
}
if (parentFragment != null && parentFragment.getChatMode() == 0) {
@@ -146,6 +164,33 @@ public class ChatAvatarContainer extends FrameLayout implements NotificationCent
}
}
+ public boolean openSetTimer() {
+ if (parentFragment.getParentActivity() == null) {
+ return false;
+ }
+ TLRPC.Chat chat = parentFragment.getCurrentChat();
+ if (chat != null && !ChatObject.canUserDoAdminAction(chat, ChatObject.ACTION_DELETE_MESSAGES)) {
+ if (timeItem.getTag() != null) {
+ parentFragment.showTimerHint();
+ }
+ return false;
+ }
+ ClearHistoryAlert alert = new ClearHistoryAlert(parentFragment.getParentActivity(), parentFragment.getCurrentUser(), parentFragment.getCurrentChat(), false);
+ alert.setDelegate(new ClearHistoryAlert.ClearHistoryAlertDelegate() {
+ @Override
+ public void onAutoDeleteHistory(int ttl, int action) {
+ parentFragment.getMessagesController().setDialogHistoryTTL(parentFragment.getDialogId(), ttl);
+ TLRPC.ChatFull chatInfo = parentFragment.getCurrentChatInfo();
+ TLRPC.UserFull userInfo = parentFragment.getCurrentUserInfo();
+ if (userInfo != null || chatInfo != null) {
+ parentFragment.getUndoView().showWithAction(parentFragment.getDialogId(), action, parentFragment.getCurrentUser(), userInfo != null ? userInfo.ttl_period : chatInfo.ttl_period, null, null);
+ }
+ }
+ });
+ parentFragment.showDialog(alert);
+ return true;
+ }
+
private void openProfile(boolean byAvatar) {
if (byAvatar && (AndroidUtilities.isTablet() || AndroidUtilities.displaySize.x > AndroidUtilities.displaySize.y || !avatarImageView.getImageReceiver().hasNotThumb())) {
byAvatar = false;
@@ -236,24 +281,51 @@ public class ChatAvatarContainer extends FrameLayout implements NotificationCent
leftPadding = value;
}
- public void showTimeItem() {
- if (timeItem == null) {
+ public void showTimeItem(boolean animated) {
+ if (timeItem == null || timeItem.getTag() != null) {
return;
}
+ timeItem.clearAnimation();
timeItem.setVisibility(VISIBLE);
+ timeItem.setTag(1);
+ if (animated) {
+ timeItem.animate().setDuration(180).alpha(1.0f).scaleX(1.0f).scaleY(1.0f).setListener(null).start();
+ } else {
+ timeItem.setAlpha(1.0f);
+ timeItem.setScaleY(1.0f);
+ timeItem.setScaleX(1.0f);
+ }
}
- public void hideTimeItem() {
- if (timeItem == null) {
+ public void hideTimeItem(boolean animated) {
+ if (timeItem == null || timeItem.getTag() == null) {
return;
}
- timeItem.setVisibility(GONE);
+ timeItem.clearAnimation();
+ timeItem.setTag(null);
+ if (animated) {
+ timeItem.animate().setDuration(180).alpha(0.0f).scaleX(0.0f).scaleY(0.0f).setListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ timeItem.setVisibility(GONE);
+ super.onAnimationEnd(animation);
+ }
+ }).start();
+ } else {
+ timeItem.setVisibility(GONE);
+ timeItem.setAlpha(0.0f);
+ timeItem.setScaleY(0.0f);
+ timeItem.setScaleX(0.0f);
+ }
}
public void setTime(int value) {
if (timerDrawable == null) {
return;
}
+ if (value == 0 && !secretChatTimer) {
+ return;
+ }
timerDrawable.setTime(value);
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ClearHistoryAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ClearHistoryAlert.java
new file mode 100644
index 000000000..81ab12dfb
--- /dev/null
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ClearHistoryAlert.java
@@ -0,0 +1,443 @@
+/*
+ * This is the source code of Telegram for Android v. 7.x.x.
+ * It is licensed under GNU GPL v. 2 or later.
+ * You should have received a copy of the license in this archive (see LICENSE).
+ *
+ * Copyright Nikolai Kudashov, 2013-2021.
+ */
+
+package org.telegram.ui.Components;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.core.widget.NestedScrollView;
+
+import org.telegram.messenger.AndroidUtilities;
+import org.telegram.messenger.BuildVars;
+import org.telegram.messenger.ChatObject;
+import org.telegram.messenger.LocaleController;
+import org.telegram.messenger.MessagesController;
+import org.telegram.messenger.R;
+import org.telegram.messenger.UserConfig;
+import org.telegram.messenger.UserObject;
+import org.telegram.tgnet.TLRPC;
+import org.telegram.ui.ActionBar.BottomSheet;
+import org.telegram.ui.ActionBar.Theme;
+import org.telegram.ui.Cells.CheckBoxCell;
+import org.telegram.ui.Cells.HeaderCell;
+import org.telegram.ui.Cells.ShadowSectionCell;
+import org.telegram.ui.Cells.TextInfoPrivacyCell;
+
+public class ClearHistoryAlert extends BottomSheet {
+
+ private Drawable shadowDrawable;
+ private LinearLayout linearLayout;
+ private BottomSheetCell setTimerButton;
+ private CheckBoxCell cell;
+
+ private boolean autoDeleteOnly;
+ private int scrollOffsetY;
+
+ private int[] location = new int[2];
+
+ private int currentTimer;
+ private int newTimer;
+
+ private boolean dismissedDelayed;
+
+ private ClearHistoryAlertDelegate delegate;
+
+ public interface ClearHistoryAlertDelegate {
+
+ default void onClearHistory(boolean revoke) {
+
+ }
+
+ default void onAutoDeleteHistory(int ttl, int action) {
+
+ }
+ }
+
+ public static class BottomSheetCell extends FrameLayout {
+
+ private View background;
+ private TextView textView;
+ private LinearLayout linearLayout;
+
+ public BottomSheetCell(Context context) {
+ super(context);
+
+ background = new View(context);
+ background.setBackground(Theme.createSimpleSelectorRoundRectDrawable(AndroidUtilities.dp(4), Theme.getColor(Theme.key_featuredStickers_addButton), Theme.getColor(Theme.key_featuredStickers_addButtonPressed)));
+ addView(background, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, 0, 16, 16, 16, 16));
+
+ textView = new TextView(context);
+ textView.setLines(1);
+ textView.setSingleLine(true);
+ textView.setGravity(Gravity.CENTER_HORIZONTAL);
+ textView.setEllipsize(TextUtils.TruncateAt.END);
+ textView.setGravity(Gravity.CENTER);
+ textView.setTextColor(Theme.getColor(Theme.key_featuredStickers_buttonText));
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+ textView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
+ addView(textView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER));
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(80), MeasureSpec.EXACTLY));
+ }
+
+ public void setText(CharSequence text) {
+ textView.setText(text);
+ }
+ }
+
+ public ClearHistoryAlert(final Context context, TLRPC.User user, TLRPC.Chat chat, boolean full) {
+ super(context, false);
+ autoDeleteOnly = !full;
+ setApplyBottomPadding(false);
+
+ int ttl;
+ if (user != null) {
+ TLRPC.UserFull userFull = MessagesController.getInstance(currentAccount).getUserFull(user.id);
+ ttl = userFull != null ? userFull.ttl_period : 0;
+ } else {
+ TLRPC.ChatFull chatFull = MessagesController.getInstance(currentAccount).getChatFull(chat.id);
+ ttl = chatFull != null ? chatFull.ttl_period : 0;
+ }
+ if (ttl == 0) {
+ newTimer = currentTimer = 0;
+ } else if (ttl == 24 * 60 * 60) {
+ newTimer = currentTimer = 1;
+ } else {
+ newTimer = currentTimer = 2;
+ }
+
+ shadowDrawable = context.getResources().getDrawable(R.drawable.sheet_shadow_round).mutate();
+ shadowDrawable.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_dialogBackground), PorterDuff.Mode.MULTIPLY));
+
+ NestedScrollView scrollView = new NestedScrollView(context) {
+
+ private boolean ignoreLayout;
+
+ @Override
+ public boolean onInterceptTouchEvent(MotionEvent ev) {
+ if (ev.getAction() == MotionEvent.ACTION_DOWN && scrollOffsetY != 0 && ev.getY() < scrollOffsetY) {
+ dismiss();
+ return true;
+ }
+ return super.onInterceptTouchEvent(ev);
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent e) {
+ return !isDismissed() && super.onTouchEvent(e);
+ }
+
+ @Override
+ public void setTranslationY(float translationY) {
+ super.setTranslationY(translationY);
+ updateLayout();
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ int height = MeasureSpec.getSize(heightMeasureSpec);
+ measureChildWithMargins(linearLayout, widthMeasureSpec, 0, heightMeasureSpec, 0);
+ int contentHeight = linearLayout.getMeasuredHeight();
+ int padding = (height / 5 * 3);
+ int visiblePart = height - padding;
+ if (autoDeleteOnly || contentHeight - visiblePart < AndroidUtilities.dp(90) || contentHeight < height / 2 + AndroidUtilities.dp(90)) {
+ padding = height - contentHeight;
+ } else {
+ int minHeight = contentHeight / 2 + AndroidUtilities.dp(40);
+ if (visiblePart < minHeight) {
+ padding = height - minHeight;
+ }
+ }
+ if (getPaddingTop() != padding) {
+ ignoreLayout = true;
+ setPadding(0, padding, 0, 0);
+ ignoreLayout = false;
+ }
+ super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
+ }
+
+ @Override
+ protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+ super.onLayout(changed, left, top, right, bottom);
+ updateLayout();
+ }
+
+ @Override
+ public void requestLayout() {
+ if (ignoreLayout) {
+ return;
+ }
+ super.requestLayout();
+ }
+
+ @Override
+ protected void onDraw(Canvas canvas) {
+ int top = (int) (scrollOffsetY - backgroundPaddingTop + getScrollY() - getTranslationY());
+ shadowDrawable.setBounds(0, top, getMeasuredWidth(), top + linearLayout.getMeasuredHeight() + backgroundPaddingTop + AndroidUtilities.dp(19));
+ shadowDrawable.draw(canvas);
+ }
+
+ @Override
+ protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+ super.onScrollChanged(l, t, oldl, oldt);
+ updateLayout();
+ }
+ };
+ scrollView.setFillViewport(true);
+ scrollView.setWillNotDraw(false);
+ scrollView.setClipToPadding(false);
+ scrollView.setPadding(backgroundPaddingLeft, 0, backgroundPaddingLeft, 0);
+ containerView = scrollView;
+
+ linearLayout = new LinearLayout(context) {
+ @Override
+ protected void onLayout(boolean changed, int l, int t, int r, int b) {
+ super.onLayout(changed, l, t, r, b);
+ updateLayout();
+ }
+ };
+ linearLayout.setOrientation(LinearLayout.VERTICAL);
+ scrollView.addView(linearLayout, LayoutHelper.createScroll(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.BOTTOM));
+ setCustomView(linearLayout);
+
+ int selfUserId = UserConfig.getInstance(currentAccount).getClientUserId();
+
+ boolean canRevokeInbox = user != null && !user.bot && user.id != selfUserId && MessagesController.getInstance(currentAccount).canRevokePmInbox;
+ int revokeTimeLimit;
+ if (user != null) {
+ revokeTimeLimit = MessagesController.getInstance(currentAccount).revokeTimePmLimit;
+ } else {
+ revokeTimeLimit = MessagesController.getInstance(currentAccount).revokeTimeLimit;
+ }
+ boolean canDeleteInbox = user != null && canRevokeInbox && revokeTimeLimit == 0x7fffffff;
+ final boolean[] deleteForAll = new boolean[]{false};
+ boolean deleteChatForAll = false;
+
+ if (!autoDeleteOnly) {
+ TextView textView = new TextView(context);
+ textView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
+ textView.setTextColor(Theme.getColor(Theme.key_dialogTextBlack));
+ textView.setText(LocaleController.getString("ClearHistory", R.string.ClearHistory));
+ textView.setSingleLine(true);
+ textView.setEllipsize(TextUtils.TruncateAt.END);
+ linearLayout.addView(textView, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.TOP | Gravity.LEFT, 23, 20, 23, 0));
+
+ TextView messageTextView = new TextView(getContext());
+ messageTextView.setTextColor(Theme.getColor(Theme.key_dialogTextBlack));
+ messageTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
+ messageTextView.setText(LocaleController.getString(""));
+ messageTextView.setMovementMethod(new AndroidUtilities.LinkMovementMethodMy());
+ messageTextView.setLinkTextColor(Theme.getColor(Theme.key_dialogTextLink));
+ messageTextView.setGravity((LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT) | Gravity.TOP);
+ linearLayout.addView(messageTextView, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.TOP | Gravity.LEFT, 23, 16, 23, 5));
+ if (user != null) {
+ messageTextView.setText(AndroidUtilities.replaceTags(LocaleController.formatString("AreYouSureClearHistoryWithUser", R.string.AreYouSureClearHistoryWithUser, UserObject.getUserName(user))));
+ } else {
+ if (!ChatObject.isChannel(chat) || chat.megagroup && TextUtils.isEmpty(chat.username)) {
+ messageTextView.setText(AndroidUtilities.replaceTags(LocaleController.formatString("AreYouSureClearHistoryWithChat", R.string.AreYouSureClearHistoryWithChat, chat.title)));
+ } else if (chat.megagroup) {
+ messageTextView.setText(LocaleController.getString("AreYouSureClearHistoryGroup", R.string.AreYouSureClearHistoryGroup));
+ } else {
+ messageTextView.setText(LocaleController.getString("AreYouSureClearHistoryChannel", R.string.AreYouSureClearHistoryChannel));
+ }
+ }
+
+ if (canDeleteInbox && !UserObject.isDeleted(user)) {
+ cell = new CheckBoxCell(context, 1);
+ cell.setBackgroundDrawable(Theme.getSelectorDrawable(false));
+ cell.setText(LocaleController.formatString("ClearHistoryOptionAlso", R.string.ClearHistoryOptionAlso, UserObject.getFirstName(user)), "", false, false);
+ cell.setPadding(LocaleController.isRTL ? AndroidUtilities.dp(16) : AndroidUtilities.dp(5), 0, LocaleController.isRTL ? AndroidUtilities.dp(5) : AndroidUtilities.dp(16), 0);
+ linearLayout.addView(cell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 48, Gravity.TOP | Gravity.LEFT, 0, 0, 0, 0));
+ cell.setOnClickListener(v -> {
+ CheckBoxCell cell1 = (CheckBoxCell) v;
+ deleteForAll[0] = !deleteForAll[0];
+ cell1.setChecked(deleteForAll[0], true);
+ });
+ }
+
+ BottomSheetCell clearButton = new BottomSheetCell(context);
+ clearButton.setBackground(null);
+ clearButton.setText(LocaleController.getString("AlertClearHistory", R.string.AlertClearHistory));
+ clearButton.background.setOnClickListener(v -> {
+ if (dismissedDelayed) {
+ return;
+ }
+ delegate.onClearHistory(cell != null && cell.isChecked());
+ dismiss();
+ });
+ linearLayout.addView(clearButton, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 50, Gravity.LEFT | Gravity.TOP, 0, 0, 0, 0));
+
+ ShadowSectionCell shadowSectionCell = new ShadowSectionCell(context);
+ Drawable drawable = Theme.getThemedDrawable(context, R.drawable.greydivider, Theme.key_windowBackgroundGrayShadow);
+ CombinedDrawable combinedDrawable = new CombinedDrawable(new ColorDrawable(Theme.getColor(Theme.key_windowBackgroundGray)), drawable);
+ combinedDrawable.setFullsize(true);
+ shadowSectionCell.setBackgroundDrawable(combinedDrawable);
+ linearLayout.addView(shadowSectionCell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
+
+ HeaderCell headerCell = new HeaderCell(context);
+ headerCell.setText(LocaleController.getString("AutoDeleteHeader", R.string.AutoDeleteHeader));
+ linearLayout.addView(headerCell, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, 1, autoDeleteOnly ? 20 : 0, 1, 0));
+ } else {
+ RLottieImageView lottieImageView = new RLottieImageView(context);
+ lottieImageView.setAutoRepeat(false);
+ lottieImageView.setAnimation(R.raw.utyan_private, 120, 120);
+ lottieImageView.setPadding(0, AndroidUtilities.dp(20), 0, 0);
+ lottieImageView.playAnimation();
+ linearLayout.addView(lottieImageView, LayoutHelper.createLinear(160, 160, Gravity.CENTER_HORIZONTAL | Gravity.TOP, 17, 0, 17, 0));
+
+ TextView percentTextView = new TextView(context);
+ percentTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
+ percentTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 24);
+ percentTextView.setTextColor(Theme.getColor(Theme.key_dialogTextBlack));
+ percentTextView.setText(LocaleController.getString("AutoDeleteAlertTitle", R.string.AutoDeleteAlertTitle));
+ linearLayout.addView(percentTextView, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 17, 18, 17, 0));
+
+ TextView infoTextView = new TextView(context);
+ infoTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+ infoTextView.setTextColor(Theme.getColor(Theme.key_dialogTextGray3));
+ infoTextView.setGravity(Gravity.CENTER_HORIZONTAL);
+ if (user != null) {
+ infoTextView.setText(LocaleController.formatString("AutoDeleteAlertUserInfo", R.string.AutoDeleteAlertUserInfo, UserObject.getFirstName(user)));
+ } else {
+ if (ChatObject.isChannel(chat) && !chat.megagroup) {
+ infoTextView.setText(LocaleController.getString("AutoDeleteAlertChannelInfo", R.string.AutoDeleteAlertChannelInfo));
+ } else {
+ infoTextView.setText(LocaleController.getString("AutoDeleteAlertGroupInfo", R.string.AutoDeleteAlertGroupInfo));
+ }
+ }
+ linearLayout.addView(infoTextView, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 30, 22, 30, 20));
+ }
+
+ SlideChooseView slideChooseView = new SlideChooseView(context);
+ slideChooseView.setCallback(new SlideChooseView.Callback() {
+ @Override
+ public void onOptionSelected(int index) {
+ newTimer = index;
+ updateTimerButton(true);
+ }
+
+ @Override
+ public void onTouchEnd() {
+ scrollView.smoothScrollTo(0, linearLayout.getMeasuredHeight());
+ }
+ });
+ String[] strings = new String[]{
+ LocaleController.getString("AutoDeleteNever", R.string.AutoDeleteNever),
+ LocaleController.getString("AutoDelete24Hours", R.string.AutoDelete24Hours),
+ LocaleController.getString("AutoDelete7Days", R.string.AutoDelete7Days)
+ };
+ slideChooseView.setOptions(currentTimer, strings);
+ linearLayout.addView(slideChooseView, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, 0, 8, 0, 0));
+
+ FrameLayout buttonContainer = new FrameLayout(context);
+ Drawable drawable = Theme.getThemedDrawable(context, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow);
+ CombinedDrawable combinedDrawable = new CombinedDrawable(new ColorDrawable(Theme.getColor(Theme.key_windowBackgroundGray)), drawable);
+ combinedDrawable.setFullsize(true);
+ buttonContainer.setBackgroundDrawable(combinedDrawable);
+ linearLayout.addView(buttonContainer, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
+
+ TextInfoPrivacyCell infoCell = new TextInfoPrivacyCell(context);
+
+ infoCell.setText(LocaleController.getString("AutoDeleteInfo", R.string.AutoDeleteInfo));
+ buttonContainer.addView(infoCell);
+
+ setTimerButton = new BottomSheetCell(context);
+ setTimerButton.setBackgroundColor(Theme.getColor(Theme.key_dialogBackground));
+ if (autoDeleteOnly) {
+ setTimerButton.setText(LocaleController.getString("AutoDeleteSet", R.string.AutoDeleteSet));
+ } else if (full && currentTimer == 0) {
+ setTimerButton.setText(LocaleController.getString("EnableAutoDelete", R.string.EnableAutoDelete));
+ } else {
+ setTimerButton.setText(LocaleController.getString("AutoDeleteConfirm", R.string.AutoDeleteConfirm));
+ }
+ setTimerButton.background.setOnClickListener(v -> {
+ if (dismissedDelayed) {
+ return;
+ }
+ if (newTimer != currentTimer) {
+ dismissedDelayed = true;
+ int time;
+ int action;
+ if (newTimer == 2) {
+ time = BuildVars.DEBUG_PRIVATE_VERSION ? 5 : 7 * 24 * 60 * 60;
+ action = UndoView.ACTION_AUTO_DELETE_ON;
+ } else if (newTimer == 1) {
+ time = 24 * 60 * 60;
+ action = UndoView.ACTION_AUTO_DELETE_ON;
+ } else {
+ time = 0;
+ action = UndoView.ACTION_AUTO_DELETE_OFF;
+ }
+ delegate.onAutoDeleteHistory(time, action);
+ }
+ if (dismissedDelayed) {
+ AndroidUtilities.runOnUIThread(this::dismiss, 200);
+ } else {
+ dismiss();
+ }
+ });
+ buttonContainer.addView(setTimerButton);
+
+ updateTimerButton(false);
+ }
+
+ private void updateTimerButton(boolean animated) {
+ if (currentTimer == newTimer && !autoDeleteOnly) {
+ if (animated) {
+ setTimerButton.animate().alpha(0.0f).setDuration(180).start();
+ } else {
+ setTimerButton.setVisibility(View.INVISIBLE);
+ setTimerButton.setAlpha(0.0f);
+ }
+ } else {
+ setTimerButton.setVisibility(View.VISIBLE);
+ if (animated) {
+ setTimerButton.animate().alpha(1.0f).setDuration(180).start();
+ } else {
+ setTimerButton.setAlpha(1.0f);
+ }
+ }
+ }
+
+ private void updateLayout() {
+ View child = linearLayout.getChildAt(0);
+ child.getLocationInWindow(location);
+ int top = location[1] - AndroidUtilities.dp(autoDeleteOnly ? 6 : 19);
+ int newOffset = Math.max(top, 0);
+ if (scrollOffsetY != newOffset) {
+ scrollOffsetY = newOffset;
+ containerView.invalidate();
+ }
+ }
+
+ @Override
+ protected boolean canDismissWithSwipe() {
+ return false;
+ }
+
+ public void setDelegate(ClearHistoryAlertDelegate clearHistoryAlertDelegate) {
+ delegate = clearHistoryAlertDelegate;
+ }
+}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/CrossOutDrawable.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/CrossOutDrawable.java
index b84e9fc61..04c2c4e62 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/CrossOutDrawable.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/CrossOutDrawable.java
@@ -6,8 +6,8 @@ import android.graphics.ColorFilter;
import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.drawable.Drawable;
@@ -67,14 +67,15 @@ public class CrossOutDrawable extends Drawable {
progress = 0;
}
}
- if (progress == 0) {
- iconDrawable.draw(canvas);
- return;
- }
int newColor = Theme.getColor(colorKey);
if (color != newColor) {
color = newColor;
paint.setColor(newColor);
+ iconDrawable.setColorFilter(new PorterDuffColorFilter(Theme.getColor(colorKey), PorterDuff.Mode.MULTIPLY));
+ }
+ if (progress == 0) {
+ iconDrawable.draw(canvas);
+ return;
}
rectF.set(iconDrawable.getBounds());
canvas.saveLayerAlpha(rectF, 255, Canvas.ALL_SAVE_FLAG);
@@ -101,14 +102,14 @@ public class CrossOutDrawable extends Drawable {
}
@Override
- public void setBounds(int left, int top, int right, int bottom) {
- super.setBounds(left, top, right, bottom);
- iconDrawable.setBounds(left, top, right, bottom);
+ public void setColorFilter(@Nullable ColorFilter colorFilter) {
+
}
@Override
- public void setColorFilter(@Nullable ColorFilter colorFilter) {
- iconDrawable.setColorFilter(colorFilter);
+ public void setBounds(int left, int top, int right, int bottom) {
+ super.setBounds(left, top, right, bottom);
+ iconDrawable.setBounds(left, top, right, bottom);
}
@Override
@@ -123,10 +124,11 @@ public class CrossOutDrawable extends Drawable {
@Override
public int getOpacity() {
- return PixelFormat.TRANSLUCENT;
+ return PixelFormat.TRANSPARENT;
}
public void setColorKey(String colorKey) {
this.colorKey = colorKey;
}
+
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/EmbedBottomSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/EmbedBottomSheet.java
index 77ac7b1ef..8d85977d2 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/EmbedBottomSheet.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/EmbedBottomSheet.java
@@ -830,9 +830,10 @@ public class EmbedBottomSheet extends BottomSheet {
dismiss();
});
- boolean canHandleUrl = videoView.canHandleUrl(embedUrl);
- if (!canHandleUrl) {
- videoView.setVisibility(View.INVISIBLE);
+ boolean canHandleUrl = videoView.canHandleUrl(embedUrl) || videoView.canHandleUrl(originalUrl);
+ videoView.setVisibility(canHandleUrl ? View.VISIBLE : View.INVISIBLE);
+ if (canHandleUrl) {
+ videoView.willHandle();
}
setDelegate(new BottomSheet.BottomSheetDelegate() {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextView.java
index a25de5c63..5f3193385 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextView.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextView.java
@@ -22,9 +22,6 @@ import android.graphics.PorterDuffColorFilter;
import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
-
-import androidx.annotation.Keep;
-
import android.os.SystemClock;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
@@ -41,6 +38,8 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.Keep;
+
import org.telegram.messenger.AccountInstance;
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.ChatObject;
@@ -1394,7 +1393,7 @@ public class FragmentContextView extends FrameLayout implements NotificationCent
}
TypefaceSpan span = new TypefaceSpan(AndroidUtilities.getTypeface("fonts/rmedium.ttf"), 0, Theme.getColor(Theme.key_inappPlayerPerformer));
stringBuilder.setSpan(span, 0, messageObject.getMusicAuthor().length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
- titleTextView.setText(stringBuilder, !create && wasVisible);
+ titleTextView.setText(stringBuilder, !create && wasVisible && isMusic);
}
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextViewWavesDrawable.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextViewWavesDrawable.java
index 39d4b7269..21df6f108 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextViewWavesDrawable.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextViewWavesDrawable.java
@@ -153,9 +153,11 @@ public class FragmentContextViewWavesDrawable {
lineBlobDrawable2.minRadius = AndroidUtilities.dp(0);
lineBlobDrawable2.maxRadius = AndroidUtilities.dp(3) + AndroidUtilities.dp(9) * amplitude;
- lineBlobDrawable.update(amplitude, 0.3f);
- lineBlobDrawable1.update(amplitude, 0.7f);
- lineBlobDrawable2.update(amplitude, 0.7f);
+ if (i == 1) {
+ lineBlobDrawable.update(amplitude, 0.3f);
+ lineBlobDrawable1.update(amplitude, 0.7f);
+ lineBlobDrawable2.update(amplitude, 0.7f);
+ }
// if (rippleTransition) {
// paint.setAlpha(76);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/GigagroupConvertAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/GigagroupConvertAlert.java
new file mode 100644
index 000000000..1d3ca6026
--- /dev/null
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/GigagroupConvertAlert.java
@@ -0,0 +1,165 @@
+/*
+ * This is the source code of Telegram for Android v. 5.x.x.
+ * It is licensed under GNU GPL v. 2 or later.
+ * You should have received a copy of the license in this archive (see LICENSE).
+ *
+ * Copyright Nikolai Kudashov, 2013-2018.
+ */
+
+package org.telegram.ui.Components;
+
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.text.TextUtils;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.telegram.messenger.AndroidUtilities;
+import org.telegram.messenger.LocaleController;
+import org.telegram.messenger.R;
+import org.telegram.ui.ActionBar.AlertDialog;
+import org.telegram.ui.ActionBar.BaseFragment;
+import org.telegram.ui.ActionBar.BottomSheet;
+import org.telegram.ui.ActionBar.Theme;
+
+public class GigagroupConvertAlert extends BottomSheet {
+
+ private boolean compteled;
+
+ public static class BottomSheetCell extends FrameLayout {
+
+ private View background;
+ private TextView textView;
+ private LinearLayout linearLayout;
+
+ public BottomSheetCell(Context context) {
+ super(context);
+
+ background = new View(context);
+ background.setBackground(Theme.createSimpleSelectorRoundRectDrawable(AndroidUtilities.dp(4), Theme.getColor(Theme.key_featuredStickers_addButton), Theme.getColor(Theme.key_featuredStickers_addButtonPressed)));
+ addView(background, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, 0, 16, 16, 16, 16));
+
+ textView = new TextView(context);
+ textView.setLines(1);
+ textView.setSingleLine(true);
+ textView.setGravity(Gravity.CENTER_HORIZONTAL);
+ textView.setEllipsize(TextUtils.TruncateAt.END);
+ textView.setGravity(Gravity.CENTER);
+ textView.setTextColor(Theme.getColor(Theme.key_featuredStickers_buttonText));
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+ textView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
+ addView(textView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER));
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(80), MeasureSpec.EXACTLY));
+ }
+
+ public void setText(CharSequence text) {
+ textView.setText(text);
+ }
+ }
+
+ public GigagroupConvertAlert(final Context context, BaseFragment parentFragment) {
+ super(context, true);
+ setApplyBottomPadding(false);
+ setApplyTopPadding(false);
+
+ LinearLayout linearLayout = new LinearLayout(context);
+ linearLayout.setOrientation(LinearLayout.VERTICAL);
+ setCustomView(linearLayout);
+
+ RLottieImageView lottieImageView = new RLottieImageView(context);
+ lottieImageView.setAutoRepeat(true);
+ lottieImageView.setAnimation(R.raw.utyan_gigagroup, 120, 120);
+ lottieImageView.playAnimation();
+ linearLayout.addView(lottieImageView, LayoutHelper.createLinear(160, 160, Gravity.CENTER_HORIZONTAL | Gravity.TOP, 17, 30, 17, 0));
+
+ TextView percentTextView = new TextView(context);
+ percentTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
+ percentTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 24);
+ percentTextView.setTextColor(Theme.getColor(Theme.key_dialogTextBlack));
+ percentTextView.setText(LocaleController.getString("GigagroupConvertTitle", R.string.GigagroupConvertTitle));
+ linearLayout.addView(percentTextView, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 17, 18, 17, 0));
+
+ LinearLayout container = new LinearLayout(context);
+ container.setOrientation(LinearLayout.VERTICAL);
+ linearLayout.addView(container, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_HORIZONTAL, 0, 12, 0, 0));
+
+ for (int a = 0; a < 3; a++) {
+ LinearLayout linearLayout2 = new LinearLayout(context);
+ linearLayout2.setOrientation(LinearLayout.HORIZONTAL);
+ container.addView(linearLayout2, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT, 0, 8, 0, 0));
+
+ ImageView imageView = new ImageView(context);
+ imageView.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_dialogTextGray3), PorterDuff.Mode.MULTIPLY));
+ imageView.setImageResource(R.drawable.list_circle);
+
+ TextView textView = new TextView(context);
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
+ textView.setTextColor(Theme.getColor(Theme.key_dialogTextGray3));
+ textView.setGravity(Gravity.CENTER_VERTICAL | (LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT));
+ textView.setMaxWidth(AndroidUtilities.dp(260));
+
+ switch (a) {
+ case 0:
+ textView.setText(LocaleController.getString("GigagroupConvertInfo1", R.string.GigagroupConvertInfo1));
+ break;
+ case 1:
+ textView.setText(LocaleController.getString("GigagroupConvertInfo2", R.string.GigagroupConvertInfo2));
+ break;
+ case 2:
+ textView.setText(LocaleController.getString("GigagroupConvertInfo3", R.string.GigagroupConvertInfo3));
+ break;
+ }
+
+ if (LocaleController.isRTL) {
+ linearLayout2.addView(textView, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT));
+ linearLayout2.addView(imageView, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, 8, 7, 0, 0));
+ } else {
+ linearLayout2.addView(imageView, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, 0, 8, 8, 0));
+ linearLayout2.addView(textView, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT));
+ }
+ }
+
+ BottomSheetCell clearButton = new BottomSheetCell(context);
+ clearButton.setBackground(null);
+ clearButton.setText(LocaleController.getString("GigagroupConvertProcessButton", R.string.GigagroupConvertProcessButton));
+ clearButton.background.setOnClickListener(v -> {
+ dismiss();
+ AlertDialog.Builder builder = new AlertDialog.Builder(context);
+ builder.setTitle(LocaleController.getString("GigagroupConvertAlertTitle", R.string.GigagroupConvertAlertTitle));
+ builder.setMessage(AndroidUtilities.replaceTags(LocaleController.getString("GigagroupConvertAlertText", R.string.GigagroupConvertAlertText)));
+ builder.setPositiveButton(LocaleController.getString("GigagroupConvertAlertConver", R.string.GigagroupConvertAlertConver), (dialogInterface, i) -> onCovert());
+ builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
+ parentFragment.showDialog(builder.create());
+ });
+ linearLayout.addView(clearButton, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 50, Gravity.LEFT | Gravity.TOP, 0, 29, 0, 0));
+
+ TextView cancelTextView = new TextView(context);
+ cancelTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+ cancelTextView.setTextColor(Theme.getColor(Theme.key_dialogTextBlue2));
+ cancelTextView.setText(LocaleController.getString("GigagroupConvertCancelButton", R.string.GigagroupConvertCancelButton));
+ cancelTextView.setGravity(Gravity.CENTER);
+ linearLayout.addView(cancelTextView, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, 48, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 17, 0, 17, 16));
+ cancelTextView.setOnClickListener(v -> {
+ onCancel();
+ dismiss();
+ });
+ }
+
+ protected void onCovert() {
+
+ }
+
+ protected void onCancel() {
+
+ }
+}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/GroupVoipInviteAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/GroupVoipInviteAlert.java
index 88df5a0a1..f46a6bb40 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/GroupVoipInviteAlert.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/GroupVoipInviteAlert.java
@@ -8,38 +8,17 @@
package org.telegram.ui.Components;
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.annotation.SuppressLint;
import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.graphics.RectF;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.text.Editable;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
-import android.text.TextWatcher;
import android.text.style.ForegroundColorSpan;
-import android.util.Property;
import android.util.SparseArray;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.view.inputmethod.EditorInfo;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
+
+import androidx.recyclerview.widget.RecyclerView;
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.ChatObject;
@@ -53,12 +32,9 @@ import org.telegram.messenger.Utilities;
import org.telegram.tgnet.ConnectionsManager;
import org.telegram.tgnet.TLObject;
import org.telegram.tgnet.TLRPC;
-import org.telegram.ui.ActionBar.BottomSheet;
import org.telegram.ui.ActionBar.Theme;
import org.telegram.ui.Adapters.SearchAdapterHelper;
import org.telegram.ui.Cells.GraySectionCell;
-import org.telegram.ui.Cells.GroupCallTextCell;
-import org.telegram.ui.Cells.GroupCallUserCell;
import org.telegram.ui.Cells.ManageChatTextCell;
import org.telegram.ui.Cells.ManageChatUserCell;
import org.telegram.ui.ChatUsersActivity;
@@ -67,9 +43,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
public class GroupVoipInviteAlert extends UsersAlertBase {
private final SearchAdapter searchAdapter;
@@ -366,7 +339,13 @@ public class GroupVoipInviteAlert extends UsersAlertBase {
if (delayResults <= 0) {
loadingUsers = false;
firstLoaded = true;
- showItemsAnimated(listViewAdapter != null ? listViewAdapter.getItemCount() - 1 : 0);
+ int num;
+ if (flickerProgressRow == 1) {
+ num = 1;
+ } else {
+ num = listViewAdapter != null ? listViewAdapter.getItemCount() - 1 : 0;
+ }
+ showItemsAnimated(num);
}
updateRows();
if (listViewAdapter != null) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/HintView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/HintView.java
index b6e35b7a0..b202bb9b2 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/HintView.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/HintView.java
@@ -20,7 +20,6 @@ import org.telegram.messenger.LocaleController;
import org.telegram.messenger.MessageObject;
import org.telegram.messenger.R;
import org.telegram.tgnet.TLRPC;
-import org.telegram.ui.ActionBar.SimpleTextView;
import org.telegram.ui.ActionBar.Theme;
import org.telegram.ui.Cells.ChatMessageCell;
@@ -62,7 +61,13 @@ public class HintView extends FrameLayout {
textView.setTextColor(Theme.getColor(Theme.key_chat_gifSaveHintText));
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
textView.setMaxLines(2);
- textView.setMaxWidth(AndroidUtilities.dp(type == 4 ? 280 : 250));
+ if (type == 7) {
+ textView.setMaxWidth(AndroidUtilities.dp(310));
+ } else if (type == 4) {
+ textView.setMaxWidth(AndroidUtilities.dp(280));
+ } else {
+ textView.setMaxWidth(AndroidUtilities.dp(250));
+ }
if (currentType == TYPE_SEARCH_AS_LIST) {
textView.setGravity(Gravity.LEFT | Gravity.CENTER_VERTICAL);
textView.setBackground(Theme.createRoundRectDrawable(AndroidUtilities.dp(5), Theme.getColor(Theme.key_chat_gifSaveHintBackground)));
@@ -70,11 +75,13 @@ public class HintView extends FrameLayout {
addView(textView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, 30, Gravity.LEFT | Gravity.TOP, 0, topArrow ? 6 : 0, 0, topArrow ? 0 : 6));
} else {
textView.setGravity(Gravity.LEFT | Gravity.TOP);
- textView.setBackground(Theme.createRoundRectDrawable(AndroidUtilities.dp(3), Theme.getColor(Theme.key_chat_gifSaveHintBackground)));
+ textView.setBackground(Theme.createRoundRectDrawable(AndroidUtilities.dp(currentType == 7 ? 6 : 3), Theme.getColor(Theme.key_chat_gifSaveHintBackground)));
if (currentType == TYPE_POLL_VOTE || currentType == 4) {
textView.setPadding(AndroidUtilities.dp(9), AndroidUtilities.dp(6), AndroidUtilities.dp(9), AndroidUtilities.dp(7));
} else if (currentType == 2) {
textView.setPadding(AndroidUtilities.dp(7), AndroidUtilities.dp(6), AndroidUtilities.dp(7), AndroidUtilities.dp(7));
+ } else if (currentType == 7) {
+ textView.setPadding(AndroidUtilities.dp(8), AndroidUtilities.dp(7), AndroidUtilities.dp(8), AndroidUtilities.dp(8));
} else {
textView.setPadding(AndroidUtilities.dp(currentType == 0 ? 54 : 5), AndroidUtilities.dp(6), AndroidUtilities.dp(5), AndroidUtilities.dp(7));
}
@@ -281,15 +288,18 @@ public class HintView extends FrameLayout {
top += AndroidUtilities.dp(4);
} else if (currentType == 6) {
top += view.getMeasuredHeight() + getMeasuredHeight() + AndroidUtilities.dp(10);
+ } else if (currentType == 7) {
+ top += view.getMeasuredHeight() + getMeasuredHeight() + AndroidUtilities.dp(8);
}
int centerX;
if (currentType == TYPE_SEARCH_AS_LIST) {
- if (view instanceof SimpleTextView) {
- centerX = position[0] + ((SimpleTextView) view).getTextWidth() / 2;
- } else {
- throw new IllegalArgumentException();
- }
+// if (view instanceof SimpleTextView) {
+// centerX = position[0] + ((SimpleTextView) view).getTextWidth() / 2;
+// } else {
+// throw new IllegalArgumentException();
+// }
+ centerX = position[0];
} else {
centerX = position[0] + view.getMeasuredWidth() / 2;
}
@@ -302,7 +312,7 @@ public class HintView extends FrameLayout {
top -= bottomOffset;
int parentWidth = parentView.getMeasuredWidth();
- if (isTopArrow && currentType != 6) {
+ if (isTopArrow && currentType != 6 && currentType != 7) {
setTranslationY(extraTranslationY + (translationY = AndroidUtilities.dp(44)));
} else {
setTranslationY(extraTranslationY + (translationY = top - getMeasuredHeight()));
@@ -330,6 +340,9 @@ public class HintView extends FrameLayout {
}
setTranslationX(offset);
float arrowX = centerX - (leftMargin + offset) - arrowImageView.getMeasuredWidth() / 2;
+ if (currentType == 7) {
+ arrowX += AndroidUtilities.dp(2);
+ }
arrowImageView.setTranslationX(arrowX);
if (centerX > parentView.getMeasuredWidth() / 2) {
if (arrowX < AndroidUtilities.dp(10)) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/InviteLinkBottomSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/InviteLinkBottomSheet.java
index c22e63a53..1030d0323 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/InviteLinkBottomSheet.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/InviteLinkBottomSheet.java
@@ -28,11 +28,11 @@ import androidx.recyclerview.widget.RecyclerView;
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.MessagesController;
+import org.telegram.messenger.MessagesStorage;
import org.telegram.messenger.R;
import org.telegram.messenger.UserConfig;
import org.telegram.tgnet.ConnectionsManager;
import org.telegram.tgnet.TLRPC;
-import org.telegram.ui.ActionBar.AlertDialog;
import org.telegram.ui.ActionBar.BaseFragment;
import org.telegram.ui.ActionBar.BottomSheet;
import org.telegram.ui.ActionBar.Theme;
@@ -40,11 +40,13 @@ import org.telegram.ui.Cells.HeaderCell;
import org.telegram.ui.Cells.ShadowSectionCell;
import org.telegram.ui.Cells.TextInfoPrivacyCell;
import org.telegram.ui.Cells.UserCell;
+import org.telegram.ui.LinkEditActivity;
import org.telegram.ui.ManageLinksActivity;
import org.telegram.ui.ProfileActivity;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Locale;
public class InviteLinkBottomSheet extends BottomSheet {
@@ -64,6 +66,7 @@ public class InviteLinkBottomSheet extends BottomSheet {
int loadingRow;
int emptyView;
int emptyView2;
+ int emptyHintRow;
boolean usersLoading;
boolean hasMore;
@@ -80,12 +83,15 @@ public class InviteLinkBottomSheet extends BottomSheet {
private int scrollOffsetY;
private boolean ignoreLayout;
private boolean permanent;
+ private boolean titleVisible;
ArrayList invitedUsers = new ArrayList<>();
private int chatId;
+ private boolean isChannel;
+ private final long timeDif;
- public InviteLinkBottomSheet(Context context, TLRPC.TL_chatInviteExported invite, TLRPC.ChatFull info, HashMap users, BaseFragment fragment, int chatId, boolean permanent) {
+ public InviteLinkBottomSheet(Context context, TLRPC.TL_chatInviteExported invite, TLRPC.ChatFull info, HashMap users, BaseFragment fragment, int chatId, boolean permanent, boolean isChannel) {
super(context, false);
this.invite = invite;
this.users = users;
@@ -93,6 +99,13 @@ public class InviteLinkBottomSheet extends BottomSheet {
this.info = info;
this.chatId = chatId;
this.permanent = permanent;
+ this.isChannel = isChannel;
+
+ if (this.users == null) {
+ this.users = new HashMap<>();
+ }
+
+ timeDif = ConnectionsManager.getInstance(currentAccount).getCurrentTime() - (System.currentTimeMillis() / 1000L);
containerView = new FrameLayout(context) {
@@ -192,6 +205,7 @@ public class InviteLinkBottomSheet extends BottomSheet {
listView = new RecyclerListView(context) {
int lastH;
+
@Override
public void requestLayout() {
if (ignoreLayout) {
@@ -247,6 +261,9 @@ public class InviteLinkBottomSheet extends BottomSheet {
listView.setOnItemClickListener(new RecyclerListView.OnItemClickListener() {
@Override
public void onItemClick(View view, int position) {
+ if (position == creatorRow && invite.admin_id == UserConfig.getInstance(currentAccount).clientUserId) {
+ return;
+ }
if (position == creatorRow || (position >= usersStartRow && position < usersEndRow)) {
TLRPC.User user;
if (position == creatorRow) {
@@ -266,24 +283,31 @@ public class InviteLinkBottomSheet extends BottomSheet {
}
}
});
- containerView.addView(listView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, Gravity.TOP | Gravity.LEFT, 0, permanent ? 0 : 48, 0, 0));
+ titleTextView = new TextView(context);
+ titleTextView.setLines(1);
+ titleTextView.setSingleLine(true);
+ titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
+ titleTextView.setEllipsize(TextUtils.TruncateAt.END);
+ titleTextView.setPadding(AndroidUtilities.dp(18), 0, AndroidUtilities.dp(18), 0);
+ titleTextView.setGravity(Gravity.CENTER_VERTICAL);
+ titleTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
if (!permanent) {
- titleTextView = new TextView(context);
- titleTextView.setLines(1);
- titleTextView.setSingleLine(true);
- titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20);
- titleTextView.setEllipsize(TextUtils.TruncateAt.END);
- titleTextView.setPadding(AndroidUtilities.dp(18), 0, AndroidUtilities.dp(18), 0);
- titleTextView.setGravity(Gravity.CENTER_VERTICAL);
titleTextView.setText(invite.revoked ? LocaleController.getString("RevokedLink", R.string.RevokedLink) : LocaleController.getString("InviteLink", R.string.InviteLink));
- titleTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
- containerView.addView(titleTextView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 50, Gravity.LEFT | Gravity.TOP, 0, 0, 40, 0));
+ titleVisible = true;
+ } else {
+ titleTextView.setText(LocaleController.getString("InviteLink", R.string.InviteLink));
+ titleVisible = false;
+ titleTextView.setVisibility(View.INVISIBLE);
+ titleTextView.setAlpha(0f);
}
+ containerView.addView(listView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, Gravity.TOP | Gravity.LEFT, 0, !titleVisible ? 0 : 48, 0, 0));
+ containerView.addView(titleTextView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, !titleVisible ? 48 : 50, Gravity.LEFT | Gravity.TOP, 0, 0, 0, 0));
+
updateRows();
loadUsers();
- if (users.get(invite.admin_id) == null) {
+ if (users == null || users.get(invite.admin_id) == null) {
loadCreator();
}
@@ -295,6 +319,9 @@ public class InviteLinkBottomSheet extends BottomSheet {
titleTextView.setTextColor(Theme.getColor(Theme.key_dialogTextBlack));
titleTextView.setLinkTextColor(Theme.getColor(Theme.key_dialogTextLink));
titleTextView.setHighlightColor(Theme.getColor(Theme.key_dialogLinkSelection));
+ if (!titleVisible) {
+ titleTextView.setBackgroundColor(Theme.getColor(Theme.key_windowBackgroundWhite));
+ }
}
listView.setGlowColor(Theme.getColor(Theme.key_dialogScrollGlow));
shadow.setBackgroundColor(Theme.getColor(Theme.key_dialogShadowLine));
@@ -323,7 +350,7 @@ public class InviteLinkBottomSheet extends BottomSheet {
private void updateColorForView(View view) {
if (view instanceof HeaderCell) {
((HeaderCell) view).getTextView().setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteBlueHeader));
- } else if (view instanceof LinkActionView){
+ } else if (view instanceof LinkActionView) {
((LinkActionView) view).updateColors();
} else if (view instanceof TextInfoPrivacyCell) {
CombinedDrawable combinedDrawable = new CombinedDrawable(new ColorDrawable(Theme.getColor(Theme.key_windowBackgroundGray)), Theme.getThemedDrawable(view.getContext(), R.drawable.greydivider, Theme.key_windowBackgroundGrayShadow));
@@ -334,7 +361,7 @@ public class InviteLinkBottomSheet extends BottomSheet {
((UserCell) view).update(0);
}
RecyclerView.ViewHolder holder = listView.getChildViewHolder(view);
- if (holder != null){
+ if (holder != null) {
if (holder.getItemViewType() == 7) {
Drawable shadowDrawable = Theme.getThemedDrawable(view.getContext(), R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow);
Drawable background = new ColorDrawable(Theme.getColor(Theme.key_windowBackgroundGray));
@@ -366,7 +393,6 @@ public class InviteLinkBottomSheet extends BottomSheet {
}
}
});
-
});
}
@@ -385,7 +411,7 @@ public class InviteLinkBottomSheet extends BottomSheet {
emptyView2 = -1;
linkActionRow = -1;
linkInfoRow = -1;
-
+ emptyHintRow = -1;
if (!permanent) {
linkActionRow = rowCount++;
@@ -395,19 +421,24 @@ public class InviteLinkBottomSheet extends BottomSheet {
creatorRow = rowCount++;
emptyView = rowCount++;
- if (invite.usage > 0) {
+ if (!(invite.usage == 0 && invite.usage_limit == 0)) {
dividerRow = rowCount++;
usersHeaderRow = rowCount++;
if (!invitedUsers.isEmpty()) {
usersStartRow = rowCount;
rowCount += invitedUsers.size();
usersEndRow = rowCount;
- } else {
+ emptyView2 = rowCount++;
+ } else if (invite.usage > 0) {
loadingRow = rowCount++;
+ emptyView2 = rowCount++;
+ } else {
+ emptyHintRow = rowCount++;
}
- emptyView2 = rowCount++;
}
- divider2Row = rowCount++;
+ if (emptyHintRow == -1) {
+ divider2Row = rowCount++;
+ }
adapter.notifyDataSetChanged();
}
@@ -432,6 +463,8 @@ public class InviteLinkBottomSheet extends BottomSheet {
return 6;
} else if (position == divider2Row) {
return 7;
+ } else if (position == emptyHintRow) {
+ return 8;
}
return 0;
}
@@ -444,7 +477,11 @@ public class InviteLinkBottomSheet extends BottomSheet {
switch (viewType) {
default:
case 0:
- view = new HeaderCell(context);
+ HeaderCell headerCell = new HeaderCell(context, Theme.key_windowBackgroundWhiteBlueHeader, 21, 15, true);
+ headerCell.getTextView2().setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteRedText));
+ headerCell.getTextView2().setTextSize(15);
+ headerCell.getTextView2().setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
+ view = headerCell;
break;
case 1:
view = new UserCell(context, 12, 0, true);
@@ -453,13 +490,36 @@ public class InviteLinkBottomSheet extends BottomSheet {
view = new ShadowSectionCell(context, 12, Theme.getColor(Theme.key_windowBackgroundGray));
break;
case 3:
- LinkActionView linkActionView = new LinkActionView(context, fragment, InviteLinkBottomSheet.this, chatId, false);
+ LinkActionView linkActionView = new LinkActionView(context, fragment, InviteLinkBottomSheet.this, chatId, false, isChannel);
view = linkActionView;
linkActionView.setDelegate(new LinkActionView.Delegate() {
@Override
public void revokeLink() {
if (fragment instanceof ManageLinksActivity) {
((ManageLinksActivity) fragment).revokeLink(invite);
+ } else {
+ TLRPC.TL_messages_editExportedChatInvite req = new TLRPC.TL_messages_editExportedChatInvite();
+ req.link = invite.link;
+ req.revoked = true;
+ req.peer = MessagesController.getInstance(currentAccount).getInputPeer(-chatId);
+ ConnectionsManager.getInstance(currentAccount).sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
+ if (error == null) {
+ if (response instanceof TLRPC.TL_messages_exportedChatInviteReplaced) {
+ TLRPC.TL_messages_exportedChatInviteReplaced replaced = (TLRPC.TL_messages_exportedChatInviteReplaced) response;
+ if (info != null) {
+ info.exported_invite = (TLRPC.TL_chatInviteExported) replaced.new_invite;
+ }
+ } else {
+ if (info != null) {
+ info.invitesCount--;
+ if (info.invitesCount < 0) {
+ info.invitesCount = 0;
+ }
+ MessagesStorage.getInstance(currentAccount).saveChatLinksCount(chatId, info.invitesCount);
+ }
+ }
+ }
+ }));
}
dismiss();
}
@@ -468,6 +528,10 @@ public class InviteLinkBottomSheet extends BottomSheet {
public void editLink() {
if (fragment instanceof ManageLinksActivity) {
((ManageLinksActivity) fragment).editLink(invite);
+ } else {
+ LinkEditActivity activity = new LinkEditActivity(LinkEditActivity.EDIT_TYPE, chatId);
+ activity.setInviteToEdit(invite);
+ fragment.presentFragment(activity);
}
dismiss();
}
@@ -476,6 +540,15 @@ public class InviteLinkBottomSheet extends BottomSheet {
public void removeLink() {
if (fragment instanceof ManageLinksActivity) {
((ManageLinksActivity) fragment).deleteLink(invite);
+ } else {
+ TLRPC.TL_messages_deleteExportedChatInvite req = new TLRPC.TL_messages_deleteExportedChatInvite();
+ req.link = invite.link;
+ req.peer = MessagesController.getInstance(currentAccount).getInputPeer(-chatId);
+ ConnectionsManager.getInstance(currentAccount).sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
+ if (error == null) {
+
+ }
+ }));
}
dismiss();
}
@@ -483,7 +556,7 @@ public class InviteLinkBottomSheet extends BottomSheet {
view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
break;
case 4:
- view = new TextInfoPrivacyCell(context);
+ view = new TimerPrivacyCell(context);
CombinedDrawable combinedDrawable = new CombinedDrawable(new ColorDrawable(Theme.getColor(Theme.key_windowBackgroundGray)), Theme.getThemedDrawable(context, R.drawable.greydivider, Theme.key_windowBackgroundGrayShadow));
combinedDrawable.setFullsize(true);
view.setBackground(combinedDrawable);
@@ -511,6 +584,9 @@ public class InviteLinkBottomSheet extends BottomSheet {
combinedDrawable.setFullsize(true);
view.setBackgroundDrawable(combinedDrawable);
break;
+ case 8:
+ view = new EmptyHintRow(context);
+ break;
}
view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
return new RecyclerListView.Holder(view);
@@ -523,8 +599,18 @@ public class InviteLinkBottomSheet extends BottomSheet {
HeaderCell headerCell = (HeaderCell) holder.itemView;
if (position == creatorHeaderRow) {
headerCell.setText(LocaleController.getString("LinkCreatedeBy", R.string.LinkCreatedeBy));
+ headerCell.setText2(null);
} else if (position == usersHeaderRow) {
- headerCell.setText(LocaleController.formatPluralString("PeopleJoined", invite.usage));
+ if (invite.usage > 0) {
+ headerCell.setText(LocaleController.formatPluralString("PeopleJoined", invite.usage));
+ } else {
+ headerCell.setText(LocaleController.getString("NoOneJoined", R.string.NoOneJoined));
+ }
+ if (!invite.expired && !invite.revoked && invite.usage_limit > 0 && invite.usage > 0) {
+ headerCell.setText2(LocaleController.formatPluralString("PeopleJoinedRemaining", invite.usage_limit - invite.usage));
+ } else {
+ headerCell.setText2(null);
+ }
}
break;
case 1:
@@ -534,10 +620,13 @@ public class InviteLinkBottomSheet extends BottomSheet {
String status = null;
if (position == creatorRow) {
user = users.get(invite.admin_id);
+ if (user == null) {
+ user = MessagesController.getInstance(currentAccount).getUser(invite.admin_id);
+ }
if (user != null) {
status = LocaleController.formatDateAudio(invite.date, false);
}
- if (info != null && user != null) {
+ if (info != null && user != null && info.participants != null) {
for (int i = 0; i < info.participants.participants.size(); i++) {
if (info.participants.participants.get(i).user_id == user.id) {
TLRPC.ChatParticipant part = info.participants.participants.get(i);
@@ -567,7 +656,6 @@ public class InviteLinkBottomSheet extends BottomSheet {
break;
}
}
-
}
} else {
TLRPC.TL_chatInviteImporter invitedUser = invitedUsers.get(position - usersStartRow);
@@ -581,19 +669,59 @@ public class InviteLinkBottomSheet extends BottomSheet {
actionView.setUsers(0, null);
actionView.setLink(invite.link);
actionView.setRevoke(invite.revoked);
+ actionView.setPermanent(invite.permanent);
break;
case 4:
- TextInfoPrivacyCell privacyCell = (TextInfoPrivacyCell) holder.itemView;
+ TimerPrivacyCell privacyCell = (TimerPrivacyCell) holder.itemView;
+ privacyCell.cancelTimer();
+ privacyCell.timer = false;
+ privacyCell.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteGrayText4));
+ privacyCell.setFixedSize(0);
if (invite.revoked) {
privacyCell.setText(LocaleController.getString("LinkIsNoActive", R.string.LinkIsNoActive));
} else if (invite.expired) {
- privacyCell.setText(LocaleController.getString("LinkIsExpired", R.string.LinkIsExpired));
+ if (invite.usage_limit > 0 && invite.usage_limit == invite.usage) {
+ privacyCell.setText(LocaleController.getString("LinkIsExpiredLimitReached", R.string.LinkIsExpiredLimitReached));
+ } else {
+ privacyCell.setText(LocaleController.getString("LinkIsExpired", R.string.LinkIsExpired));
+ privacyCell.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteRedText));
+ }
+
} else if (invite.expire_date > 0) {
- privacyCell.setText(LocaleController.formatString("LinkExpiresIn", R.string.LinkExpiresIn, LocaleController.formatDateAudio(invite.expire_date, false)));
+ long currentTime = System.currentTimeMillis() + timeDif * 1000L;
+ long expireTime = invite.expire_date * 1000L;
+
+ long timeLeft = expireTime - currentTime;
+ if (timeLeft < 0) {
+ timeLeft = 0;
+ }
+ String time;
+ if (timeLeft > 86400000L) {
+ time = LocaleController.formatDateAudio(invite.expire_date, false);
+ privacyCell.setText(LocaleController.formatString("LinkExpiresIn", R.string.LinkExpiresIn, time));
+ } else {
+ int s = (int) ((timeLeft / 1000) % 60);
+ int m = (int) ((timeLeft / 1000 / 60) % 60);
+ int h = (int) ((timeLeft / 1000 / 60 / 60));
+ time = String.format(Locale.ENGLISH, "%02d", h) + String.format(Locale.ENGLISH, ":%02d", m) + String.format(Locale.ENGLISH, ":%02d", s);
+ privacyCell.timer = true;
+ privacyCell.runTimer();
+ privacyCell.setText(LocaleController.formatString("LinkExpiresInTime", R.string.LinkExpiresInTime, time));
+ }
} else {
+ privacyCell.setFixedSize(12);
privacyCell.setText(null);
}
break;
+ case 8:
+ EmptyHintRow emptyHintRow = (EmptyHintRow) holder.itemView;
+ if (invite.usage_limit > 0) {
+ emptyHintRow.textView.setText(LocaleController.formatPluralString("PeopleCanJoinViaLink", invite.usage_limit));
+ emptyHintRow.textView.setVisibility(View.VISIBLE);
+ } else {
+ emptyHintRow.textView.setVisibility(View.GONE);
+ }
+ break;
}
}
@@ -605,7 +733,12 @@ public class InviteLinkBottomSheet extends BottomSheet {
@Override
public boolean isEnabled(RecyclerView.ViewHolder holder) {
int position = holder.getAdapterPosition();
- if (position == creatorRow || (position >= usersStartRow && position < usersEndRow)) {
+ if (position == creatorRow) {
+ if (invite.admin_id == UserConfig.getInstance(currentAccount).clientUserId) {
+ return false;
+ }
+ return true;
+ } else if (position >= usersStartRow && position < usersEndRow) {
return true;
}
return false;
@@ -645,12 +778,16 @@ public class InviteLinkBottomSheet extends BottomSheet {
shadow.setTag(show ? null : 1);
if (show) {
shadow.setVisibility(View.VISIBLE);
+ titleTextView.setVisibility(View.VISIBLE);
}
if (shadowAnimation != null) {
shadowAnimation.cancel();
}
shadowAnimation = new AnimatorSet();
shadowAnimation.playTogether(ObjectAnimator.ofFloat(shadow, View.ALPHA, show ? 1.0f : 0.0f));
+ if (!titleVisible) {
+ shadowAnimation.playTogether(ObjectAnimator.ofFloat(titleTextView, View.ALPHA, show ? 1.0f : 0.0f));
+ }
shadowAnimation.setDuration(150);
shadowAnimation.addListener(new AnimatorListenerAdapter() {
@Override
@@ -658,6 +795,7 @@ public class InviteLinkBottomSheet extends BottomSheet {
if (shadowAnimation != null && shadowAnimation.equals(animation)) {
if (!show) {
shadow.setVisibility(View.INVISIBLE);
+ titleTextView.setVisibility(View.INVISIBLE);
}
shadowAnimation = null;
}
@@ -707,4 +845,67 @@ public class InviteLinkBottomSheet extends BottomSheet {
});
});
}
+
+ private class TimerPrivacyCell extends TextInfoPrivacyCell {
+
+ Runnable timerRunnable = new Runnable() {
+ @Override
+ public void run() {
+ if (listView != null && listView.getAdapter() != null) {
+ int p = listView.getChildAdapterPosition(TimerPrivacyCell.this);
+ if (p >= 0)
+ adapter.onBindViewHolder(listView.getChildViewHolder(TimerPrivacyCell.this), p);
+ }
+ AndroidUtilities.runOnUIThread(this);
+ }
+ };
+
+ boolean timer;
+
+ public TimerPrivacyCell(Context context) {
+ super(context);
+ }
+
+ @Override
+ protected void onAttachedToWindow() {
+ super.onAttachedToWindow();
+ runTimer();
+ }
+
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ cancelTimer();
+ }
+
+ public void cancelTimer() {
+ AndroidUtilities.cancelRunOnUIThread(timerRunnable);
+ }
+
+ public void runTimer() {
+ cancelTimer();
+ if (timer) {
+ AndroidUtilities.runOnUIThread(timerRunnable, 500);
+ }
+ }
+ }
+
+ private class EmptyHintRow extends FrameLayout {
+
+ TextView textView;
+
+ public EmptyHintRow(@NonNull Context context) {
+ super(context);
+ textView = new TextView(context);
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+ textView.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteGrayText));
+ textView.setGravity(Gravity.CENTER_HORIZONTAL);
+ addView(textView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_VERTICAL, 60, 0, 60, 0));
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(84), MeasureSpec.EXACTLY));
+ }
+ }
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/InviteMembersBottomSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/InviteMembersBottomSheet.java
index efff27794..bbbd627b8 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/InviteMembersBottomSheet.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/InviteMembersBottomSheet.java
@@ -28,7 +28,6 @@ import android.view.ViewConfiguration;
import android.view.ViewGroup;
import android.view.ViewOutlineProvider;
import android.widget.ImageView;
-import android.widget.LinearLayout;
import android.widget.ScrollView;
import androidx.annotation.NonNull;
@@ -38,12 +37,11 @@ import androidx.recyclerview.widget.RecyclerView;
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.ApplicationLoader;
-import org.telegram.messenger.ChatObject;
import org.telegram.messenger.ContactsController;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.MessagesController;
+import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.R;
-import org.telegram.messenger.UserObject;
import org.telegram.messenger.Utilities;
import org.telegram.tgnet.ConnectionsManager;
import org.telegram.tgnet.TLObject;
@@ -52,7 +50,6 @@ import org.telegram.ui.ActionBar.AlertDialog;
import org.telegram.ui.ActionBar.BaseFragment;
import org.telegram.ui.ActionBar.Theme;
import org.telegram.ui.Adapters.SearchAdapterHelper;
-import org.telegram.ui.Cells.CheckBoxCell;
import org.telegram.ui.Cells.GroupCreateSectionCell;
import org.telegram.ui.Cells.GroupCreateUserCell;
import org.telegram.ui.Cells.ManageChatTextCell;
@@ -62,12 +59,12 @@ import org.telegram.ui.LaunchActivity;
import java.util.ArrayList;
-public class InviteMembersBottomSheet extends UsersAlertBase {
+public class InviteMembersBottomSheet extends UsersAlertBase implements NotificationCenter.NotificationCenterDelegate {
private SparseArray ignoreUsers;
private final SpansContainer spansContainer;
private final ScrollView spansScrollView;
- SearchAdapter searchAdapter;
+ private SearchAdapter searchAdapter;
private int emptyRow;
private int copyLinkRow;
@@ -82,21 +79,22 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
private ArrayList contacts = new ArrayList<>();
private SparseArray selectedContacts = new SparseArray<>();
- private ArrayList allSpans = new ArrayList<>();
- boolean spanEnter;
- float spansEnterProgress = 0;
+ private boolean spanEnter;
+ private float spansEnterProgress = 0;
private ValueAnimator spansEnterAnimator;
private GroupCreateSpan currentDeletingSpan;
- int scrollViewH;
+ private int scrollViewH;
private GroupCreateActivity.ContactsAddActivityDelegate delegate;
+ private InviteMembersBottomSheetDelegate dialogsDelegate;
+ private ArrayList dialogsServerOnly;
- int additionalHeight;
+ private int additionalHeight;
- float touchSlop;
- BaseFragment parentFragment;
+ private float touchSlop;
+ private BaseFragment parentFragment;
- View.OnClickListener spanClickListener = new View.OnClickListener() {
+ private View.OnClickListener spanClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
GroupCreateSpan span = (GroupCreateSpan) v;
@@ -104,7 +102,7 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
currentDeletingSpan = null;
selectedContacts.remove(span.getUid());
spansContainer.removeSpan(span);
- spansCountChanged();
+ spansCountChanged(true);
AndroidUtilities.updateVisibleRows(listView);
} else {
if (currentDeletingSpan != null) {
@@ -121,6 +119,10 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
private int searchAdditionalHeight;
private int chatId;
+ public interface InviteMembersBottomSheetDelegate {
+ void didSelectDialogs(ArrayList dids);
+ }
+
public InviteMembersBottomSheet(Context context, int account, SparseArray ignoreUsers, int chatId, BaseFragment parentFragment) {
super(context, false, account);
this.ignoreUsers = ignoreUsers;
@@ -128,6 +130,8 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
this.parentFragment = parentFragment;
this.chatId = chatId;
+ searchView.searchEditText.setHint(LocaleController.getString("SearchForChats", R.string.SearchForChats));
+
final ViewConfiguration configuration = ViewConfiguration.get(context);
touchSlop = configuration.getScaledTouchSlop();
@@ -160,6 +164,9 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
} else if (position > localCount + localServerCount && position <= globalCount + localCount + localServerCount) {
object = searchAdapter.searchAdapterHelper.getGlobalSearch().get(position - localCount - localServerCount - 1);
}
+ if (dialogsDelegate != null) {
+ searchView.closeSearch();
+ }
} else {
if (position == copyLinkRow) {
TLRPC.Chat chat = MessagesController.getInstance(currentAccount).getChat(chatId);
@@ -179,11 +186,11 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
android.content.ClipboardManager clipboard = (android.content.ClipboardManager) ApplicationLoader.applicationContext.getSystemService(Context.CLIPBOARD_SERVICE);
android.content.ClipData clip = android.content.ClipData.newPlainText("label", link);
clipboard.setPrimaryClip(clip);
- BulletinFactory.createCopyLinkBulletin(parentFragment).show();
dismiss();
+ BulletinFactory.createCopyLinkBulletin(parentFragment).show();
} else if (position >= contactsStartRow && position < contactsEndRow) {
- object = contacts.get(position - contactsStartRow);
+ object = ((ListAdapter) listViewAdapter).getObject(position);
}
}
@@ -208,10 +215,10 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
GroupCreateSpan groupCreateSpan = new GroupCreateSpan(context, object);
groupCreateSpan.setOnClickListener(spanClickListener);
selectedContacts.put(id, groupCreateSpan);
- spansContainer.addSpan(groupCreateSpan);
+ spansContainer.addSpan(groupCreateSpan, true);
}
}
- spansCountChanged();
+ spansCountChanged(true);
AndroidUtilities.updateVisibleRows(listView);
}
});
@@ -232,9 +239,7 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
} else {
maxSize = AndroidUtilities.dp(56);
}
- int lastH = getMeasuredHeight();
super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(maxSize, MeasureSpec.AT_MOST));
-
}
};
spansScrollView.setVisibility(View.GONE);
@@ -272,67 +277,57 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
}
floatingButton.setOnClickListener(v -> {
- if (selectedContacts.size() == 0) {
+ if (dialogsDelegate == null && selectedContacts.size() == 0) {
return;
}
Activity activity = AndroidUtilities.findActivity(context);
if (activity == null) {
return;
}
- AlertDialog.Builder builder = new AlertDialog.Builder(activity);
- if (selectedContacts.size() == 1) {
- builder.setTitle(LocaleController.getString("AddOneMemberAlertTitle", R.string.AddOneMemberAlertTitle));
+ if (dialogsDelegate != null) {
+ ArrayList dialogs = new ArrayList<>();
+ for (int a = 0; a < selectedContacts.size(); a++) {
+ int uid = selectedContacts.keyAt(a);
+ dialogs.add((long) uid);
+ }
+ dialogsDelegate.didSelectDialogs(dialogs);
+ dismiss();
} else {
- builder.setTitle(LocaleController.formatString("AddMembersAlertTitle", R.string.AddMembersAlertTitle, LocaleController.formatPluralString("Members", selectedContacts.size())));
- }
- StringBuilder stringBuilder = new StringBuilder();
- for (int a = 0; a < selectedContacts.size(); a++) {
- int uid = selectedContacts.keyAt(a);
- TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(uid);
- if (user == null) {
- continue;
+ AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+ if (selectedContacts.size() == 1) {
+ builder.setTitle(LocaleController.getString("AddOneMemberAlertTitle", R.string.AddOneMemberAlertTitle));
+ } else {
+ builder.setTitle(LocaleController.formatString("AddMembersAlertTitle", R.string.AddMembersAlertTitle, LocaleController.formatPluralString("Members", selectedContacts.size())));
}
- if (stringBuilder.length() > 0) {
- stringBuilder.append(", ");
+ StringBuilder stringBuilder = new StringBuilder();
+ for (int a = 0; a < selectedContacts.size(); a++) {
+ int uid = selectedContacts.keyAt(a);
+ TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(uid);
+ if (user == null) {
+ continue;
+ }
+ if (stringBuilder.length() > 0) {
+ stringBuilder.append(", ");
+ }
+ stringBuilder.append("**").append(ContactsController.formatName(user.first_name, user.last_name)).append("**");
}
- stringBuilder.append("**").append(ContactsController.formatName(user.first_name, user.last_name)).append("**");
- }
- TLRPC.Chat chat = MessagesController.getInstance(currentAccount).getChat(chatId);
- if (selectedContacts.size() > 5) {
- SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(AndroidUtilities.replaceTags(LocaleController.formatString("AddMembersAlertNamesText", R.string.AddMembersAlertNamesText, LocaleController.formatPluralString("Members", selectedContacts.size()), chat.title)));
- String countString = String.format("%d", selectedContacts.size());
- int index = TextUtils.indexOf(spannableStringBuilder, countString);
- if (index >= 0) {
- spannableStringBuilder.setSpan(new TypefaceSpan(AndroidUtilities.getTypeface("fonts/rmedium.ttf")), index, index + countString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ TLRPC.Chat chat = MessagesController.getInstance(currentAccount).getChat(chatId);
+ if (selectedContacts.size() > 5) {
+ SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(AndroidUtilities.replaceTags(LocaleController.formatString("AddMembersAlertNamesText", R.string.AddMembersAlertNamesText, LocaleController.formatPluralString("Members", selectedContacts.size()), chat.title)));
+ String countString = String.format("%d", selectedContacts.size());
+ int index = TextUtils.indexOf(spannableStringBuilder, countString);
+ if (index >= 0) {
+ spannableStringBuilder.setSpan(new TypefaceSpan(AndroidUtilities.getTypeface("fonts/rmedium.ttf")), index, index + countString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ }
+ builder.setMessage(spannableStringBuilder);
+ } else {
+ builder.setMessage(AndroidUtilities.replaceTags(LocaleController.formatString("AddMembersAlertNamesText", R.string.AddMembersAlertNamesText, stringBuilder, chat.title)));
}
- builder.setMessage(spannableStringBuilder);
- } else {
- builder.setMessage(AndroidUtilities.replaceTags(LocaleController.formatString("AddMembersAlertNamesText", R.string.AddMembersAlertNamesText, stringBuilder, chat.title)));
+ builder.setPositiveButton(LocaleController.getString("Add", R.string.Add), (dialogInterface, i) -> onAddToGroupDone(0));
+ builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
+ builder.create();
+ builder.show();
}
-// CheckBoxCell[] cells = new CheckBoxCell[1];
-// if (!ChatObject.isChannel(chat)) {
-// LinearLayout linearLayout = new LinearLayout(activity);
-// linearLayout.setOrientation(LinearLayout.VERTICAL);
-// cells[0] = new CheckBoxCell(activity, 1);
-// cells[0].setBackgroundDrawable(Theme.getSelectorDrawable(false));
-// cells[0].setMultiline(true);
-// if (selectedContacts.size() == 1) {
-// TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(selectedContacts.keyAt(0));
-// cells[0].setText(AndroidUtilities.replaceTags(LocaleController.formatString("AddOneMemberForwardMessages", R.string.AddOneMemberForwardMessages, UserObject.getFirstName(user))), "", true, false);
-// } else {
-// cells[0].setText(LocaleController.getString("AddMembersForwardMessages", R.string.AddMembersForwardMessages), "", true, false);
-// }
-// cells[0].setPadding(LocaleController.isRTL ? AndroidUtilities.dp(16) : AndroidUtilities.dp(8), 0, LocaleController.isRTL ? AndroidUtilities.dp(8) : AndroidUtilities.dp(16), 0);
-// linearLayout.addView(cells[0], LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
-// cells[0].setOnClickListener(v1 -> cells[0].setChecked(!cells[0].isChecked(), true));
-//
-// builder.setCustomViewOffset(12);
-// builder.setView(linearLayout);
-// }
- builder.setPositiveButton(LocaleController.getString("Add", R.string.Add), (dialogInterface, i) -> onAddToGroupDone(0));
- builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
- builder.create();
- builder.show();
});
floatingButton.setVisibility(View.INVISIBLE);
floatingButton.setScaleX(0.0f);
@@ -359,7 +354,75 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
dismiss();
}
- private void spansCountChanged() {
+ @Override
+ public void dismiss() {
+ super.dismiss();
+ NotificationCenter.getInstance(currentAccount).removeObserver(this, NotificationCenter.dialogsNeedReload);
+ }
+
+ public void setSelectedContacts(ArrayList dialogs) {
+ for (int a = 0, N = dialogs.size(); a < N; a++) {
+ int lowerId = (int) (long) dialogs.get(a);
+ TLObject object;
+ if (lowerId < 0) {
+ object = MessagesController.getInstance(currentAccount).getChat(-lowerId);
+ } else {
+ object = MessagesController.getInstance(currentAccount).getUser(lowerId);
+ }
+ GroupCreateSpan span = new GroupCreateSpan(spansContainer.getContext(), object);
+ spansContainer.addSpan(span, false);
+ span.setOnClickListener(spanClickListener);
+ }
+ spansCountChanged(false);
+
+ int count = spansContainer.getChildCount();
+
+ boolean isPortrait = AndroidUtilities.displaySize.x < AndroidUtilities.displaySize.y;
+
+ if (AndroidUtilities.isTablet() || isPortrait) {
+ maxSize = AndroidUtilities.dp(144);
+ } else {
+ maxSize = AndroidUtilities.dp(56);
+ }
+
+ int width;
+ if (AndroidUtilities.isTablet()) {
+ width = (int) (Math.min(AndroidUtilities.displaySize.x, AndroidUtilities.displaySize.y) * 0.8f);
+ } else {
+ width = isPortrait ? AndroidUtilities.displaySize.x : (int) Math.max(AndroidUtilities.displaySize.x * 0.8f, Math.min(AndroidUtilities.dp(480), AndroidUtilities.displaySize.x));
+ }
+ int maxWidth = width - AndroidUtilities.dp(26);
+ int currentLineWidth = 0;
+ int y = AndroidUtilities.dp(10);
+ for (int a = 0; a < count; a++) {
+ View child = spansContainer.getChildAt(a);
+ if (!(child instanceof GroupCreateSpan)) {
+ continue;
+ }
+ child.measure(View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.AT_MOST), View.MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(32), View.MeasureSpec.EXACTLY));
+ if (currentLineWidth + child.getMeasuredWidth() > maxWidth) {
+ y += child.getMeasuredHeight() + AndroidUtilities.dp(8);
+ currentLineWidth = 0;
+ }
+ currentLineWidth += child.getMeasuredWidth() + AndroidUtilities.dp(9);
+ }
+
+ int animateToH = y + AndroidUtilities.dp(32 + 10);
+
+ int newAdditionalH;
+ if (dialogsDelegate != null) {
+ newAdditionalH = spanEnter ? Math.min(maxSize, animateToH) : 0;
+ } else {
+ newAdditionalH = Math.max(0, Math.min(maxSize, animateToH) - AndroidUtilities.dp(52));
+ }
+ int oldSearchAdditionalH = searchAdditionalHeight;
+ searchAdditionalHeight = (selectedContacts.size() > 0 ? AndroidUtilities.dp(56) : 0);
+ if (newAdditionalH != additionalHeight || oldSearchAdditionalH != searchAdditionalHeight) {
+ additionalHeight = newAdditionalH;
+ }
+ }
+
+ private void spansCountChanged(boolean animated) {
boolean enter = selectedContacts.size() > 0;
if (spanEnter != enter) {
if (spansEnterAnimator != null) {
@@ -370,51 +433,73 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
if (spanEnter) {
spansScrollView.setVisibility(View.VISIBLE);
}
- spansEnterAnimator = ValueAnimator.ofFloat(spansEnterProgress, enter ? 1f : 0f);
- spansEnterAnimator.addUpdateListener(valueAnimator1 -> {
- spansEnterProgress = (float) valueAnimator1.getAnimatedValue();
- containerView.invalidate();
- });
- spansEnterAnimator.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animation) {
- spansEnterProgress = enter ? 1f : 0f;
+ if (animated) {
+ spansEnterAnimator = ValueAnimator.ofFloat(spansEnterProgress, enter ? 1f : 0f);
+ spansEnterAnimator.addUpdateListener(valueAnimator1 -> {
+ spansEnterProgress = (float) valueAnimator1.getAnimatedValue();
containerView.invalidate();
- if (!enter) {
- spansScrollView.setVisibility(View.GONE);
- }
- }
- });
- spansEnterAnimator.setDuration(150);
- spansEnterAnimator.start();
-
- if (!spanEnter) {
- if (currentDoneButtonAnimation != null) {
- currentDoneButtonAnimation.cancel();
- }
- currentDoneButtonAnimation = new AnimatorSet();
- currentDoneButtonAnimation.playTogether(ObjectAnimator.ofFloat(floatingButton, View.SCALE_X, 0.0f),
- ObjectAnimator.ofFloat(floatingButton, View.SCALE_Y, 0.0f),
- ObjectAnimator.ofFloat(floatingButton, View.ALPHA, 0.0f));
- currentDoneButtonAnimation.addListener(new AnimatorListenerAdapter() {
+ });
+ spansEnterAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
- floatingButton.setVisibility(View.INVISIBLE);
+ spansEnterProgress = enter ? 1f : 0f;
+ containerView.invalidate();
+ if (!enter) {
+ spansScrollView.setVisibility(View.GONE);
+ }
}
});
- currentDoneButtonAnimation.setDuration(180);
- currentDoneButtonAnimation.start();
+ spansEnterAnimator.setDuration(150);
+ spansEnterAnimator.start();
+
+ if (!spanEnter && dialogsDelegate == null) {
+ if (currentDoneButtonAnimation != null) {
+ currentDoneButtonAnimation.cancel();
+ }
+ currentDoneButtonAnimation = new AnimatorSet();
+ currentDoneButtonAnimation.playTogether(ObjectAnimator.ofFloat(floatingButton, View.SCALE_X, 0.0f),
+ ObjectAnimator.ofFloat(floatingButton, View.SCALE_Y, 0.0f),
+ ObjectAnimator.ofFloat(floatingButton, View.ALPHA, 0.0f));
+ currentDoneButtonAnimation.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ floatingButton.setVisibility(View.INVISIBLE);
+ }
+ });
+ currentDoneButtonAnimation.setDuration(180);
+ currentDoneButtonAnimation.start();
+ } else {
+ if (currentDoneButtonAnimation != null) {
+ currentDoneButtonAnimation.cancel();
+ }
+ currentDoneButtonAnimation = new AnimatorSet();
+ floatingButton.setVisibility(View.VISIBLE);
+ currentDoneButtonAnimation.playTogether(ObjectAnimator.ofFloat(floatingButton, View.SCALE_X, 1.0f),
+ ObjectAnimator.ofFloat(floatingButton, View.SCALE_Y, 1.0f),
+ ObjectAnimator.ofFloat(floatingButton, View.ALPHA, 1.0f));
+ currentDoneButtonAnimation.setDuration(180);
+ currentDoneButtonAnimation.start();
+ }
} else {
+ spansEnterProgress = enter ? 1.0f : 0.0f;
+ containerView.invalidate();
+ if (!enter) {
+ spansScrollView.setVisibility(View.GONE);
+ }
if (currentDoneButtonAnimation != null) {
currentDoneButtonAnimation.cancel();
}
- currentDoneButtonAnimation = new AnimatorSet();
- floatingButton.setVisibility(View.VISIBLE);
- currentDoneButtonAnimation.playTogether(ObjectAnimator.ofFloat(floatingButton, View.SCALE_X, 1.0f),
- ObjectAnimator.ofFloat(floatingButton, View.SCALE_Y, 1.0f),
- ObjectAnimator.ofFloat(floatingButton, View.ALPHA, 1.0f));
- currentDoneButtonAnimation.setDuration(180);
- currentDoneButtonAnimation.start();
+ if (!spanEnter && dialogsDelegate == null) {
+ floatingButton.setScaleY(0.0f);
+ floatingButton.setScaleX(0.0f);
+ floatingButton.setAlpha(0.0f);
+ floatingButton.setVisibility(View.INVISIBLE);
+ } else {
+ floatingButton.setScaleY(1.0f);
+ floatingButton.setScaleX(1.0f);
+ floatingButton.setAlpha(1.0f);
+ floatingButton.setVisibility(View.VISIBLE);
+ }
}
}
}
@@ -426,19 +511,39 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
rowCount = 0;
emptyRow = rowCount++;
- copyLinkRow = rowCount++;
-
- if (contacts.size() != 0) {
- contactsStartRow = rowCount;
- rowCount += contacts.size();
- contactsEndRow = rowCount;
+ if (dialogsDelegate == null) {
+ copyLinkRow = rowCount++;
+ if (contacts.size() != 0) {
+ contactsStartRow = rowCount;
+ rowCount += contacts.size();
+ contactsEndRow = rowCount;
+ } else {
+ noContactsStubRow = rowCount++;
+ }
} else {
- noContactsStubRow = rowCount++;
+ copyLinkRow = -1;
+ if (dialogsServerOnly.size() != 0) {
+ contactsStartRow = rowCount;
+ rowCount += dialogsServerOnly.size();
+ contactsEndRow = rowCount;
+ } else {
+ noContactsStubRow = rowCount++;
+ }
}
lastRow = rowCount++;
}
+ @Override
+ public void didReceivedNotification(int id, int account, Object... args) {
+ if (id == NotificationCenter.dialogsNeedReload) {
+ if (dialogsDelegate != null && dialogsServerOnly.isEmpty()) {
+ dialogsServerOnly = new ArrayList<>(MessagesController.getInstance(currentAccount).dialogsServerOnly);
+ listViewAdapter.notifyDataSetChanged();
+ }
+ }
+ }
+
private class ListAdapter extends RecyclerListView.SelectionAdapter {
@NonNull
@@ -463,7 +568,7 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
};
break;
case 3:
- view = new GroupCreateUserCell(context, true, 0, false);
+ view = new GroupCreateUserCell(context, true, 0, dialogsDelegate != null);
break;
case 4:
view = new View(context);
@@ -478,7 +583,11 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
};
stickerEmptyView.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
stickerEmptyView.subtitle.setVisibility(View.GONE);
- stickerEmptyView.title.setText(LocaleController.getString("NoContacts", R.string.NoContacts));
+ if (dialogsDelegate != null) {
+ stickerEmptyView.title.setText(LocaleController.getString("FilterNoChats", R.string.FilterNoChats));
+ } else {
+ stickerEmptyView.title.setText(LocaleController.getString("NoContacts", R.string.NoContacts));
+ }
stickerEmptyView.setAnimateLayoutChange(true);
view = stickerEmptyView;
break;
@@ -486,6 +595,20 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
return new RecyclerListView.Holder(view);
}
+ public TLObject getObject(int position) {
+ if (dialogsDelegate != null) {
+ TLRPC.Dialog dialog = dialogsServerOnly.get(position - contactsStartRow);
+ int lowerId = (int) dialog.id;
+ if (lowerId > 0) {
+ return MessagesController.getInstance(currentAccount).getUser(lowerId);
+ } else {
+ return MessagesController.getInstance(currentAccount).getChat(-lowerId);
+ }
+ } else {
+ return contacts.get(position - contactsStartRow);
+ }
+ }
+
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
switch (holder.getItemViewType()) {
@@ -494,10 +617,7 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
break;
case 3:
GroupCreateUserCell cell = (GroupCreateUserCell) holder.itemView;
- TLObject object;
- CharSequence username = null;
- CharSequence name = null;
- object = contacts.get(position - contactsStartRow);
+ TLObject object = getObject(position);
Object oldObject = cell.getObject();
int oldId;
@@ -509,7 +629,7 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
oldId = 0;
}
- cell.setObject(object, name, username, position != contactsEndRow);
+ cell.setObject(object, null, null, position != contactsEndRow);
int id;
if (object instanceof TLRPC.User) {
id = ((TLRPC.User) object).id;
@@ -785,7 +905,7 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
}
emptyView.showProgress(true, false);
Utilities.searchQueue.postRunnable(searchRunnable = () -> AndroidUtilities.runOnUIThread(() -> {
- searchAdapterHelper.queryServerSearch(query, true, false, true, false, false, 0, false, 0, 0);
+ searchAdapterHelper.queryServerSearch(query, true, dialogsDelegate != null, true, dialogsDelegate != null, false, 0, false, 0, 0);
Utilities.searchQueue.postRunnable(searchRunnable = () -> {
String search1 = query.trim().toLowerCase();
if (search1.length() == 0) {
@@ -897,7 +1017,6 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
private boolean animationStarted;
private ArrayList animators = new ArrayList<>();
- private View addingSpan;
private View removingSpan;
private int animationIndex = -1;
boolean addAnimation;
@@ -937,10 +1056,10 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
child.setTranslationY(allY);
} else if (removingSpan != null) {
if (child.getTranslationX() != x) {
- animators.add(ObjectAnimator.ofFloat(child, "translationX", x));
+ animators.add(ObjectAnimator.ofFloat(child, View.TRANSLATION_X, x));
}
if (child.getTranslationY() != y) {
- animators.add(ObjectAnimator.ofFloat(child, "translationY", y));
+ animators.add(ObjectAnimator.ofFloat(child, View.TRANSLATION_Y, y));
}
} else {
child.setTranslationX(x);
@@ -956,9 +1075,14 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
int h = allY + AndroidUtilities.dp(32 + 10);
int animateToH = y + AndroidUtilities.dp(32 + 10);
- int newAdditionalH = Math.max(0, Math.min(maxSize, animateToH) - AndroidUtilities.dp(52));
+ int newAdditionalH;
+ if (dialogsDelegate != null) {
+ newAdditionalH = spanEnter ? Math.min(maxSize, animateToH) : 0;
+ } else {
+ newAdditionalH = Math.max(0, Math.min(maxSize, animateToH) - AndroidUtilities.dp(52));
+ }
int oldSearchAdditionalH = searchAdditionalHeight;
- searchAdditionalHeight = (selectedContacts.size() > 0 ? AndroidUtilities.dp(56) : 0);
+ searchAdditionalHeight = (dialogsDelegate == null && selectedContacts.size() > 0 ? AndroidUtilities.dp(56) : 0);
if (newAdditionalH != additionalHeight || oldSearchAdditionalH != searchAdditionalHeight) {
additionalHeight = newAdditionalH;
if (listView.getAdapter() != null && listView.getAdapter().getItemCount() > 0) {
@@ -1021,9 +1145,8 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
}
}
- public void addSpan(final GroupCreateSpan span) {
+ public void addSpan(final GroupCreateSpan span, boolean animated) {
addAnimation = true;
- allSpans.add(span);
selectedContacts.put(span.getUid(), span);
if (currentAnimation != null) {
@@ -1031,22 +1154,22 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
currentAnimation.cancel();
}
animationStarted = false;
- currentAnimation = new AnimatorSet();
- currentAnimation.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animator) {
- addingSpan = null;
- currentAnimation = null;
- animationStarted = false;
- }
- });
- currentAnimation.setDuration(150);
- currentAnimation.setInterpolator(CubicBezierInterpolator.DEFAULT);
- addingSpan = span;
- animators.clear();
- animators.add(ObjectAnimator.ofFloat(addingSpan, View.SCALE_X, 0.01f, 1.0f));
- animators.add(ObjectAnimator.ofFloat(addingSpan, View.SCALE_Y, 0.01f, 1.0f));
- animators.add(ObjectAnimator.ofFloat(addingSpan, View.ALPHA, 0.0f, 1.0f));
+ if (animated) {
+ currentAnimation = new AnimatorSet();
+ currentAnimation.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animator) {
+ currentAnimation = null;
+ animationStarted = false;
+ }
+ });
+ currentAnimation.setDuration(150);
+ currentAnimation.setInterpolator(CubicBezierInterpolator.DEFAULT);
+ animators.clear();
+ animators.add(ObjectAnimator.ofFloat(span, View.SCALE_X, 0.01f, 1.0f));
+ animators.add(ObjectAnimator.ofFloat(span, View.SCALE_Y, 0.01f, 1.0f));
+ animators.add(ObjectAnimator.ofFloat(span, View.ALPHA, 0.0f, 1.0f));
+ }
addView(span);
}
@@ -1054,7 +1177,6 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
addAnimation = false;
boolean ignoreScrollEvent = true;
selectedContacts.remove(span.getUid());
- allSpans.remove(span);
span.setOnClickListener(null);
if (currentAnimation != null) {
@@ -1164,8 +1286,15 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
searchAdapter.searchDialogs(text);
}
- public void setDelegate(GroupCreateActivity.ContactsAddActivityDelegate delegate) {
- this.delegate = delegate;
+ public void setDelegate(GroupCreateActivity.ContactsAddActivityDelegate contactsAddActivityDelegate) {
+ delegate = contactsAddActivityDelegate;
+ }
+
+ public void setDelegate(InviteMembersBottomSheetDelegate inviteMembersBottomSheetDelegate, ArrayList selectedDialogs) {
+ dialogsDelegate = inviteMembersBottomSheetDelegate;
+ NotificationCenter.getInstance(currentAccount).addObserver(this, NotificationCenter.dialogsNeedReload);
+ dialogsServerOnly = new ArrayList<>(MessagesController.getInstance(currentAccount).dialogsServerOnly);
+ updateRows();
}
private class ItemAnimator extends DefaultItemAnimator {
@@ -1202,7 +1331,7 @@ public class InviteMembersBottomSheet extends UsersAlertBase {
}
linkGenerating = true;
TLRPC.TL_messages_exportChatInvite req = new TLRPC.TL_messages_exportChatInvite();
- //req.legacy_revoke_permanent = true; TODO layer 124
+ req.legacy_revoke_permanent = true;
req.peer = MessagesController.getInstance(currentAccount).getInputPeer(-chatId);
ConnectionsManager.getInstance(currentAccount).sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
if (error == null) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/LinkActionView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/LinkActionView.java
index 1009a57bb..e1ad392cc 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/LinkActionView.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/LinkActionView.java
@@ -5,16 +5,21 @@ import android.animation.AnimatorListenerAdapter;
import android.content.Context;
import android.content.Intent;
import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
+import android.widget.PopupWindow;
import android.widget.ScrollView;
import android.widget.TextView;
@@ -62,25 +67,31 @@ public class LinkActionView extends LinearLayout {
private boolean permanent;
boolean loadingImporters;
private QRCodeBottomSheet qrCodeBottomSheet;
- private boolean isPublic;
+ private boolean hideRevokeOption;
+ private boolean canEdit = true;
+ private boolean isChannel;
float[] point = new float[2];
- public LinkActionView(Context context, BaseFragment fragment, BottomSheet bottomSheet, int chatId, boolean permanent) {
+ public LinkActionView(Context context, BaseFragment fragment, BottomSheet bottomSheet, int chatId, boolean permanent, boolean isChannel) {
super(context);
this.fragment = fragment;
this.permanent = permanent;
+ this.isChannel = isChannel;
+
setOrientation(VERTICAL);
frameLayout = new FrameLayout(context);
linkView = new TextView(context);
linkView.setPadding(AndroidUtilities.dp(20), AndroidUtilities.dp(18), AndroidUtilities.dp(40), AndroidUtilities.dp(18));
linkView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
+ linkView.setEllipsize(TextUtils.TruncateAt.MIDDLE);
+ linkView.setSingleLine(true);
frameLayout.addView(linkView);
optionsView = new ImageView(context);
optionsView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_ab_other));
optionsView.setScaleType(ImageView.ScaleType.CENTER);
- frameLayout.addView(optionsView, LayoutHelper.createFrame(40, 48, Gravity.RIGHT | Gravity.CENTER_VERTICAL));
+ frameLayout.addView(optionsView, LayoutHelper.createFrame(40, 48, Gravity.RIGHT | Gravity.CENTER_VERTICAL));
addView(frameLayout, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, 0, 4, 0, 4, 0));
LinearLayout linearLayout = new LinearLayout(context);
@@ -91,13 +102,13 @@ public class LinkActionView extends LinearLayout {
SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder();
spannableStringBuilder.append("..").setSpan(new ColoredImageSpan(ContextCompat.getDrawable(context, R.drawable.baseline_content_copy_24)), 0, 1, 0);
spannableStringBuilder.setSpan(new DialogCell.FixedWidthSpan(AndroidUtilities.dp(8)), 1, 2, 0);
- spannableStringBuilder.append(LocaleController.getString("CopyLink", R.string.CopyLink));
+ spannableStringBuilder.append(LocaleController.getString("LinkActionCopy", R.string.LinkActionCopy));
spannableStringBuilder.append(".").setSpan(new DialogCell.FixedWidthSpan(AndroidUtilities.dp(5)), spannableStringBuilder.length() - 1, spannableStringBuilder.length(), 0);
copyView.setText(spannableStringBuilder);
copyView.setPadding(AndroidUtilities.dp(10), AndroidUtilities.dp(10), AndroidUtilities.dp(10), AndroidUtilities.dp(10));
copyView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
copyView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
- copyView.setLines(1);
+ copyView.setSingleLine(true);
linearLayout.addView(copyView, LayoutHelper.createLinear(0, 40, 1f, 0, 4, 0, 4, 0));
shareView = new TextView(context);
@@ -105,14 +116,14 @@ public class LinkActionView extends LinearLayout {
spannableStringBuilder = new SpannableStringBuilder();
spannableStringBuilder.append("..").setSpan(new ColoredImageSpan(ContextCompat.getDrawable(context, R.drawable.baseline_forward_24)), 0, 1, 0);
spannableStringBuilder.setSpan(new DialogCell.FixedWidthSpan(AndroidUtilities.dp(8)), 1, 2, 0);
- spannableStringBuilder.append(LocaleController.getString("ShareLink", R.string.ShareLink));
+ spannableStringBuilder.append(LocaleController.getString("LinkActionShare", R.string.LinkActionShare));
spannableStringBuilder.append(".").setSpan(new DialogCell.FixedWidthSpan(AndroidUtilities.dp(5)), spannableStringBuilder.length() - 1, spannableStringBuilder.length(), 0);
shareView.setText(spannableStringBuilder);
shareView.setPadding(AndroidUtilities.dp(10), AndroidUtilities.dp(10), AndroidUtilities.dp(10), AndroidUtilities.dp(10));
shareView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
shareView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
- shareView.setLines(1);
+ shareView.setSingleLine(true);
linearLayout.addView(shareView, LayoutHelper.createLinear(0, 40, 1f, 4, 0, 4, 0));
@@ -127,15 +138,14 @@ public class LinkActionView extends LinearLayout {
removeView.setPadding(AndroidUtilities.dp(10), AndroidUtilities.dp(10), AndroidUtilities.dp(10), AndroidUtilities.dp(10));
removeView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
removeView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
- removeView.setLines(1);
+ removeView.setSingleLine(true);
linearLayout.addView(removeView, LayoutHelper.createLinear(0, LayoutHelper.WRAP_CONTENT, 1f, 4, 0, 4, 0));
removeView.setVisibility(View.GONE);
-
- addView(linearLayout, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, 0 , 20, 0, 0));
+ addView(linearLayout, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, 0, 20, 0, 0));
avatarsContainer = new AvatarsContainer(context);
- addView(avatarsContainer, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 28 + 16, 0 , 12, 0, 0));
+ addView(avatarsContainer, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 28 + 16, 0, 12, 0, 0));
copyView.setOnClickListener(view -> {
try {
if (link == null) {
@@ -188,45 +198,43 @@ public class LinkActionView extends LinearLayout {
});
optionsView.setOnClickListener(view -> {
- if (isPublic) {
- showQrCode();
- return;
- }
if (actionBarPopupWindow != null) {
return;
}
ActionBarPopupWindow.ActionBarPopupWindowLayout layout = new ActionBarPopupWindow.ActionBarPopupWindowLayout(context);
ActionBarMenuSubItem subItem;
- if (!permanent) {
+ if (!this.permanent && canEdit) {
subItem = new ActionBarMenuSubItem(context, true, false);
subItem.setTextAndIcon(LocaleController.getString("Edit", R.string.Edit), R.drawable.baseline_edit_24);
layout.addView(subItem, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 48));
subItem.setOnClickListener(view12 -> {
- delegate.editLink();
if (actionBarPopupWindow != null) {
actionBarPopupWindow.dismiss();
}
+ delegate.editLink();
});
}
-// subItem = new ActionBarMenuSubItem(context, true, false);
-// subItem.setTextAndIcon(LocaleController.getString("GetQRCode", R.string.GetQRCode), R.drawable.msg_qrcode);
-// layout.addView(subItem, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 48));
-// subItem.setOnClickListener(view12 -> {
-// showQrCode();
-// });
-
- subItem = new ActionBarMenuSubItem(context, false, true);
- subItem.setTextAndIcon(LocaleController.getString("RevokeLink", R.string.RevokeLink), R.drawable.baseline_delete_24);
- subItem.setColors(Theme.getColor(Theme.key_windowBackgroundWhiteRedText), Theme.getColor(Theme.key_windowBackgroundWhiteRedText));
- subItem.setOnClickListener(view1 -> {
- revokeLink();
- if (actionBarPopupWindow != null) {
- actionBarPopupWindow.dismiss();
- }
- });
+ subItem = new ActionBarMenuSubItem(context, true, false);
+ subItem.setTextAndIcon(LocaleController.getString("GetQRCode", R.string.GetQRCode), R.drawable.msg_qrcode);
layout.addView(subItem, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 48));
+ subItem.setOnClickListener(view12 -> {
+ showQrCode();
+ });
+
+ if (!hideRevokeOption) {
+ subItem = new ActionBarMenuSubItem(context, false, true);
+ subItem.setTextAndIcon(LocaleController.getString("RevokeLink", R.string.RevokeLink), R.drawable.baseline_delete_24);
+ subItem.setColors(Theme.getColor(Theme.key_windowBackgroundWhiteRedText), Theme.getColor(Theme.key_windowBackgroundWhiteRedText));
+ subItem.setOnClickListener(view1 -> {
+ if (actionBarPopupWindow != null) {
+ actionBarPopupWindow.dismiss();
+ }
+ revokeLink();
+ });
+ layout.addView(subItem, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 48));
+ }
ViewGroup container;
if (bottomSheet == null) {
@@ -236,7 +244,6 @@ public class LinkActionView extends LinearLayout {
}
-
if (container != null) {
float x = 0;
float y;
@@ -251,21 +258,35 @@ public class LinkActionView extends LinearLayout {
canvas.drawColor(0x33000000);
getPointOnScreen(frameLayout, finalContainer, point);
canvas.save();
+ float clipTop = ((View) frameLayout.getParent()).getY() + frameLayout.getY();
+ if (clipTop < 1) {
+ canvas.clipRect(0, point[1] - clipTop + 1, getMeasuredWidth(), getMeasuredHeight());
+ }
canvas.translate(point[0], point[1]);
+
frameLayout.draw(canvas);
canvas.restore();
}
};
+
+ ViewTreeObserver.OnPreDrawListener preDrawListener = new ViewTreeObserver.OnPreDrawListener() {
+ @Override
+ public boolean onPreDraw() {
+ dimView.invalidate();
+ return true;
+ }
+ };
+ finalContainer.getViewTreeObserver().addOnPreDrawListener(preDrawListener);
container.addView(dimView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT));
dimView.setAlpha(0);
dimView.animate().alpha(1f).setDuration(150);
layout.measure(MeasureSpec.makeMeasureSpec(container.getMeasuredWidth(), MeasureSpec.UNSPECIFIED), MeasureSpec.makeMeasureSpec(container.getMeasuredHeight(), MeasureSpec.UNSPECIFIED));
- actionBarPopupWindow = new ActionBarPopupWindow(layout, LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT) {
+ actionBarPopupWindow = new ActionBarPopupWindow(layout, LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT);
+ actionBarPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
@Override
- public void dismiss() {
- super.dismiss();
+ public void onDismiss() {
actionBarPopupWindow = null;
dimView.animate().cancel();
dimView.animate().alpha(0).setDuration(150).setListener(new AnimatorListenerAdapter() {
@@ -274,17 +295,16 @@ public class LinkActionView extends LinearLayout {
if (dimView.getParent() != null) {
finalContainer.removeView(dimView);
}
+ finalContainer.getViewTreeObserver().removeOnPreDrawListener(preDrawListener);
}
});
}
- };
+ });
actionBarPopupWindow.setOutsideTouchable(true);
- actionBarPopupWindow.setClippingEnabled(true);
+ actionBarPopupWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
actionBarPopupWindow.setAnimationStyle(R.style.PopupContextAnimation);
- actionBarPopupWindow.setFocusable(true);
actionBarPopupWindow.setInputMethodMode(ActionBarPopupWindow.INPUT_METHOD_NOT_NEEDED);
actionBarPopupWindow.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED);
- actionBarPopupWindow.getContentView().setFocusableInTouchMode(true);
layout.setDispatchKeyEventListener(keyEvent -> {
if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_BACK && keyEvent.getRepeatCount() == 0 && actionBarPopupWindow.isShowing()) {
@@ -332,7 +352,7 @@ public class LinkActionView extends LinearLayout {
}
private void showQrCode() {
- qrCodeBottomSheet = new QRCodeBottomSheet(getContext(), link) {
+ qrCodeBottomSheet = new QRCodeBottomSheet(getContext(), link, isChannel ? LocaleController.getString("QRCodeLinkHelpChannel", R.string.QRCodeLinkHelpChannel) : LocaleController.getString("QRCodeLinkHelpGroup", R.string.QRCodeLinkHelpGroup)) {
@Override
public void dismiss() {
super.dismiss();
@@ -351,13 +371,13 @@ public class LinkActionView extends LinearLayout {
removeView.setTextColor(Theme.getColor(Theme.key_featuredStickers_buttonText));
copyView.setBackground(Theme.createSimpleSelectorRoundRectDrawable(AndroidUtilities.dp(6), Theme.getColor(Theme.key_featuredStickers_addButton), Theme.getColor(Theme.key_featuredStickers_addButtonPressed)));
shareView.setBackground(Theme.createSimpleSelectorRoundRectDrawable(AndroidUtilities.dp(6), Theme.getColor(Theme.key_featuredStickers_addButton), Theme.getColor(Theme.key_featuredStickers_addButtonPressed)));
- removeView.setBackground(Theme.createSimpleSelectorRoundRectDrawable(AndroidUtilities.dp(6), Theme.getColor(Theme.key_chat_attachAudioBackground), Theme.getColor(Theme.key_featuredStickers_addButtonPressed)));
+ removeView.setBackground(Theme.createSimpleSelectorRoundRectDrawable(AndroidUtilities.dp(6), Theme.getColor(Theme.key_chat_attachAudioBackground), ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_windowBackgroundWhite), 120)));
frameLayout.setBackground(Theme.createSimpleSelectorRoundRectDrawable(AndroidUtilities.dp(6), Theme.getColor(Theme.key_graySection), ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_listSelector), (int) (255 * 0.3f))));
linkView.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteBlackText));
optionsView.setColorFilter(Theme.getColor(Theme.key_dialogTextGray3));
//optionsView.setBackground(Theme.createSelectorDrawable(Theme.getColor(Theme.key_listSelector), 1));
avatarsContainer.countTextView.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteBlueText));
- avatarsContainer.setBackground(Theme.createSimpleSelectorRoundRectDrawable(AndroidUtilities.dp(6),0, ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_windowBackgroundWhiteBlueText), (int) (255 * 0.3f))));
+ avatarsContainer.setBackground(Theme.createSimpleSelectorRoundRectDrawable(AndroidUtilities.dp(6), 0, ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_windowBackgroundWhiteBlueText), (int) (255 * 0.3f))));
if (qrCodeBottomSheet != null) {
qrCodeBottomSheet.updateColors();
@@ -395,16 +415,11 @@ public class LinkActionView extends LinearLayout {
optionsView.setVisibility(b ? View.VISIBLE : View.GONE);
}
- public void setPublic(boolean b) {
- if (isPublic != b) {
- isPublic = b;
- if (isPublic) {
- optionsView.setVisibility(View.GONE);
- optionsView.setImageDrawable(ContextCompat.getDrawable(optionsView.getContext(), R.drawable.msg_qrcode));
- } else {
- optionsView.setVisibility(View.VISIBLE);
- optionsView.setImageDrawable(ContextCompat.getDrawable(optionsView.getContext(), R.drawable.ic_ab_other));
- }
+ public void showRevokeOption(boolean b) {
+ if (hideRevokeOption != b) {
+ hideRevokeOption = b;
+ optionsView.setVisibility(View.VISIBLE);
+ optionsView.setImageDrawable(ContextCompat.getDrawable(optionsView.getContext(), R.drawable.ic_ab_other));
}
}
@@ -419,7 +434,7 @@ public class LinkActionView extends LinearLayout {
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
int N = Math.min(3, usersCount);
- int x = N == 0 ? 0 :(20 * (N - 1) + 24 + 8);
+ int x = N == 0 ? 0 : (20 * (N - 1) + 24 + 8);
super.onMeasure(MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(x), MeasureSpec.EXACTLY), heightMeasureSpec);
}
};
@@ -436,7 +451,7 @@ public class LinkActionView extends LinearLayout {
linearLayout.addView(avatarsImageView, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.MATCH_PARENT));
linearLayout.addView(countTextView, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_VERTICAL));
- setPadding(0, AndroidUtilities.dp(8), 0 ,AndroidUtilities.dp(8));
+ setPadding(0, AndroidUtilities.dp(8), 0, AndroidUtilities.dp(8));
avatarsImageView.commitTransition(false);
}
}
@@ -451,7 +466,7 @@ public class LinkActionView extends LinearLayout {
}
});
builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
- fragment.showDialog(builder.create());
+ builder.show();
}
public void setDelegate(Delegate delegate) {
@@ -517,12 +532,22 @@ public class LinkActionView extends LinearLayout {
public interface Delegate {
void revokeLink();
- default void editLink() {}
- default void removeLink() {}
- default void showUsersForPermanentLink() {}
+
+ default void editLink() {
+ }
+
+ default void removeLink() {
+ }
+
+ default void showUsersForPermanentLink() {
+ }
}
public void setPermanent(boolean permanent) {
this.permanent = permanent;
}
+
+ public void setCanEdit(boolean canEdit) {
+ this.canEdit = canEdit;
+ }
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/PermanentLinkBottomSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/PermanentLinkBottomSheet.java
index a4d7ed38c..9a5e28292 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/PermanentLinkBottomSheet.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/PermanentLinkBottomSheet.java
@@ -1,10 +1,8 @@
package org.telegram.ui.Components;
import android.content.Context;
-import android.graphics.Color;
import android.view.Gravity;
import android.view.View;
-import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -15,8 +13,10 @@ import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.MessagesController;
import org.telegram.messenger.R;
+import org.telegram.messenger.UserConfig;
import org.telegram.tgnet.ConnectionsManager;
import org.telegram.tgnet.TLRPC;
+import org.telegram.ui.ActionBar.AlertDialog;
import org.telegram.ui.ActionBar.BaseFragment;
import org.telegram.ui.ActionBar.BottomSheet;
import org.telegram.ui.ActionBar.Theme;
@@ -31,27 +31,31 @@ public class PermanentLinkBottomSheet extends BottomSheet {
RLottieDrawable linkIcon;
private final TextView titleView;
private final TextView subtitle;
- // private final TextView manage;
+ private final TextView manage;
private final RLottieImageView imageView;
private final LinkActionView linkActionView;
private int chatId;
+ private BaseFragment fragment;
+ private boolean isChannel;
- public PermanentLinkBottomSheet(Context context, boolean needFocus, BaseFragment fragment, TLRPC.ChatFull info, int chatId) {
+ public PermanentLinkBottomSheet(Context context, boolean needFocus, BaseFragment fragment, TLRPC.ChatFull info, int chatId, boolean isChannel) {
super(context, needFocus);
this.info = info;
this.chatId = chatId;
+ this.isChannel = isChannel;
setAllowNestedScroll(true);
setApplyBottomPadding(false);
- linkActionView = new LinkActionView(context, fragment, this, chatId, true);
+ linkActionView = new LinkActionView(context, fragment, this, chatId, true, isChannel);
linkActionView.setPermanent(true);
imageView = new RLottieImageView(context);
linkIcon = new RLottieDrawable(R.raw.shared_link_enter, "" + R.raw.shared_link_enter, AndroidUtilities.dp(90), AndroidUtilities.dp(90), false, null);
linkIcon.setCustomEndFrame(42);
imageView.setAnimation(linkIcon);
linkActionView.setUsers(0, null);
- linkActionView.setPublic(true);
+ linkActionView.showRevokeOption(true);
+ linkActionView.setDelegate(() -> generateLink(true));
titleView = new TextView(context);
titleView.setText(LocaleController.getString("InviteLink", R.string.InviteLink));
@@ -60,12 +64,11 @@ public class PermanentLinkBottomSheet extends BottomSheet {
titleView.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteBlackText));
subtitle = new TextView(context);
- subtitle.setText(LocaleController.getString("LinkInfo", R.string.LinkInfo));
+ subtitle.setText(isChannel ? LocaleController.getString("LinkInfoChannel", R.string.LinkInfoChannel) : LocaleController.getString("LinkInfo", R.string.LinkInfo));
subtitle.setTextSize(14);
subtitle.setGravity(Gravity.CENTER_HORIZONTAL);
subtitle.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteGrayText));
- /*
manage = new TextView(context);
manage.setText(LocaleController.getString("ManageInviteLinks", R.string.ManageInviteLinks));
manage.setTextSize(14);
@@ -73,20 +76,20 @@ public class PermanentLinkBottomSheet extends BottomSheet {
manage.setBackground(Theme.createRadSelectorDrawable(ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_windowBackgroundWhiteBlueText), (int) (255 * 0.3f)), AndroidUtilities.dp(4), AndroidUtilities.dp(4)));
manage.setPadding(AndroidUtilities.dp(12), AndroidUtilities.dp(4), AndroidUtilities.dp(12), AndroidUtilities.dp(4));
- manage.setOnClickListener(view -> {
- ManageLinksActivity manageFragment = new ManageLinksActivity(info.id);
+ manage.setOnClickListener(view -> {
+ ManageLinksActivity manageFragment = new ManageLinksActivity(info.id, 0, 0);
manageFragment.setInfo(info, info.exported_invite);
fragment.presentFragment(manageFragment);
dismiss();
});
-*/
+
LinearLayout linearLayout = new LinearLayout(context);
linearLayout.setOrientation(LinearLayout.VERTICAL);
linearLayout.addView(imageView, LayoutHelper.createLinear(90, 90, Gravity.CENTER_HORIZONTAL, 0, 24, 0, 0));
linearLayout.addView(titleView, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_HORIZONTAL, 60, 16, 60, 0));
linearLayout.addView(subtitle, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_HORIZONTAL, 60, 16, 60, 0));
linearLayout.addView(linkActionView, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
- // linearLayout.addView(manage, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_HORIZONTAL, 60, 26, 60, 26));
+ linearLayout.addView(manage, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_HORIZONTAL, 60, 26, 60, 26));
NestedScrollView scrollView = new NestedScrollView(context);
scrollView.setVerticalScrollBarEnabled(false);
@@ -94,10 +97,14 @@ public class PermanentLinkBottomSheet extends BottomSheet {
setCustomView(scrollView);
- if (info != null && info.exported_invite != null) {
+ TLRPC.Chat chat = MessagesController.getInstance(UserConfig.selectedAccount).getChat(chatId);
+ if (chat != null && chat.username != null) {
+ linkActionView.setLink("https://t.me/" + chat.username);
+ manage.setVisibility(View.GONE);
+ } else if (info != null && info.exported_invite != null) {
linkActionView.setLink(info.exported_invite.link);
} else {
- generateLink();
+ generateLink(false);
}
updateColors();
@@ -106,13 +113,13 @@ public class PermanentLinkBottomSheet extends BottomSheet {
boolean linkGenerating;
TLRPC.TL_chatInviteExported invite;
- private void generateLink() {
+ private void generateLink(boolean showDialog) {
if (linkGenerating) {
return;
}
linkGenerating = true;
TLRPC.TL_messages_exportChatInvite req = new TLRPC.TL_messages_exportChatInvite();
- //req.legacy_revoke_permanent = true; TODO layer 124
+ req.legacy_revoke_permanent = true;
req.peer = MessagesController.getInstance(currentAccount).getInputPeer(-chatId);
ConnectionsManager.getInstance(currentAccount).sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
if (error == null) {
@@ -124,6 +131,14 @@ public class PermanentLinkBottomSheet extends BottomSheet {
}
linkActionView.setLink(invite.link);
+
+ if (showDialog && fragment != null) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+ builder.setMessage(LocaleController.getString("RevokeAlertNewLink", R.string.RevokeAlertNewLink));
+ builder.setTitle(LocaleController.getString("RevokeLink", R.string.RevokeLink));
+ builder.setNegativeButton(LocaleController.getString("OK", R.string.OK), null);
+ fragment.showDialog(builder.create());
+ }
}
linkGenerating = false;
}));
@@ -145,7 +160,7 @@ public class PermanentLinkBottomSheet extends BottomSheet {
};
arrayList.add(new ThemeDescription(titleView, ThemeDescription.FLAG_TEXTCOLOR, null, null, null, null, Theme.key_windowBackgroundWhiteBlackText));
arrayList.add(new ThemeDescription(subtitle, ThemeDescription.FLAG_TEXTCOLOR, null, null, null, null, Theme.key_windowBackgroundWhiteGrayText));
- // arrayList.add(new ThemeDescription(manage, ThemeDescription.FLAG_TEXTCOLOR, null, null, null, null, Theme.key_windowBackgroundWhiteBlueText));
+ arrayList.add(new ThemeDescription(manage, ThemeDescription.FLAG_TEXTCOLOR, null, null, null, null, Theme.key_windowBackgroundWhiteBlueText));
arrayList.add(new ThemeDescription(null, 0, null, null, null, descriptionDelegate, Theme.key_featuredStickers_addButton));
arrayList.add(new ThemeDescription(null, 0, null, null, null, descriptionDelegate, Theme.key_featuredStickers_buttonText));
arrayList.add(new ThemeDescription(null, 0, null, null, null, descriptionDelegate, Theme.key_windowBackgroundWhiteBlueText));
@@ -154,7 +169,7 @@ public class PermanentLinkBottomSheet extends BottomSheet {
private void updateColors() {
imageView.setBackground(Theme.createCircleDrawable(AndroidUtilities.dp(90), Theme.getColor(Theme.key_featuredStickers_addButton)));
- // manage.setBackground(Theme.createRadSelectorDrawable(ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_windowBackgroundWhiteBlueText), (int) (255 * 0.3f)), AndroidUtilities.dp(4), AndroidUtilities.dp(4)));
+ manage.setBackground(Theme.createRadSelectorDrawable(ColorUtils.setAlphaComponent(Theme.getColor(Theme.key_windowBackgroundWhiteBlueText), (int) (255 * 0.3f)), AndroidUtilities.dp(4), AndroidUtilities.dp(4)));
int color = Theme.getColor(Theme.key_featuredStickers_buttonText);
linkIcon.setLayerColor("Top.**", color);
linkIcon.setLayerColor("Bottom.**", color);
@@ -162,4 +177,14 @@ public class PermanentLinkBottomSheet extends BottomSheet {
linkActionView.updateColors();
setBackgroundColor(Theme.getColor(Theme.key_dialogBackground));
}
+
+ @Override
+ public void dismissInternal() {
+ super.dismissInternal();
+ }
+
+ @Override
+ public void dismiss() {
+ super.dismiss();
+ }
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/PhotoViewerCaptionEnterView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/PhotoViewerCaptionEnterView.java
index abb5369de..1879e4211 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/PhotoViewerCaptionEnterView.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/PhotoViewerCaptionEnterView.java
@@ -21,7 +21,6 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Vibrator;
import android.text.Editable;
-import android.text.InputFilter;
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
import android.text.TextUtils;
@@ -43,10 +42,10 @@ import androidx.core.graphics.ColorUtils;
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.Emoji;
+import org.telegram.messenger.FileLog;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.MessagesController;
import org.telegram.messenger.NotificationCenter;
-import org.telegram.messenger.FileLog;
import org.telegram.messenger.R;
import org.telegram.messenger.SharedConfig;
import org.telegram.messenger.UserConfig;
@@ -138,7 +137,7 @@ public class PhotoViewerCaptionEnterView extends FrameLayout implements Notifica
emojiButton.setAlpha(0.58f);
frameLayout.addView(emojiButton, LayoutHelper.createFrame(48, 48, Gravity.BOTTOM | Gravity.LEFT));
emojiButton.setOnClickListener(view -> {
- if (keyboardVisible) {
+ if (keyboardVisible || (AndroidUtilities.isInMultiwindow || AndroidUtilities.usingHardwareInput) && !isPopupShowing()) {
showPopup(1, false);
} else {
openKeyboardInternal();
@@ -230,7 +229,7 @@ public class PhotoViewerCaptionEnterView extends FrameLayout implements Notifica
});
messageEditText.setOnClickListener(view -> {
if (isPopupShowing()) {
- showPopup(AndroidUtilities.usingHardwareInput ? 0 : 2, false);
+ showPopup(AndroidUtilities.isInMultiwindow || AndroidUtilities.usingHardwareInput ? 0 : 2, false);
}
});
messageEditText.addTextChangedListener(new TextWatcher() {
@@ -713,7 +712,7 @@ public class PhotoViewerCaptionEnterView extends FrameLayout implements Notifica
}
private void openKeyboardInternal() {
- showPopup(AndroidUtilities.usingHardwareInput ? 0 : 2, false);
+ showPopup(AndroidUtilities.isInMultiwindow || AndroidUtilities.usingHardwareInput ? 0 : 2, false);
openKeyboard();
}
@@ -753,7 +752,7 @@ public class PhotoViewerCaptionEnterView extends FrameLayout implements Notifica
}
public boolean isKeyboardVisible() {
- return AndroidUtilities.usingHardwareInput && getTag() != null || keyboardVisible;
+ return (AndroidUtilities.usingHardwareInput || AndroidUtilities.isInMultiwindow) && getTag() != null || keyboardVisible;
}
@Override
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/PlayPauseDrawable.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/PlayPauseDrawable.java
index 12ca076ca..9f8aee597 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/PlayPauseDrawable.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/PlayPauseDrawable.java
@@ -7,6 +7,7 @@ import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
+import android.view.View;
import android.view.animation.AnimationUtils;
import androidx.annotation.NonNull;
@@ -24,6 +25,12 @@ public class PlayPauseDrawable extends Drawable {
private float progress;
private long lastUpdateTime;
+ private View parent;
+
+ private int alpha = 255;
+
+ float duration = 300f;
+
public PlayPauseDrawable(int size) {
this.size = AndroidUtilities.dp(size);
paint = new Paint(Paint.ANTI_ALIAS_FLAG);
@@ -39,22 +46,32 @@ public class PlayPauseDrawable extends Drawable {
dt = 16;
}
if (pause && progress < 1f) {
- progress += dt / 300f;
+ progress += dt / duration;
if (progress >= 1f) {
progress = 1f;
} else {
+ if (parent != null) {
+ parent.invalidate();
+ }
invalidateSelf();
}
} else if (!pause && progress > 0f) {
- progress -= dt / 300f;
+ progress -= dt / duration;
if (progress <= 0f) {
progress = 0f;
} else {
+ if (parent != null) {
+ parent.invalidate();
+ }
invalidateSelf();
}
}
final Rect bounds = getBounds();
- canvas.save();
+ if (alpha == 255) {
+ canvas.save();
+ } else {
+ canvas.saveLayerAlpha(bounds.left, bounds.top, bounds.right, bounds.bottom, alpha, Canvas.ALL_SAVE_FLAG);
+ }
canvas.translate(bounds.centerX() + AndroidUtilities.dp(1) * (1.0f - progress), bounds.centerY());
final float ms = 500.0f * progress;
final float rotation;
@@ -90,7 +107,7 @@ public class PlayPauseDrawable extends Drawable {
@Override
public void setAlpha(int i) {
- paint.setAlpha(i);
+ alpha = i;
}
@Override
@@ -112,4 +129,12 @@ public class PlayPauseDrawable extends Drawable {
public int getIntrinsicHeight() {
return size;
}
+
+ public void setParent(View parent) {
+ this.parent = parent;
+ }
+
+ public void setDuration(int duration) {
+ this.duration = duration;
+ }
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/QRCodeBottomSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/QRCodeBottomSheet.java
index f52ceefeb..d0dcf95a9 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/QRCodeBottomSheet.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/QRCodeBottomSheet.java
@@ -4,44 +4,51 @@ import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.Outline;
import android.net.Uri;
-import android.provider.MediaStore;
-import android.text.TextUtils;
+import android.os.Build;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.View;
+import android.view.ViewOutlineProvider;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
+import android.widget.ScrollView;
import android.widget.TextView;
+import androidx.core.content.FileProvider;
+
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
-import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import org.telegram.messenger.AndroidUtilities;
+import org.telegram.messenger.ApplicationLoader;
+import org.telegram.messenger.BuildConfig;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.R;
import org.telegram.ui.ActionBar.BottomSheet;
import org.telegram.ui.ActionBar.Theme;
-import org.telegram.ui.ActionBar.ThemeDescription;
import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.util.HashMap;
-import tw.nekomimi.nekogram.utils.ProxyUtil;
-
public class QRCodeBottomSheet extends BottomSheet {
Bitmap qrCode;
private final TextView help;
private final TextView buttonTextView;
+ int imageSize;
+ RLottieImageView iconImage;
- public QRCodeBottomSheet(Context context, String link) {
+ public QRCodeBottomSheet(Context context, String link, String helpMessage) {
super(context, false);
setTitle(LocaleController.getString("InviteByQRCode", R.string.InviteByQRCode), true);
@@ -52,22 +59,55 @@ public class QRCodeBottomSheet extends BottomSheet {
super.onMeasure(MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY));
}
};
- int p = AndroidUtilities.dp(54);
- imageView.setPadding(p, p, p, p);
- imageView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+ imageView.setScaleType(ImageView.ScaleType.FIT_XY);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ imageView.setOutlineProvider(new ViewOutlineProvider() {
+ @Override
+ public void getOutline(View view, Outline outline) {
+ outline.setRoundRect(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight(), AndroidUtilities.dp(12));
+ }
+ });
+ imageView.setClipToOutline(true);
+ }
LinearLayout linearLayout = new LinearLayout(context);
linearLayout.setOrientation(LinearLayout.VERTICAL);
+ linearLayout.setPadding(0, AndroidUtilities.dp(16), 0, 0);
imageView.setImageBitmap(qrCode = createQR(context, link, qrCode));
- FrameLayout frameLayout = new FrameLayout(context);
- frameLayout.addView(imageView);
- linearLayout.addView(frameLayout, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, 30, 0,30 ,0));
+
+ iconImage = new RLottieImageView(context);
+ iconImage.setBackgroundColor(Color.WHITE);
+ iconImage.setAutoRepeat(true);
+ iconImage.setAnimation(R.raw.qr_code_logo, 60, 60);
+ iconImage.playAnimation();
+
+ //iconImage.setPadding(-AndroidUtilities.dp(4), -AndroidUtilities.dp(4), -AndroidUtilities.dp(4), -AndroidUtilities.dp(4));
+
+
+ FrameLayout frameLayout = new FrameLayout(context) {
+
+ float lastX;
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ float x = imageSize / 768f * imageView.getMeasuredHeight();
+ if (lastX != x) {
+ lastX = x;
+ iconImage.getLayoutParams().height = iconImage.getLayoutParams().width = (int) x;
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+ }
+ };
+ frameLayout.addView(imageView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT));
+ frameLayout.addView(iconImage, LayoutHelper.createFrame(60, 60, Gravity.CENTER));
+ linearLayout.addView(frameLayout, LayoutHelper.createLinear(220, 220, Gravity.CENTER_HORIZONTAL, 30, 0, 30, 0));
help = new TextView(context);
help.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
- help.setText(LocaleController.getString("QRCodeLinkHelp", R.string.QRCodeLinkHelp));
+ help.setText(helpMessage);
help.setGravity(Gravity.CENTER_HORIZONTAL);
- frameLayout.addView(help, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.BOTTOM,40, 0,40 ,8));
+ linearLayout.addView(help, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, 0, 40, 8, 40, 8));
buttonTextView = new TextView(context);
@@ -77,29 +117,51 @@ public class QRCodeBottomSheet extends BottomSheet {
buttonTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
buttonTextView.setText(LocaleController.getString("ShareQrCode", R.string.ShareQrCode));
buttonTextView.setOnClickListener(view -> {
- Intent i = new Intent(Intent.ACTION_SEND);
- i.setType("image/*");
- i.putExtra(Intent.EXTRA_STREAM, getImageUri(context, qrCode));
- try {
- AndroidUtilities.findActivity(context).startActivityForResult(Intent.createChooser(i, LocaleController.getString("InviteByQRCode", R.string.InviteByQRCode)), 500);
- } catch (ActivityNotFoundException ex) {
- ex.printStackTrace();
+ Uri uri = getImageUri(qrCode);
+ if (uri != null) {
+ Intent i = new Intent(Intent.ACTION_SEND);
+
+ i.setType("image/*");
+ i.putExtra(Intent.EXTRA_STREAM, uri);
+ try {
+ AndroidUtilities.findActivity(context).startActivityForResult(Intent.createChooser(i, LocaleController.getString("InviteByQRCode", R.string.InviteByQRCode)), 500);
+ } catch (ActivityNotFoundException ex) {
+ ex.printStackTrace();
+ }
}
});
linearLayout.addView(buttonTextView, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 48, Gravity.BOTTOM, 16, 15, 16, 16));
updateColors();
- setCustomView(linearLayout);
+ ScrollView scrollView = new ScrollView(context);
+ scrollView.addView(linearLayout);
+ setCustomView(scrollView);
}
- public Uri getImageUri(Context inContext, Bitmap inImage) {
+ public Uri getImageUri(Bitmap inImage) {
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
inImage.compress(Bitmap.CompressFormat.JPEG, 100, bytes);
- String path = MediaStore.Images.Media.insertImage(inContext.getContentResolver(), inImage, "group_invite_qr", null);
- return Uri.parse(path);
+ File cachePath = AndroidUtilities.getCacheDir();
+ if (!cachePath.isDirectory()) {
+ try {
+ cachePath.mkdirs();
+ } catch (Exception e) {
+ FileLog.e(e);
+ return null;
+ }
+ }
+ File file = new File(cachePath, "qr_tmp.png");
+ try (FileOutputStream out = new FileOutputStream(file)) {
+ inImage.compress(Bitmap.CompressFormat.PNG, 100, out);
+ out.close();
+ return FileProvider.getUriForFile(ApplicationLoader.applicationContext, BuildConfig.APPLICATION_ID + ".provider", file);
+ } catch (IOException e) {
+ FileLog.e(e);
+ }
+ return null;
}
public Bitmap createQR(Context context, String key, Bitmap oldBitmap) {
@@ -107,7 +169,10 @@ public class QRCodeBottomSheet extends BottomSheet {
HashMap hints = new HashMap<>();
hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M);
hints.put(EncodeHintType.MARGIN, 0);
- return new QRCodeWriter().encode(key, BarcodeFormat.QR_CODE, 768, 768, hints, oldBitmap, context);
+ QRCodeWriter writer = new QRCodeWriter();
+ Bitmap bitmap = writer.encode(key, BarcodeFormat.QR_CODE, 768, 768, hints, oldBitmap, context);
+ imageSize = writer.getImageSize();
+ return bitmap;
} catch (Exception e) {
FileLog.e(e);
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ReportAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ReportAlert.java
new file mode 100644
index 000000000..542397be4
--- /dev/null
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ReportAlert.java
@@ -0,0 +1,148 @@
+/*
+ * This is the source code of Telegram for Android v. 5.x.x.
+ * It is licensed under GNU GPL v. 2 or later.
+ * You should have received a copy of the license in this archive (see LICENSE).
+ *
+ * Copyright Nikolai Kudashov, 2013-2018.
+ */
+
+package org.telegram.ui.Components;
+
+import android.content.Context;
+import android.text.InputType;
+import android.text.TextUtils;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.telegram.messenger.AndroidUtilities;
+import org.telegram.messenger.LocaleController;
+import org.telegram.messenger.R;
+import org.telegram.ui.ActionBar.BottomSheet;
+import org.telegram.ui.ActionBar.Theme;
+
+public class ReportAlert extends BottomSheet {
+
+ private BottomSheetCell clearButton;
+ private EditTextBoldCursor editText;
+ private boolean compteled;
+
+ public static class BottomSheetCell extends FrameLayout {
+
+ private View background;
+ private TextView textView;
+ private LinearLayout linearLayout;
+
+ public BottomSheetCell(Context context) {
+ super(context);
+
+ background = new View(context);
+ background.setBackground(Theme.createSimpleSelectorRoundRectDrawable(AndroidUtilities.dp(4), Theme.getColor(Theme.key_featuredStickers_addButton), Theme.getColor(Theme.key_featuredStickers_addButtonPressed)));
+ addView(background, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, 0, 16, 16, 16, 16));
+
+ textView = new TextView(context);
+ textView.setLines(1);
+ textView.setSingleLine(true);
+ textView.setGravity(Gravity.CENTER_HORIZONTAL);
+ textView.setEllipsize(TextUtils.TruncateAt.END);
+ textView.setGravity(Gravity.CENTER);
+ textView.setTextColor(Theme.getColor(Theme.key_featuredStickers_buttonText));
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+ textView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
+ addView(textView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER));
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(80), MeasureSpec.EXACTLY));
+ }
+
+ public void setText(CharSequence text) {
+ textView.setText(text);
+ }
+ }
+
+ public ReportAlert(final Context context, int type) {
+ super(context, true);
+ setApplyBottomPadding(false);
+ setApplyTopPadding(false);
+
+ FrameLayout frameLayout = new FrameLayout(context);
+ setCustomView(frameLayout);
+
+ RLottieImageView imageView = new RLottieImageView(context);
+ imageView.setAutoRepeat(true);
+ imageView.setAnimation(R.raw.report_police, 120, 120);
+ imageView.playAnimation();
+ frameLayout.addView(imageView, LayoutHelper.createFrame(160, 160, Gravity.CENTER_HORIZONTAL | Gravity.TOP, 17, 14, 17, 0));
+
+ TextView percentTextView = new TextView(context);
+ percentTextView.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
+ percentTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 24);
+ percentTextView.setTextColor(Theme.getColor(Theme.key_dialogTextBlack));
+ if (type == 0) {
+ percentTextView.setText(LocaleController.getString("ReportTitleSpam", R.string.ReportTitleSpam));
+ } else if (type == 1) {
+ percentTextView.setText(LocaleController.getString("ReportTitleFake", R.string.ReportTitleFake));
+ } else if (type == 2) {
+ percentTextView.setText(LocaleController.getString("ReportTitleViolence", R.string.ReportTitleViolence));
+ } else if (type == 3) {
+ percentTextView.setText(LocaleController.getString("ReportTitleChild", R.string.ReportTitleChild));
+ } else if (type == 4) {
+ percentTextView.setText(LocaleController.getString("ReportTitlePornography", R.string.ReportTitlePornography));
+ } else if (type == 5) {
+ percentTextView.setText(LocaleController.getString("ReportChat", R.string.ReportChat));
+ }
+ frameLayout.addView(percentTextView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 17, 197, 17, 0));
+
+ TextView infoTextView = new TextView(context);
+ infoTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+ infoTextView.setTextColor(Theme.getColor(Theme.key_dialogTextGray3));
+ infoTextView.setGravity(Gravity.CENTER_HORIZONTAL);
+ infoTextView.setText(LocaleController.getString("ReportInfo", R.string.ReportInfo));
+ frameLayout.addView(infoTextView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.TOP | Gravity.CENTER_HORIZONTAL, 30, 235, 30, 44));
+
+ editText = new EditTextBoldCursor(context);
+ editText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 18);
+ editText.setHintTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteHintText));
+ editText.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteBlackText));
+ editText.setBackgroundDrawable(Theme.createEditTextDrawable(context, false));
+ editText.setMaxLines(1);
+ editText.setLines(1);
+ editText.setPadding(0, 0, 0, 0);
+ editText.setSingleLine(true);
+ editText.setGravity(LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT);
+ editText.setInputType(InputType.TYPE_TEXT_FLAG_CAP_SENTENCES | InputType.TYPE_TEXT_FLAG_MULTI_LINE | InputType.TYPE_TEXT_FLAG_AUTO_CORRECT);
+ editText.setImeOptions(EditorInfo.IME_ACTION_DONE);
+ editText.setHint(LocaleController.getString("ReportHint", R.string.ReportHint));
+ editText.setCursorColor(Theme.getColor(Theme.key_windowBackgroundWhiteBlackText));
+ editText.setCursorSize(AndroidUtilities.dp(20));
+ editText.setCursorWidth(1.5f);
+ editText.setOnEditorActionListener((textView, i, keyEvent) -> {
+ if (i == EditorInfo.IME_ACTION_DONE) {
+ clearButton.background.callOnClick();
+ return true;
+ }
+ return false;
+ });
+ frameLayout.addView(editText, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 36, Gravity.LEFT | Gravity.TOP, 17, 305, 17, 0));
+
+ clearButton = new BottomSheetCell(context);
+ clearButton.setBackground(null);
+ clearButton.setText(LocaleController.getString("ReportSend", R.string.ReportSend));
+ clearButton.background.setOnClickListener(v -> {
+ AndroidUtilities.hideKeyboard(editText);
+ onSend(type, editText.getText().toString());
+ dismiss();
+ });
+ frameLayout.addView(clearButton, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 50, Gravity.LEFT | Gravity.TOP, 0, 357, 0, 0));
+ }
+
+ protected void onSend(int type, String message) {
+
+ }
+}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/SearchCounterView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/SearchCounterView.java
new file mode 100644
index 000000000..5294a06b8
--- /dev/null
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/SearchCounterView.java
@@ -0,0 +1,312 @@
+package org.telegram.ui.Components;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.text.Layout;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
+import android.text.StaticLayout;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.View;
+
+import org.telegram.messenger.AndroidUtilities;
+import org.telegram.messenger.LocaleController;
+import org.telegram.ui.ActionBar.Theme;
+
+public class SearchCounterView extends View {
+
+ private final static int ANIMATION_TYPE_REPLACE = 2;
+
+ int animationType = -1;
+
+ TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+ RectF rectF = new RectF();
+
+ int currentCount;
+ private boolean countAnimationIncrement;
+ private ValueAnimator countAnimator;
+ private float countChangeProgress = 1f;
+ private StaticLayout countLayout;
+ private StaticLayout countOldLayout;
+ private StaticLayout countAnimationStableLayout;
+ private StaticLayout countAnimationStableLayout2;
+ private StaticLayout countAnimationInLayout;
+
+ private int countWidthOld;
+ private int countWidth;
+
+ private int textColor;
+ private String textColorKey = Theme.key_chat_searchPanelText;
+
+ int lastH;
+ int gravity = Gravity.CENTER;
+ float countLeft;
+ float x;
+
+ public float horizontalPadding;
+
+ String currentString;
+
+
+ public SearchCounterView(Context context) {
+ super(context);
+ textPaint.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf"));
+ textPaint.setTextSize(AndroidUtilities.dp(15));
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ if (getMeasuredHeight() != lastH) {
+ int count = currentCount;
+ String str = currentString;
+ currentString = null;
+ setCount(str, count, false);
+ lastH = getMeasuredHeight();
+ }
+ }
+
+ float dx = 0;
+
+ public void setCount(String newStr, int count, boolean animated) {
+ if (currentString != null && currentString.equals(newStr)) {
+ return;
+ }
+ if (countAnimator != null) {
+ countAnimator.cancel();
+ }
+ if (currentCount == 0 || count <= 0 || newStr == null || LocaleController.isRTL || TextUtils.isEmpty(newStr)) {
+ animated = false;
+ }
+
+ if (animated && newStr != null && !newStr.contains("**")) {
+ animated = false;
+ }
+
+ if (!animated) {
+ if (newStr != null) {
+ newStr = newStr.replaceAll("\\*\\*", "");
+ }
+ currentCount = count;
+ if (newStr == null) {
+ countWidth = 0;
+ countLayout = null;
+ } else {
+ countWidth = Math.max(AndroidUtilities.dp(12), (int) Math.ceil(textPaint.measureText(newStr)));
+ countLayout = new StaticLayout(newStr, textPaint, countWidth, Layout.Alignment.ALIGN_CENTER, 1.0f, 0.0f, false);
+ }
+ invalidate();
+ }
+
+ dx = 0;
+ if (animated) {
+ if (countAnimator != null) {
+ countAnimator.cancel();
+ }
+ countChangeProgress = 0f;
+ countAnimator = ValueAnimator.ofFloat(0, 1f);
+ countAnimator.addUpdateListener(valueAnimator -> {
+ countChangeProgress = (float) valueAnimator.getAnimatedValue();
+ invalidate();
+ });
+ countAnimator.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ animationType = -1;
+ countChangeProgress = 1f;
+ countOldLayout = null;
+ countAnimationStableLayout = null;
+ countAnimationInLayout = null;
+ invalidate();
+ }
+ });
+
+ animationType = ANIMATION_TYPE_REPLACE;
+ countAnimator.setDuration(200);
+ countAnimator.setInterpolator(CubicBezierInterpolator.DEFAULT);
+
+ if (countLayout != null) {
+ String oldStr = currentString;
+
+ int countStartIndex = newStr.indexOf("**");
+ if (countStartIndex >= 0) {
+ newStr = newStr.replaceAll("\\*\\*", "");
+ } else {
+ countStartIndex = 0;
+ }
+
+ SpannableStringBuilder oldSpannableStr = new SpannableStringBuilder(oldStr);
+ SpannableStringBuilder newSpannableStr = new SpannableStringBuilder(newStr);
+ SpannableStringBuilder stableStr = new SpannableStringBuilder(newStr);
+
+ boolean replaceAllDigits = Integer.toString(currentCount).length() != Integer.toString(count).length();
+ boolean newEndReached = false;
+ boolean oldEndReached = false;
+ int n = Math.min(oldStr.length(), newStr.length());
+ int cutIndexNew = 0;
+ int cutIndexOld = 0;
+ if (countStartIndex > 0) {
+ oldSpannableStr.setSpan(new EmptyStubSpan(), 0, countStartIndex, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+ newSpannableStr.setSpan(new EmptyStubSpan(), 0, countStartIndex, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+ stableStr.setSpan(new EmptyStubSpan(), 0, countStartIndex, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+ }
+ for (int i = countStartIndex; i < n; i++) {
+ if (!newEndReached && !oldEndReached) {
+ if (replaceAllDigits) {
+ stableStr.setSpan(new EmptyStubSpan(), i, i + 1, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+ } else if (oldStr.charAt(i) == newStr.charAt(i)) {
+ oldSpannableStr.setSpan(new EmptyStubSpan(), i, i + 1, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+ newSpannableStr.setSpan(new EmptyStubSpan(), i, i + 1, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+ } else {
+ stableStr.setSpan(new EmptyStubSpan(), i, i + 1, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+ }
+ }
+ if (!Character.isDigit(newStr.charAt(i))) {
+ newSpannableStr.setSpan(new EmptyStubSpan(), i, newStr.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+ newEndReached = true;
+ cutIndexNew = i;
+ }
+
+ if (!Character.isDigit(oldStr.charAt(i))) {
+ oldSpannableStr.setSpan(new EmptyStubSpan(), i, oldStr.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+ oldEndReached = true;
+ cutIndexOld = i;
+ }
+ }
+
+ int countOldWidth = Math.max(AndroidUtilities.dp(12), (int) Math.ceil(textPaint.measureText(oldStr)));
+ int countNewWidth = Math.max(AndroidUtilities.dp(12), (int) Math.ceil(textPaint.measureText(newStr)));
+ countOldLayout = new StaticLayout(oldSpannableStr, textPaint, countOldWidth, Layout.Alignment.ALIGN_CENTER, 1.0f, 0.0f, false);
+ countAnimationStableLayout = new StaticLayout(stableStr, textPaint, countNewWidth, Layout.Alignment.ALIGN_CENTER, 1.0f, 0.0f, false);
+ countAnimationInLayout = new StaticLayout(newSpannableStr, textPaint, countNewWidth, Layout.Alignment.ALIGN_CENTER, 1.0f, 0.0f, false);
+
+ if (countStartIndex > 0) {
+ SpannableStringBuilder stableString2 = new SpannableStringBuilder(newStr);
+ stableString2.setSpan(new EmptyStubSpan(), countStartIndex, newStr.length(), 0);
+ countAnimationStableLayout2 = new StaticLayout(stableString2, textPaint, countNewWidth, Layout.Alignment.ALIGN_CENTER, 1.0f, 0.0f, false);
+ } else {
+ countAnimationStableLayout2 = null;
+ }
+
+ dx = countOldLayout.getPrimaryHorizontal(cutIndexOld) - countAnimationStableLayout.getPrimaryHorizontal(cutIndexNew);
+ }
+ countWidthOld = countWidth;
+ countAnimationIncrement = count < currentCount;
+ countAnimator.start();
+ }
+ if (count > 0) {
+ countWidth = Math.max(AndroidUtilities.dp(12), (int) Math.ceil(textPaint.measureText(newStr)));
+ countLayout = new StaticLayout(newStr, textPaint, countWidth, Layout.Alignment.ALIGN_CENTER, 1.0f, 0.0f, false);
+ }
+
+ currentCount = count;
+ invalidate();
+ currentString = newStr;
+ }
+
+ @Override
+ protected void onDraw(Canvas canvas) {
+ super.onDraw(canvas);
+ int textColor = Theme.getColor(textColorKey);
+
+ if (this.textColor != textColor) {
+ this.textColor = textColor;
+ textPaint.setColor(textColor);
+ }
+
+ if (countChangeProgress != 1f) {
+
+ float countTop = (getMeasuredHeight() - AndroidUtilities.dp(23)) / 2f;
+ float countWidth;
+ if (this.countWidth == this.countWidthOld) {
+ countWidth = this.countWidth;
+ } else {
+ countWidth = this.countWidth * countChangeProgress + this.countWidthOld * (1f - countChangeProgress);
+ }
+ updateX(countWidth);
+
+ rectF.set(x, countTop, x + countWidth + AndroidUtilities.dp(11), countTop + AndroidUtilities.dp(23));
+
+ boolean increment = countAnimationIncrement;
+ if (countAnimationInLayout != null) {
+ canvas.save();
+ canvas.translate(countLeft, countTop + AndroidUtilities.dp(4) + (increment ? AndroidUtilities.dp(13) : -AndroidUtilities.dp(13)) * (1f - countChangeProgress));
+ textPaint.setAlpha((int) (255 * countChangeProgress));
+ countAnimationInLayout.draw(canvas);
+ canvas.restore();
+ } else if (countLayout != null) {
+ canvas.save();
+ canvas.translate(countLeft, countTop + AndroidUtilities.dp(4) + (increment ? AndroidUtilities.dp(13) : -AndroidUtilities.dp(13)) * (1f - countChangeProgress));
+ textPaint.setAlpha((int) (255 * countChangeProgress));
+ countLayout.draw(canvas);
+ canvas.restore();
+ }
+
+ if (countOldLayout != null) {
+ canvas.save();
+ canvas.translate(countLeft, countTop + AndroidUtilities.dp(4) + (increment ? -AndroidUtilities.dp(13) : AndroidUtilities.dp(13)) * (countChangeProgress));
+ textPaint.setAlpha((int) (255 * (1f - countChangeProgress)));
+ countOldLayout.draw(canvas);
+ canvas.restore();
+ }
+
+ if (countAnimationStableLayout != null) {
+ canvas.save();
+ canvas.translate(countLeft + dx * (1f - countChangeProgress), countTop + AndroidUtilities.dp(4));
+ textPaint.setAlpha(255);
+ countAnimationStableLayout.draw(canvas);
+ canvas.restore();
+ }
+
+ if (countAnimationStableLayout2 != null) {
+ canvas.save();
+ canvas.translate(countLeft, countTop + AndroidUtilities.dp(4));
+ textPaint.setAlpha(255);
+ countAnimationStableLayout2.draw(canvas);
+ canvas.restore();
+ }
+ textPaint.setAlpha(255);
+ } else {
+ drawInternal(canvas);
+ }
+ }
+
+ private void updateX(float countWidth) {
+ if (gravity == Gravity.RIGHT) {
+ countLeft = getMeasuredWidth() - AndroidUtilities.dp(5.5f);
+ if (horizontalPadding != 0) {
+ countLeft -= Math.max(horizontalPadding + countWidth / 2f, countWidth);
+ } else {
+ countLeft -= countWidth;
+ }
+ } else if (gravity == Gravity.LEFT) {
+ countLeft = AndroidUtilities.dp(5.5f);
+ } else {
+ countLeft = (int) ((getMeasuredWidth() - countWidth) / 2f);
+ }
+ x = countLeft - AndroidUtilities.dp(5.5f);
+ }
+
+ private void drawInternal(Canvas canvas) {
+ float countTop = (getMeasuredHeight() - AndroidUtilities.dp(23)) / 2f;
+ updateX(countWidth);
+ if (countLayout != null) {
+ canvas.save();
+ canvas.translate(countLeft, countTop + AndroidUtilities.dp(4));
+ countLayout.draw(canvas);
+ canvas.restore();
+ }
+ }
+
+ public void setGravity(int gravity) {
+ this.gravity = gravity;
+ }
+
+}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ShareAlert.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ShareAlert.java
index e0005dc7a..0d51f07b2 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ShareAlert.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ShareAlert.java
@@ -53,10 +53,10 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import org.telegram.SQLite.SQLiteCursor;
+import org.telegram.messenger.AccountInstance;
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.ApplicationLoader;
import org.telegram.messenger.ChatObject;
-import org.telegram.messenger.ContactsController;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.MessageObject;
@@ -351,8 +351,8 @@ public class ShareAlert extends BottomSheet implements NotificationCenter.Notifi
AdjustPanLayoutHelper adjustPanLayoutHelper = new AdjustPanLayoutHelper(this) {
@Override
- protected void onTransitionStart(boolean keyboardVisible) {
- super.onTransitionStart(keyboardVisible);
+ protected void onTransitionStart(boolean keyboardVisible, int contentHeight) {
+ super.onTransitionStart(keyboardVisible, contentHeight);
if (previousScrollOffsetY > 0 && previousScrollOffsetY != scrollOffsetY && keyboardVisible) {
fromScrollY = previousScrollOffsetY;
toScrollY = scrollOffsetY;
@@ -1127,11 +1127,7 @@ public class ShareAlert extends BottomSheet implements NotificationCenter.Notifi
updateSelectedCount(0);
- if (!DialogsActivity.dialogsLoaded[currentAccount]) {
- MessagesController.getInstance(currentAccount).loadDialogs(0, 0, 100, true);
- ContactsController.getInstance(currentAccount).checkInviteText();
- DialogsActivity.dialogsLoaded[currentAccount] = true;
- }
+ DialogsActivity.loadDialogs(AccountInstance.getInstance(currentAccount));
if (listAdapter.dialogs.isEmpty()) {
NotificationCenter.getInstance(currentAccount).addObserver(this, NotificationCenter.dialogsNeedReload);
}
@@ -1400,7 +1396,7 @@ public class ShareAlert extends BottomSheet implements NotificationCenter.Notifi
dialogsMap.put(dialog.id, dialog);
} else {
TLRPC.Chat chat = MessagesController.getInstance(currentAccount).getChat(-lower_id);
- if (!(chat == null || ChatObject.isNotInChat(chat) || ChatObject.isChannel(chat) && !chat.creator && (chat.admin_rights == null || !chat.admin_rights.post_messages) && !chat.megagroup)) {
+ if (!(chat == null || ChatObject.isNotInChat(chat) || chat.gigagroup && !ChatObject.hasAdminRights(chat) || ChatObject.isChannel(chat) && !chat.creator && (chat.admin_rights == null || !chat.admin_rights.post_messages) && !chat.megagroup)) {
if (dialog.folder_id == 1) {
archivedDialogs.add(dialog);
} else {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java
index d32c57f7b..8019a0f54 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java
@@ -3320,7 +3320,7 @@ public class SharedMediaLayout extends FrameLayout implements NotificationCenter
case 2:
FlickerLoadingView flickerLoadingView = new FlickerLoadingView(mContext);
view = flickerLoadingView;
- if (currentType == MediaDataController.MEDIA_MUSIC) {
+ if (currentType == 2) {
flickerLoadingView.setViewType(FlickerLoadingView.AUDIO_TYPE);
} else {
flickerLoadingView.setViewType(FlickerLoadingView.FILES_TYPE);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/SlideChooseView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/SlideChooseView.java
index a04d1bef0..23cfc4c14 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/SlideChooseView.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/SlideChooseView.java
@@ -2,6 +2,7 @@ package org.telegram.ui.Components;
import android.content.Context;
import android.graphics.Canvas;
+import android.graphics.DashPathEffect;
import android.graphics.Paint;
import android.os.Bundle;
import android.text.TextPaint;
@@ -17,13 +18,17 @@ public class SlideChooseView extends View {
private final SeekBarAccessibilityDelegate accessibilityDelegate;
private Paint paint;
+ private Paint linePaint;
private TextPaint textPaint;
+ private int lastDash;
private int circleSize;
private int gapSize;
private int sideSide;
private int lineSize;
+ private int dashedFrom = -1;
+
private boolean moving;
private boolean startMoving;
private float startX;
@@ -33,7 +38,7 @@ public class SlideChooseView extends View {
private String[] optionsStr;
private int[] optionsSizes;
- int selectedIndex;
+ private int selectedIndex;
private Callback callback;
@@ -42,6 +47,9 @@ public class SlideChooseView extends View {
paint = new Paint(Paint.ANTI_ALIAS_FLAG);
textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+ linePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+ linePaint.setStrokeWidth(AndroidUtilities.dp(2));
+ linePaint.setStrokeCap(Paint.Cap.ROUND);
textPaint.setTextSize(AndroidUtilities.dp(13));
accessibilityDelegate = new IntSeekBarAccessibilityDelegate() {
@@ -81,6 +89,9 @@ public class SlideChooseView extends View {
requestLayout();
}
+ public void setDashedFrom(int from) {
+ dashedFrom = from;
+ }
@Override
public boolean onTouchEvent(MotionEvent event) {
@@ -130,6 +141,9 @@ public class SlideChooseView extends View {
setOption(selectedIndex);
}
}
+ if (callback != null) {
+ callback.onTouchEnd();
+ }
startMoving = false;
moving = false;
}
@@ -162,21 +176,37 @@ public class SlideChooseView extends View {
for (int a = 0; a < optionsStr.length; a++) {
int cx = sideSide + (lineSize + gapSize * 2 + circleSize) * a + circleSize / 2;
if (a <= selectedIndex) {
- paint.setColor(Theme.getColor(Theme.key_switchTrackChecked));
+ int color = Theme.getColor(Theme.key_switchTrackChecked);
+ paint.setColor(color);
+ linePaint.setColor(color);
} else {
- paint.setColor(Theme.getColor(Theme.key_switchTrack));
+ int color = Theme.getColor(Theme.key_switchTrack);
+ paint.setColor(color);
+ linePaint.setColor(color);
}
canvas.drawCircle(cx, cy, a == selectedIndex ? AndroidUtilities.dp(6) : circleSize / 2, paint);
if (a != 0) {
int x = cx - circleSize / 2 - gapSize - lineSize;
int width = lineSize;
- if (a == selectedIndex || a == selectedIndex + 1) {
- width -= AndroidUtilities.dp(3);
- }
- if (a == selectedIndex + 1) {
+ if (dashedFrom != -1 && a - 1 >= dashedFrom) {
x += AndroidUtilities.dp(3);
+ width -= AndroidUtilities.dp(3);
+ int dash = width / AndroidUtilities.dp(13);
+ if (lastDash != dash) {
+ float gap = (width - dash * AndroidUtilities.dp(8)) / (float) (dash - 1);
+ linePaint.setPathEffect(new DashPathEffect(new float[]{AndroidUtilities.dp(6), gap}, 0));
+ lastDash = dash;
+ }
+ canvas.drawLine(x + AndroidUtilities.dp(1), cy, x + width - AndroidUtilities.dp(1), cy, linePaint);
+ } else {
+ if (a == selectedIndex || a == selectedIndex + 1) {
+ width -= AndroidUtilities.dp(3);
+ }
+ if (a == selectedIndex + 1) {
+ x += AndroidUtilities.dp(3);
+ }
+ canvas.drawRect(x, cy - AndroidUtilities.dp(1), x + width, cy + AndroidUtilities.dp(1), paint);
}
- canvas.drawRect(x, cy - AndroidUtilities.dp(1), x + width, cy + AndroidUtilities.dp(1), paint);
}
int size = optionsSizes[a];
String text = optionsStr[a];
@@ -208,5 +238,9 @@ public class SlideChooseView extends View {
public interface Callback {
void onOptionSelected(int index);
+
+ default void onTouchEnd() {
+
+ }
}
}
\ No newline at end of file
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/StickerSetBulletinLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/StickerSetBulletinLayout.java
index cdfc41e7d..8b31d6e1d 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/StickerSetBulletinLayout.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/StickerSetBulletinLayout.java
@@ -22,14 +22,21 @@ public class StickerSetBulletinLayout extends Bulletin.TwoLineLayout {
public static final int TYPE_REMOVED = 0;
public static final int TYPE_ARCHIVED = 1;
public static final int TYPE_ADDED = 2;
+ public static final int TYPE_REMOVED_FROM_RECENT = 3;
+ public static final int TYPE_REMOVED_FROM_FAVORITES = 4;
+ public static final int TYPE_ADDED_TO_FAVORITES = 5;
@IntDef(value = {TYPE_REMOVED, TYPE_ARCHIVED, TYPE_ADDED})
- public @interface Type {}
+ public @interface Type {
+ }
public StickerSetBulletinLayout(@NonNull Context context, TLObject setObject, @Type int type) {
+ this(context, setObject, type, null);
+ }
+
+ public StickerSetBulletinLayout(@NonNull Context context, TLObject setObject, @Type int type, TLRPC.Document sticker) {
super(context);
- final TLRPC.Document sticker;
final TLRPC.StickerSet stickerSet;
if (setObject instanceof TLRPC.TL_messages_stickerSet) {
@@ -52,11 +59,15 @@ public class StickerSetBulletinLayout extends Bulletin.TwoLineLayout {
sticker = null;
}
} else {
+ stickerSet = null;
+ }
+
+ if (sticker == null) {
throw new IllegalArgumentException("Invalid type of the given setObject: " + setObject.getClass());
}
if (sticker != null) {
- TLObject object = FileLoader.getClosestPhotoSizeWithSize(stickerSet.thumbs, 90);
+ TLObject object = stickerSet == null ? null : FileLoader.getClosestPhotoSizeWithSize(stickerSet.thumbs, 90);
if (object == null) {
object = sticker;
}
@@ -109,6 +120,18 @@ public class StickerSetBulletinLayout extends Bulletin.TwoLineLayout {
subtitleTextView.setText(LocaleController.formatString("StickersArchivedInfo", R.string.StickersArchivedInfo, stickerSet.title));
}
break;
+ case TYPE_REMOVED_FROM_FAVORITES:
+ titleTextView.setText(LocaleController.getString("RemovedFromFavorites", R.string.RemovedFromFavorites));
+ subtitleTextView.setVisibility(ViewPagerFixed.GONE);
+ break;
+ case TYPE_ADDED_TO_FAVORITES:
+ titleTextView.setText(LocaleController.getString("AddedToFavorites", R.string.AddedToFavorites));
+ subtitleTextView.setVisibility(ViewPagerFixed.GONE);
+ break;
+ case TYPE_REMOVED_FROM_RECENT:
+ titleTextView.setText(LocaleController.getString("RemovedFromRecent", R.string.RemovedFromRecent));
+ subtitleTextView.setVisibility(ViewPagerFixed.GONE);
+ break;
}
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/TrendingStickersLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/TrendingStickersLayout.java
index fe40d4b90..60ecef8eb 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/TrendingStickersLayout.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/TrendingStickersLayout.java
@@ -711,6 +711,7 @@ public class TrendingStickersLayout extends FrameLayout implements NotificationC
}
}
+ @SuppressWarnings("unchecked")
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position, @NonNull List payloads) {
if (payloads.contains(PAYLOAD_ANIMATED)) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java
index 4705566b2..8f123360b 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java
@@ -49,7 +49,6 @@ import org.telegram.ui.ActionBar.Theme;
import org.telegram.ui.LaunchActivity;
import tw.nekomimi.nekogram.NekoConfig;
-import tw.nekomimi.nekogram.utils.UIUtil;
@SuppressWarnings("FieldCanBeLocal")
public class UndoView extends FrameLayout {
@@ -130,10 +129,21 @@ public class UndoView extends FrameLayout {
public final static int ACTION_PLAYBACK_SPEED_ENABLED = 50;
public final static int ACTION_PLAYBACK_SPEED_DISABLED = 51;
- public final static int ACTION_TEXT_COPIED = 52;
+ public final static int ACTION_MESSAGE_COPIED = 52;
public final static int ACTION_FWD_MESSAGES = 53;
public final static int ACTION_NOTIFY_ON = 54;
public final static int ACTION_NOTIFY_OFF = 55;
+ public final static int ACTION_USERNAME_COPIED = 56;
+ public final static int ACTION_HASHTAG_COPIED = 57;
+ public final static int ACTION_TEXT_COPIED = 58;
+ public final static int ACTION_LINK_COPIED = 59;
+ public static final int ACTION_PHONE_COPIED = 60;
+
+ public final static int ACTION_AUTO_DELETE_ON = 70;
+ public final static int ACTION_AUTO_DELETE_OFF = 71;
+ public final static int ACTION_REPORT_SENT = 74;
+ public final static int ACTION_GIGAGROUP_CANCEL = 75;
+ public final static int ACTION_GIGAGROUP_SUCCESS = 76;
public final static int ACTION_NEED_RESATRT = 100;
@@ -266,17 +276,18 @@ public class UndoView extends FrameLayout {
currentAction == ACTION_OWNER_TRANSFERED_GROUP || currentAction == ACTION_QUIZ_CORRECT || currentAction == ACTION_QUIZ_INCORRECT || currentAction == ACTION_CACHE_WAS_CLEARED ||
currentAction == ACTION_ADDED_TO_FOLDER || currentAction == ACTION_REMOVED_FROM_FOLDER || currentAction == ACTION_PROFILE_PHOTO_CHANGED ||
currentAction == ACTION_CHAT_UNARCHIVED || currentAction == ACTION_VOIP_MUTED || currentAction == ACTION_VOIP_UNMUTED || currentAction == ACTION_VOIP_REMOVED ||
- currentAction == ACTION_VOIP_LINK_COPIED || currentAction == ACTION_VOIP_INVITED || currentAction == ACTION_VOIP_MUTED_FOR_YOU || currentAction == ACTION_VOIP_UNMUTED_FOR_YOU;
+ currentAction == ACTION_VOIP_LINK_COPIED || currentAction == ACTION_VOIP_INVITED || currentAction == ACTION_VOIP_MUTED_FOR_YOU || currentAction == ACTION_VOIP_UNMUTED_FOR_YOU ||
+ currentAction == ACTION_REPORT_SENT;
}
private boolean hasSubInfo() {
return currentAction == ACTION_QR_SESSION_ACCEPTED || currentAction == ACTION_PROXIMITY_SET || currentAction == ACTION_ARCHIVE_HIDDEN || currentAction == ACTION_ARCHIVE_HINT || currentAction == ACTION_ARCHIVE_FEW_HINT ||
currentAction == ACTION_QUIZ_CORRECT || currentAction == ACTION_QUIZ_INCORRECT ||
- currentAction == ACTION_ARCHIVE_PINNED && MessagesController.getInstance(currentAccount).dialogFilters.isEmpty();
+ currentAction == ACTION_REPORT_SENT || currentAction == ACTION_ARCHIVE_PINNED && MessagesController.getInstance(currentAccount).dialogFilters.isEmpty();
}
public boolean isMultilineSubInfo() {
- return currentAction == ACTION_THEME_CHANGED || currentAction == ACTION_FILTERS_AVAILABLE || currentAction == ACTION_PROXIMITY_SET;
+ return currentAction == ACTION_THEME_CHANGED || currentAction == ACTION_FILTERS_AVAILABLE || currentAction == ACTION_PROXIMITY_SET || currentAction == ACTION_REPORT_SENT;
}
public void setAdditionalTranslationY(float value) {
@@ -382,6 +393,7 @@ public class UndoView extends FrameLayout {
infoTextView.setGravity(Gravity.LEFT | Gravity.TOP);
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) infoTextView.getLayoutParams();
layoutParams.height = LayoutHelper.WRAP_CONTENT;
+ layoutParams.topMargin = AndroidUtilities.dp(13);
layoutParams.bottomMargin = 0;
leftImageView.setScaleType(ImageView.ScaleType.CENTER);
@@ -422,7 +434,14 @@ public class UndoView extends FrameLayout {
int icon;
int size = 36;
boolean iconIsDrawable = false;
- if (action == ACTION_VOIP_INVITED) {
+
+ if (action == ACTION_REPORT_SENT) {
+ subinfoTextView.setSingleLine(false);
+ infoText = LocaleController.getString("ReportChatSent", R.string.ReportChatSent);
+ subInfoText = LocaleController.formatString("ReportSentInfo", R.string.ReportSentInfo);
+ icon = R.raw.ic_admin;
+ timeLeft = 4000;
+ } else if (action == ACTION_VOIP_INVITED) {
TLRPC.User user = (TLRPC.User) infoObject;
infoText = AndroidUtilities.replaceTags(LocaleController.formatString("VoipGroupInvitedUser", R.string.VoipGroupInvitedUser, UserObject.getFirstName(user)));
subInfoText = null;
@@ -621,31 +640,71 @@ public class UndoView extends FrameLayout {
undoButton.setVisibility(GONE);
} else if (currentAction == ACTION_IMPORT_NOT_MUTUAL || currentAction == ACTION_IMPORT_GROUP_NOT_ADMIN || currentAction == ACTION_IMPORT_INFO ||
- currentAction == ACTION_PLAYBACK_SPEED_DISABLED || currentAction == ACTION_PLAYBACK_SPEED_ENABLED || currentAction == ACTION_TEXT_COPIED ||
- currentAction == ACTION_FWD_MESSAGES || currentAction == ACTION_NOTIFY_ON || currentAction == ACTION_NOTIFY_OFF) {
+ currentAction == ACTION_PLAYBACK_SPEED_DISABLED || currentAction == ACTION_PLAYBACK_SPEED_ENABLED || currentAction == ACTION_MESSAGE_COPIED ||
+ currentAction == ACTION_FWD_MESSAGES || currentAction == ACTION_NOTIFY_ON || currentAction == ACTION_NOTIFY_OFF || currentAction == ACTION_USERNAME_COPIED ||
+ currentAction == ACTION_HASHTAG_COPIED || currentAction == ACTION_TEXT_COPIED || currentAction == ACTION_LINK_COPIED || currentAction == ACTION_PHONE_COPIED ||
+ currentAction == ACTION_AUTO_DELETE_OFF || currentAction == ACTION_AUTO_DELETE_ON || currentAction == ACTION_GIGAGROUP_CANCEL || currentAction == ACTION_GIGAGROUP_SUCCESS) {
undoImageView.setVisibility(GONE);
leftImageView.setVisibility(VISIBLE);
infoTextView.setTypeface(Typeface.DEFAULT);
- if (currentAction == ACTION_IMPORT_NOT_MUTUAL) {
+ if (currentAction == ACTION_GIGAGROUP_SUCCESS) {
+ infoTextView.setText(LocaleController.getString("BroadcastGroupConvertSuccess", R.string.BroadcastGroupConvertSuccess));
+ leftImageView.setAnimation(R.raw.gigagroup_convert, 36, 36);
+ infoOnly = true;
+ layoutParams.topMargin = AndroidUtilities.dp(9);
+ infoTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+ } else if (currentAction == ACTION_GIGAGROUP_CANCEL) {
+ infoTextView.setText(LocaleController.getString("GigagroupConvertCancelHint", R.string.GigagroupConvertCancelHint));
+ leftImageView.setAnimation(R.raw.chats_infotip, 36, 36);
+ infoOnly = true;
+ layoutParams.topMargin = AndroidUtilities.dp(9);
+ infoTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+ } else if (action == ACTION_AUTO_DELETE_ON) {
+ TLRPC.User user = (TLRPC.User) infoObject;
+ int ttl = (Integer) infoObject2;
+ String time;
+ subinfoTextView.setSingleLine(false);
+ if (ttl > 24 * 60 * 60) {
+ time = LocaleController.formatPluralString("Days", ttl / (24 * 60 * 60));
+ } else if (ttl >= 60 * 60) {
+ time = LocaleController.formatPluralString("Hours", ttl / (60 * 60));
+ } else if (ttl >= 60) {
+ time = LocaleController.formatPluralString("Minutes", ttl / 60);
+ } else {
+ time = LocaleController.formatPluralString("Seconds", ttl);
+ }
+ infoTextView.setText(LocaleController.formatString("AutoDeleteHintOnText", R.string.AutoDeleteHintOnText, time));
+ leftImageView.setAnimation(R.raw.fire_on, 36, 36);
+ layoutParams.topMargin = AndroidUtilities.dp(9);
+ timeLeft = 4000;
+ infoOnly = true;
+ leftImageView.setPadding(0, 0, 0, AndroidUtilities.dp(3));
+ } else if (currentAction == ACTION_AUTO_DELETE_OFF) {
+ infoTextView.setText(LocaleController.getString("AutoDeleteHintOffText", R.string.AutoDeleteHintOffText));
+ leftImageView.setAnimation(R.raw.fire_off, 36, 36);
+ infoTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+ timeLeft = 3000;
+ leftImageView.setPadding(0, 0, 0, AndroidUtilities.dp(4));
+ } else if (currentAction == ACTION_IMPORT_NOT_MUTUAL) {
infoTextView.setText(LocaleController.getString("ImportMutualError", R.string.ImportMutualError));
leftImageView.setAnimation(R.raw.error, 36, 36);
infoOnly = true;
- layoutParams.topMargin = AndroidUtilities.dp(10);
+ layoutParams.topMargin = AndroidUtilities.dp(9);
infoTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
} else if (currentAction == ACTION_IMPORT_GROUP_NOT_ADMIN) {
infoTextView.setText(LocaleController.getString("ImportNotAdmin", R.string.ImportNotAdmin));
leftImageView.setAnimation(R.raw.error, 36, 36);
infoOnly = true;
- layoutParams.topMargin = AndroidUtilities.dp(10);
+ layoutParams.topMargin = AndroidUtilities.dp(9);
infoTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
} else if (currentAction == ACTION_IMPORT_INFO) {
infoTextView.setText(LocaleController.getString("ImportedInfo", R.string.ImportedInfo));
leftImageView.setAnimation(R.raw.imported, 36, 36);
leftImageView.setPadding(0, 0, 0, AndroidUtilities.dp(5));
infoOnly = true;
- layoutParams.topMargin = AndroidUtilities.dp(10);
+ layoutParams.topMargin = AndroidUtilities.dp(9);
infoTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
} else if (currentAction == ACTION_PLAYBACK_SPEED_DISABLED) {
infoTextView.setText(LocaleController.getString("AudioSpeedNormal", R.string.AudioSpeedNormal));
@@ -657,9 +716,23 @@ public class UndoView extends FrameLayout {
leftImageView.setAnimation(R.raw.audio_speed, 36, 36);
timeLeft = 3000;
infoTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
- } else if (currentAction == ACTION_TEXT_COPIED) {
- infoTextView.setText(LocaleController.getString("MessageCopied", R.string.MessageCopied));
- leftImageView.setAnimation(R.raw.copy, 30, 30);
+ } else if (currentAction == ACTION_MESSAGE_COPIED || currentAction == ACTION_USERNAME_COPIED || currentAction == ACTION_HASHTAG_COPIED || currentAction == ACTION_TEXT_COPIED || currentAction == ACTION_LINK_COPIED || currentAction == ACTION_PHONE_COPIED) {
+ int iconRawId = R.raw.copy;
+ if (currentAction == ACTION_PHONE_COPIED) {
+ infoTextView.setText(LocaleController.getString("PhoneCopied", R.string.PhoneCopied));
+ } else if (currentAction == ACTION_USERNAME_COPIED) {
+ infoTextView.setText(LocaleController.getString("UsernameCopied", R.string.UsernameCopied));
+ } else if (currentAction == ACTION_HASHTAG_COPIED) {
+ infoTextView.setText(LocaleController.getString("HashtagCopied", R.string.HashtagCopied));
+ } else if (currentAction == ACTION_MESSAGE_COPIED) {
+ infoTextView.setText(LocaleController.getString("MessageCopied", R.string.MessageCopied));
+ } else if (currentAction == ACTION_LINK_COPIED) {
+ iconRawId = R.raw.voip_invite;
+ infoTextView.setText(LocaleController.getString("LinkCopied", R.string.LinkCopied));
+ } else {
+ infoTextView.setText(LocaleController.getString("TextCopied", R.string.TextCopied));
+ }
+ leftImageView.setAnimation(iconRawId, 30, 30);
timeLeft = 3000;
infoTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
} else if (currentAction == ACTION_NOTIFY_ON) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/UsersAlertBase.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/UsersAlertBase.java
index 787c880e5..276e3b403 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/UsersAlertBase.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/UsersAlertBase.java
@@ -23,7 +23,6 @@ import android.view.Gravity;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
-import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.inputmethod.EditorInfo;
import android.widget.FrameLayout;
@@ -33,8 +32,6 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.google.android.exoplayer2.util.Log;
-
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.R;
@@ -56,7 +53,7 @@ public class UsersAlertBase extends BottomSheet {
protected AnimatorSet shadowAnimation;
protected StickerEmptyView emptyView;
protected FlickerLoadingView flickerLoadingView;
- private SearchField searchView;
+ protected SearchField searchView;
private RectF rect = new RectF();
@@ -195,13 +192,13 @@ public class UsersAlertBase extends BottomSheet {
}
@SuppressWarnings("FieldCanBeLocal")
- private class SearchField extends FrameLayout {
+ protected class SearchField extends FrameLayout {
private final View searchBackground;
private final ImageView searchIconImageView;
private final ImageView clearSearchImageView;
private final CloseProgressDrawable2 progressDrawable;
- private EditTextBoldCursor searchEditText;
+ protected EditTextBoldCursor searchEditText;
public SearchField(Context context) {
super(context);
@@ -311,6 +308,11 @@ public class UsersAlertBase extends BottomSheet {
onSearchViewTouched(ev, searchEditText);
return super.onInterceptTouchEvent(ev);
}
+
+ public void closeSearch() {
+ clearSearchImageView.callOnClick();
+ AndroidUtilities.hideKeyboard(searchEditText);
+ }
}
protected void onSearchViewTouched(MotionEvent ev, EditTextBoldCursor searchEditText) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/WebPlayerView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/WebPlayerView.java
index ebdb56588..8e3e8dadd 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/WebPlayerView.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/WebPlayerView.java
@@ -1107,7 +1107,7 @@ public class WebPlayerView extends ViewGroup implements VideoPlayer.VideoPlayerD
}
try {
JSONObject json = new JSONObject(playerCode).getJSONObject("file_versions").getJSONObject("mobile");
- String video = decodeUrl(json.getString("gifv"));
+ String video = json.getString("video");
String audio = json.getJSONArray("audio").getString(0);
if (video != null && audio != null) {
results[0] = video;
@@ -2162,16 +2162,25 @@ public class WebPlayerView extends ViewGroup implements VideoPlayer.VideoPlayerD
return false;
}
+ public void willHandle() {
+ controlsView.setVisibility(INVISIBLE);
+ controlsView.show(false, false);
+ showProgress(true, false);
+ }
+
public boolean loadVideo(String url, TLRPC.Photo thumb, Object parentObject, String originalUrl, boolean autoplay) {
String youtubeId = null;
String vimeoId = null;
- String coubId = null;
+ String coubId = getCoubId(url);
+ if (coubId == null) {
+ coubId = getCoubId(originalUrl);
+ }
String twitchClipId = null;
String twitchStreamId = null;
String mp4File = null;
String aparatId = null;
seekToTime = -1;
- if (url != null) {
+ if (coubId == null && url != null) {
if (url.endsWith(".mp4")) {
mp4File = url;
} else {
@@ -2364,6 +2373,25 @@ public class WebPlayerView extends ViewGroup implements VideoPlayer.VideoPlayerD
return false;
}
+ public String getCoubId(String url) {
+ if (TextUtils.isEmpty(url)) {
+ return null;
+ }
+ try {
+ Matcher matcher = coubIdRegex.matcher(url);
+ String id = null;
+ if (matcher.find()) {
+ id = matcher.group(1);
+ }
+ if (id != null) {
+ return id;
+ }
+ } catch (Exception e) {
+ FileLog.e(e);
+ }
+ return null;
+ }
+
public View getAspectRatioView() {
return aspectRatioFrameLayout;
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java
index 2270c37b4..33d97f1f2 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java
@@ -52,7 +52,6 @@ import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageView;
-import android.widget.Toast;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -89,6 +88,7 @@ import org.telegram.ui.Cells.ProfileSearchCell;
import org.telegram.ui.Cells.TextCell;
import org.telegram.ui.Cells.UserCell;
import org.telegram.ui.Components.AlertsCreator;
+import org.telegram.ui.Components.BulletinFactory;
import org.telegram.ui.Components.CombinedDrawable;
import org.telegram.ui.Components.CubicBezierInterpolator;
import org.telegram.ui.Components.EditTextBoldCursor;
@@ -665,7 +665,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
if (user.bot) {
if (user.bot_nochats) {
try {
- Toast.makeText(getParentActivity(), LocaleController.getString("BotCantJoinGroups", R.string.BotCantJoinGroups), Toast.LENGTH_SHORT).show();
+ BulletinFactory.of(this).createErrorBulletin(LocaleController.getString("BotCantJoinGroups", R.string.BotCantJoinGroups)).show();
} catch (Exception e) {
FileLog.e(e);
}
@@ -1008,7 +1008,11 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
return null;
}
RLottieImageView previousFab = dialogsActivity.getFloatingButton();
- if (previousFab == null || floatingButtonContainer == null || previousFab.getVisibility() != View.VISIBLE || Math.abs(previousFab.getTranslationY()) > AndroidUtilities.dp(4) || Math.abs(floatingButtonContainer.getTranslationY()) > AndroidUtilities.dp(4)) {
+ View previousFabContainer = null;
+ if (previousFab.getParent() != null) {
+ previousFabContainer = (View) previousFab.getParent();
+ }
+ if (previousFab == null || floatingButtonContainer == null || previousFabContainer == null || previousFab.getVisibility() != View.VISIBLE || Math.abs(previousFabContainer.getTranslationY()) > AndroidUtilities.dp(4) || Math.abs(floatingButtonContainer.getTranslationY()) > AndroidUtilities.dp(4)) {
return null;
}
previousFab.setVisibility(View.GONE);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ShortcutWidgetConfigActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ContactsWidgetConfigActivity.java
similarity index 66%
rename from TMessagesProj/src/main/java/org/telegram/ui/ShortcutWidgetConfigActivity.java
rename to TMessagesProj/src/main/java/org/telegram/ui/ContactsWidgetConfigActivity.java
index 2b328fad6..3255f777e 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ShortcutWidgetConfigActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ContactsWidgetConfigActivity.java
@@ -1,17 +1,13 @@
package org.telegram.ui;
-import android.app.Activity;
import android.appwidget.AppWidgetManager;
import android.content.Intent;
-import android.content.SharedPreferences;
import android.os.Bundle;
import android.view.View;
-import org.telegram.messenger.AccountInstance;
import org.telegram.messenger.AndroidUtilities;
-import org.telegram.messenger.ShortcutWidgetProvider;
-public class ShortcutWidgetConfigActivity extends ExternalActionActivity {
+public class ContactsWidgetConfigActivity extends ExternalActionActivity {
private int creatingAppWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
@@ -29,16 +25,8 @@ public class ShortcutWidgetConfigActivity extends ExternalActionActivity {
args.putBoolean("onlySelect", true);
args.putInt("dialogsType", 10);
args.putBoolean("allowSwitchAccount", true);
- DialogsActivity fragment = new DialogsActivity(args);
- fragment.setDelegate((fragment1, dids, message, param) -> {
- AccountInstance.getInstance(fragment1.getCurrentAccount()).getMessagesStorage().putWidgetDialogs(creatingAppWidgetId, dids);
-
- SharedPreferences preferences = ShortcutWidgetConfigActivity.this.getSharedPreferences("shortcut_widget", Activity.MODE_PRIVATE);
- preferences.edit().putInt("account" + creatingAppWidgetId, fragment1.getCurrentAccount()).commit();
-
- AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(ShortcutWidgetConfigActivity.this);
- ShortcutWidgetProvider.updateWidget(ShortcutWidgetConfigActivity.this, appWidgetManager, creatingAppWidgetId);
-
+ EditWidgetActivity fragment = new EditWidgetActivity(EditWidgetActivity.TYPE_CONTACTS, creatingAppWidgetId, false);
+ fragment.setDelegate(dialogs -> {
Intent resultValue = new Intent();
resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, creatingAppWidgetId);
setResult(RESULT_OK, resultValue);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/DataAutoDownloadActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/DataAutoDownloadActivity.java
index db0f695cd..a3c594da6 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/DataAutoDownloadActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/DataAutoDownloadActivity.java
@@ -24,6 +24,10 @@ import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.DownloadController;
import org.telegram.messenger.LocaleController;
@@ -49,10 +53,6 @@ import org.telegram.ui.Components.SlideChooseView;
import java.util.ArrayList;
import java.util.Collections;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
public class DataAutoDownloadActivity extends BaseFragment {
private ListAdapter listAdapter;
@@ -887,7 +887,6 @@ public class DataAutoDownloadActivity extends BaseFragment {
} else {
presetsStr[i] = LocaleController.getString("AutoDownloadCustom", R.string.AutoDownloadCustom);
}
-
}
slideChooseView.setOptions(selectedPreset, presetsStr);
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
index 497432bab..3551d1d80 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
@@ -40,7 +40,6 @@ import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Property;
-import android.util.SparseArray;
import android.util.StateSet;
import android.view.Gravity;
import android.view.HapticFeedbackConstants;
@@ -161,6 +160,7 @@ import org.telegram.ui.Components.SizeNotifierFrameLayout;
import org.telegram.ui.Components.StickersAlert;
import org.telegram.ui.Components.UndoView;
import org.telegram.ui.Components.ViewPagerFixed;
+import org.webrtc.RecyclerItemsEnterAnimator;
import java.util.ArrayList;
@@ -206,6 +206,7 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
private FlickerLoadingView progressView;
private int lastItemsCount;
private DialogsItemAnimator dialogsItemAnimator;
+ private RecyclerItemsEnterAnimator recyclerItemsEnterAnimator;
public ViewPage(Context context) {
super(context);
@@ -250,6 +251,8 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
private int initialDialogsType;
+ private boolean checkingImportDialog;
+
private int messagesCount;
private int hasPoll;
@@ -405,7 +408,6 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
private float filterTabsMoveFrom;
private float tabsYOffset;
private float scrollAdditionalOffset;
- private SparseArray listAlphaItems = new SparseArray<>();
public final Property SCROLL_Y = new AnimationProperties.FloatProperty("animationValue") {
@Override
@@ -1148,16 +1150,7 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
@Override
protected void dispatchDraw(Canvas canvas) {
- for (int i = 0; i < getChildCount(); i++) {
- View child = getChildAt(i);
- int position = getChildAdapterPosition(child);
- Float alpha = listAlphaItems.get(position, null);
- if (alpha == null) {
- child.setAlpha(1f);
- } else {
- child.setAlpha(alpha);
- }
- }
+ parentPage.recyclerItemsEnterAnimator.dispatchDraw();
super.dispatchDraw(canvas);
if (slidingView != null && pacmanAnimation != null) {
pacmanAnimation.draw(canvas, slidingView.getTop() + slidingView.getMeasuredHeight() / 2);
@@ -1699,22 +1692,27 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
getNotificationCenter().addObserver(this, NotificationCenter.didClearDatabase);
+ loadDialogs(getAccountInstance());
+ getMessagesController().loadPinnedDialogs(folderId, 0, null);
+ return true;
+ }
+
+ public static void loadDialogs(AccountInstance accountInstance) {
+ int currentAccount = accountInstance.getCurrentAccount();
if (!dialogsLoaded[currentAccount]) {
- MessagesController messagesController = getMessagesController();
+ MessagesController messagesController = accountInstance.getMessagesController();
messagesController.loadGlobalNotificationsSettings();
- messagesController.loadDialogs(folderId, 0, 100, true);
+ messagesController.loadDialogs(0, 0, 100, true);
messagesController.loadHintDialogs();
- messagesController.loadUserInfo(getUserConfig().getCurrentUser(), false, classGuid);
- getContactsController().checkInviteText();
- getMediaDataController().loadRecents(MediaDataController.TYPE_FAVE, false, true, false);
- getMediaDataController().checkFeaturedStickers();
+ messagesController.loadUserInfo(accountInstance.getUserConfig().getCurrentUser(), false, 0);
+ accountInstance.getContactsController().checkInviteText();
+ accountInstance.getMediaDataController().loadRecents(MediaDataController.TYPE_FAVE, false, true, false);
+ accountInstance.getMediaDataController().checkFeaturedStickers();
for (String emoji : messagesController.diceEmojies) {
- getMediaDataController().loadStickersByEmojiOrName(emoji, true, true);
+ accountInstance.getMediaDataController().loadStickersByEmojiOrName(emoji, true, true);
}
dialogsLoaded[currentAccount] = true;
}
- getMessagesController().loadPinnedDialogs(folderId, 0, null);
- return true;
}
@Override
@@ -1768,8 +1766,10 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
@Override
public void setTranslationY(float translationY) {
+ if (translationY != getTranslationY()) {
+ fragmentView.invalidate();
+ }
super.setTranslationY(translationY);
- fragmentView.invalidate();
}
@Override
@@ -1994,10 +1994,12 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
@Override
public void setTranslationY(float translationY) {
- super.setTranslationY(translationY);
- updateContextViewPosition();
- if (fragmentView != null) {
- fragmentView.invalidate();
+ if (getTranslationY() != translationY) {
+ super.setTranslationY(translationY);
+ updateContextViewPosition();
+ if (fragmentView != null) {
+ fragmentView.invalidate();
+ }
}
}
@@ -2663,6 +2665,7 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
}
});
viewPage.swipeController = new SwipeController(viewPage);
+ viewPage.recyclerItemsEnterAnimator = new RecyclerItemsEnterAnimator(viewPage.listView);
viewPage.itemTouchhelper = new ItemTouchHelper(viewPage.swipeController);
viewPage.itemTouchhelper.attachToRecyclerView(viewPage.listView);
@@ -3780,7 +3783,7 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
if (!afterSignup) {
tosAccepted = getUserConfig().unacceptedTermsOfService == null;
} else {
- tosAccepted = false;
+ tosAccepted = true;
afterSignup = false;
}
if (tosAccepted && checkPermission && !onlySelect && Build.VERSION.SDK_INT >= 23) {
@@ -4177,6 +4180,8 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
fragmentView.requestLayout();
}
+ setSearchAnimationProgress(show ? 1f : 0);
+
viewPages[0].listView.setVerticalScrollBarEnabled(true);
searchViewPager.setBackground(null);
searchAnimator = null;
@@ -5870,13 +5875,13 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
viewPages[a].dialogsAdapter.notifyDataSetChanged();
int newItemCount = viewPages[a].dialogsAdapter.getItemCount();
if (newItemCount > oldItemCount && initialDialogsType != 11 && initialDialogsType != 12 && initialDialogsType != 13) {
- showItemsAnimated(viewPages[a].listView, oldItemCount);
+ viewPages[a].recyclerItemsEnterAnimator.showItemsAnimated(oldItemCount);
}
} else {
updateVisibleRows(MessagesController.UPDATE_MASK_NEW_MESSAGE);
int newItemCount = viewPages[a].dialogsAdapter.getItemCount();
if (newItemCount > oldItemCount && initialDialogsType != 11 && initialDialogsType != 12 && initialDialogsType != 13) {
- showItemsAnimated(viewPages[a].listView, oldItemCount);
+ viewPages[a].recyclerItemsEnterAnimator.showItemsAnimated(oldItemCount);
}
}
try {
@@ -6023,81 +6028,12 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
searchViewPager.messagesDeleted(channelId, markAsDeletedMessages);
}
} else if (id == NotificationCenter.didClearDatabase) {
- for (int a = 0; a < viewPages.length; a++) {
- viewPages[a].dialogsAdapter.didDatabaseCleared();
- }
- }
- }
-
- private void showItemsAnimated(RecyclerListView listView, int from) {
- int n = listView.getChildCount();
- View progressView = null;
- for (int i = 0; i < n; i++) {
- View child = listView.getChildAt(i);
- if (child instanceof FlickerLoadingView) {
- progressView = child;
- }
- }
- final View finalProgressView = progressView;
- if (progressView != null) {
- listView.removeView(progressView);
- from--;
- }
- int finalFrom = from;
- listView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
- @Override
- public boolean onPreDraw() {
- listView.getViewTreeObserver().removeOnPreDrawListener(this);
- int n = listView.getChildCount();
- AnimatorSet animatorSet = new AnimatorSet();
- for (int i = 0; i < n; i++) {
- View child = listView.getChildAt(i);
- int position = listView.getChildAdapterPosition(child);
- if (child != finalProgressView && position >= finalFrom - 1 && listAlphaItems.get(position, null) == null) {
- listAlphaItems.put(position, 0f);
- child.setAlpha(0);
- int s = Math.min(listView.getMeasuredHeight(), Math.max(0, child.getTop()));
- int delay = (int) ((s / (float) listView.getMeasuredHeight()) * 100);
- ValueAnimator a = ValueAnimator.ofFloat(0, 1f);
- a.addUpdateListener(valueAnimator -> {
- Float alpha = (Float) valueAnimator.getAnimatedValue();
- listAlphaItems.put(position, alpha);
- listView.invalidate();
- });
- a.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animation) {
- listAlphaItems.remove(position);
- listView.invalidate();
- }
- });
- a.setStartDelay(delay);
- a.setDuration(200);
- animatorSet.playTogether(a);
- }
+ if (viewPages != null) {
+ for (int a = 0; a < viewPages.length; a++) {
+ viewPages[a].dialogsAdapter.didDatabaseCleared();
}
-
- if (finalProgressView != null && finalProgressView.getParent() == null) {
- listView.addView(finalProgressView);
- RecyclerView.LayoutManager layoutManager = listView.getLayoutManager();
- if (layoutManager != null) {
- layoutManager.ignoreView(finalProgressView);
- Animator animator = ObjectAnimator.ofFloat(finalProgressView, View.ALPHA, finalProgressView.getAlpha(), 0);
- animator.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animation) {
- finalProgressView.setAlpha(1f);
- layoutManager.stopIgnoringView(finalProgressView);
- listView.removeView(finalProgressView);
- }
- });
- animator.start();
- }
- }
- animatorSet.start();
- return true;
}
- });
+ }
}
private String showingSuggestion;
@@ -6118,7 +6054,7 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
if (showingSuggestion == null) {
return;
}
- getMessagesController().removeSuggestion(showingSuggestion);
+ getMessagesController().removeSuggestion(0, showingSuggestion);
showingSuggestion = null;
showNextSupportedSuggestion();
}
@@ -6403,28 +6339,55 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
}
}
if (initialDialogsType == 11 || initialDialogsType == 12 || initialDialogsType == 13) {
- int lower_part = (int) dialog_id;
- TLRPC.User user = null;
- TLRPC.Chat chat = null;
- if (lower_part > 0) {
- user = getMessagesController().getUser(lower_part);
+ if (checkingImportDialog) {
+ return;
+ }
+ int lowerId = (int) dialog_id;
+ TLRPC.User user;
+ TLRPC.Chat chat;
+ if (lowerId > 0) {
+ user = getMessagesController().getUser(lowerId);
+ chat = null;
if (!user.mutual_contact) {
getUndoView().showWithAction(dialog_id, UndoView.ACTION_IMPORT_NOT_MUTUAL, null);
return;
}
} else {
- chat = getMessagesController().getChat(-lower_part);
+ user = null;
+ chat = getMessagesController().getChat(-lowerId);
if (!ChatObject.hasAdminRights(chat) || !ChatObject.canChangeChatInfo(chat)) {
getUndoView().showWithAction(dialog_id, UndoView.ACTION_IMPORT_GROUP_NOT_ADMIN, null);
return;
}
}
- AlertsCreator.createImportDialogAlert(this, arguments.getString("importTitle"), user, chat, () -> {
- setDialogsListFrozen(true);
- ArrayList dids = new ArrayList<>();
- dids.add(dialog_id);
- delegate.didSelectDialogs(DialogsActivity.this, dids, null, param);
- });
+ final AlertDialog progressDialog = new AlertDialog(getParentActivity(), 3);
+ TLRPC.TL_messages_checkHistoryImportPeer req = new TLRPC.TL_messages_checkHistoryImportPeer();
+ req.peer = getMessagesController().getInputPeer(lowerId);
+ getConnectionsManager().sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
+ try {
+ progressDialog.dismiss();
+ } catch (Exception e) {
+ FileLog.e(e);
+ }
+ checkingImportDialog = false;
+ if (response != null) {
+ TLRPC.TL_messages_checkedHistoryImportPeer res = (TLRPC.TL_messages_checkedHistoryImportPeer) response;
+ AlertsCreator.createImportDialogAlert(this, arguments.getString("importTitle"), res.confirm_text, user, chat, () -> {
+ setDialogsListFrozen(true);
+ ArrayList dids = new ArrayList<>();
+ dids.add(dialog_id);
+ delegate.didSelectDialogs(DialogsActivity.this, dids, null, param);
+ });
+ } else {
+ AlertsCreator.processError(currentAccount, error, this, req);
+ getNotificationCenter().postNotificationName(NotificationCenter.historyImportProgressChanged, dialog_id, req, error);
+ }
+ }));
+ try {
+ progressDialog.showDelayed(300);
+ } catch (Exception ignore) {
+
+ }
} else if (useAlert && (selectAlertString != null && selectAlertStringGroup != null || addToGroupAlertString != null)) {
if (getParentActivity() == null) {
return;
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/EditWidgetActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/EditWidgetActivity.java
new file mode 100644
index 000000000..b8cbefde1
--- /dev/null
+++ b/TMessagesProj/src/main/java/org/telegram/ui/EditWidgetActivity.java
@@ -0,0 +1,1084 @@
+/*
+ * This is the source code of Telegram for Android v. 7.x.x.
+ * It is licensed under GNU GPL v. 2 or later.
+ * You should have received a copy of the license in this archive (see LICENSE).
+ *
+ * Copyright Nikolai Kudashov, 2013-2021.
+ */
+
+
+package org.telegram.ui;
+
+import android.app.Activity;
+import android.appwidget.AppWidgetManager;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.Shader;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
+import android.os.Build;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.telegram.messenger.AccountInstance;
+import org.telegram.messenger.AndroidUtilities;
+import org.telegram.messenger.ChatObject;
+import org.telegram.messenger.ChatsWidgetProvider;
+import org.telegram.messenger.ContactsController;
+import org.telegram.messenger.ContactsWidgetProvider;
+import org.telegram.messenger.FileLoader;
+import org.telegram.messenger.FileLog;
+import org.telegram.messenger.LocaleController;
+import org.telegram.messenger.MessageObject;
+import org.telegram.messenger.R;
+import org.telegram.messenger.SharedConfig;
+import org.telegram.messenger.UserObject;
+import org.telegram.tgnet.TLRPC;
+import org.telegram.ui.ActionBar.ActionBar;
+import org.telegram.ui.ActionBar.ActionBarMenu;
+import org.telegram.ui.ActionBar.AlertDialog;
+import org.telegram.ui.ActionBar.BaseFragment;
+import org.telegram.ui.ActionBar.Theme;
+import org.telegram.ui.ActionBar.ThemeDescription;
+import org.telegram.ui.Cells.ChatActionCell;
+import org.telegram.ui.Cells.GroupCreateUserCell;
+import org.telegram.ui.Cells.TextCell;
+import org.telegram.ui.Cells.TextInfoPrivacyCell;
+import org.telegram.ui.Components.AvatarDrawable;
+import org.telegram.ui.Components.BackgroundGradientDrawable;
+import org.telegram.ui.Components.CombinedDrawable;
+import org.telegram.ui.Components.ForegroundColorSpanThemable;
+import org.telegram.ui.Components.InviteMembersBottomSheet;
+import org.telegram.ui.Components.LayoutHelper;
+import org.telegram.ui.Components.RecyclerListView;
+
+import java.io.File;
+import java.util.ArrayList;
+
+public class EditWidgetActivity extends BaseFragment {
+
+ private ListAdapter listAdapter;
+ private RecyclerListView listView;
+ private ItemTouchHelper itemTouchHelper;
+ private FrameLayout widgetPreview;
+
+ private ImageView previewImageView;
+
+ private ArrayList selectedDialogs = new ArrayList<>();
+
+ private WidgetPreviewCell widgetPreviewCell;
+
+ private int previewRow;
+ private int selectChatsRow;
+ private int chatsStartRow;
+ private int chatsEndRow;
+ private int infoRow;
+ private int rowCount;
+
+ private int widgetType;
+ private int currentWidgetId;
+ private boolean isEdit;
+
+ private EditWidgetActivityDelegate delegate;
+
+ public final static int TYPE_CHATS = 0;
+ public final static int TYPE_CONTACTS = 1;
+
+ private final static int done_item = 1;
+
+ public interface EditWidgetActivityDelegate {
+ void didSelectDialogs(ArrayList dialogs);
+ }
+
+ public class TouchHelperCallback extends ItemTouchHelper.Callback {
+
+ private boolean moved;
+
+ @Override
+ public boolean isLongPressDragEnabled() {
+ return false;
+ }
+
+ @Override
+ public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+ if (viewHolder.getItemViewType() != 3) {
+ return makeMovementFlags(0, 0);
+ }
+ return makeMovementFlags(ItemTouchHelper.UP | ItemTouchHelper.DOWN, 0);
+ }
+
+ @Override
+ public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder source, RecyclerView.ViewHolder target) {
+ if (source.getItemViewType() != target.getItemViewType()) {
+ return false;
+ }
+ int p1 = source.getAdapterPosition();
+ int p2 = target.getAdapterPosition();
+ if (listAdapter.swapElements(p1, p2)) {
+ ((GroupCreateUserCell) source.itemView).setDrawDivider(p2 != chatsEndRow - 1);
+ ((GroupCreateUserCell) target.itemView).setDrawDivider(p1 != chatsEndRow - 1);
+ moved = true;
+ }
+ return true;
+ }
+
+ @Override
+ public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+ super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+ }
+
+ @Override
+ public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
+ if (actionState != ItemTouchHelper.ACTION_STATE_IDLE) {
+ listView.cancelClickRunnables(false);
+ viewHolder.itemView.setPressed(true);
+ } else if (moved) {
+ if (widgetPreviewCell != null) {
+ widgetPreviewCell.updateDialogs();
+ }
+ moved = false;
+ }
+ super.onSelectedChanged(viewHolder, actionState);
+ }
+
+ @Override
+ public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+
+ }
+
+ @Override
+ public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+ super.clearView(recyclerView, viewHolder);
+ viewHolder.itemView.setPressed(false);
+ }
+ }
+
+ public class WidgetPreviewCell extends FrameLayout {
+
+ private BackgroundGradientDrawable.Disposable backgroundGradientDisposable;
+ private BackgroundGradientDrawable.Disposable oldBackgroundGradientDisposable;
+
+ private Drawable backgroundDrawable;
+ private Drawable oldBackgroundDrawable;
+ private Drawable shadowDrawable;
+
+ private Paint roundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+ private RectF bitmapRect = new RectF();
+ private ViewGroup[] cells = new ViewGroup[2];
+
+ public WidgetPreviewCell(Context context) {
+ super(context);
+
+ setWillNotDraw(false);
+ setPadding(0, AndroidUtilities.dp(24), 0, AndroidUtilities.dp(24));
+
+ LinearLayout linearLayout = new LinearLayout(context);
+ linearLayout.setOrientation(LinearLayout.VERTICAL);
+ addView(linearLayout, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER));
+
+ ChatActionCell chatActionCell = new ChatActionCell(context);
+ chatActionCell.setCustomText(LocaleController.getString("WidgetPreview", R.string.WidgetPreview));
+ linearLayout.addView(chatActionCell, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER, 0, 0, 0, 4));
+
+ LinearLayout widgetPreview = new LinearLayout(context);
+ widgetPreview.setOrientation(LinearLayout.VERTICAL);
+ widgetPreview.setBackgroundResource(R.drawable.widget_bg);
+ linearLayout.addView(widgetPreview, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER, 10, 0, 10, 0));
+
+ previewImageView = new ImageView(context);
+
+ if (widgetType == TYPE_CHATS) {
+ for (int a = 0; a < 2; a++) {
+ cells[a] = (ViewGroup) getParentActivity().getLayoutInflater().inflate(R.layout.shortcut_widget_item, null);
+ widgetPreview.addView(cells[a], LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
+ }
+ widgetPreview.addView(previewImageView, LayoutHelper.createLinear(218, 160, Gravity.CENTER));
+ previewImageView.setImageResource(R.drawable.chats_widget_preview);
+ } else if (widgetType == TYPE_CONTACTS) {
+ for (int a = 0; a < 2; a++) {
+ cells[a] = (ViewGroup) getParentActivity().getLayoutInflater().inflate(R.layout.contacts_widget_item, null);
+ widgetPreview.addView(cells[a], LayoutHelper.createLinear(160, LayoutHelper.WRAP_CONTENT));
+ }
+ widgetPreview.addView(previewImageView, LayoutHelper.createLinear(160, 160, Gravity.CENTER));
+ previewImageView.setImageResource(R.drawable.contacts_widget_preview);
+ }
+ updateDialogs();
+
+ shadowDrawable = Theme.getThemedDrawable(context, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow);
+ }
+
+ public void updateDialogs() {
+ if (widgetType == TYPE_CHATS) {
+ for (int a = 0; a < 2; a++) {
+ TLRPC.Dialog dialog;
+ if (selectedDialogs.isEmpty()) {
+ dialog = a < getMessagesController().dialogsServerOnly.size() ? getMessagesController().dialogsServerOnly.get(a) : null;
+ } else {
+ if (a < selectedDialogs.size()) {
+ dialog = getMessagesController().dialogs_dict.get(selectedDialogs.get(a));
+ if (dialog == null) {
+ dialog = new TLRPC.TL_dialog();
+ dialog.id = selectedDialogs.get(a);
+ }
+ } else {
+ dialog = null;
+ }
+ }
+ if (dialog == null) {
+ cells[a].setVisibility(GONE);
+ continue;
+ }
+ cells[a].setVisibility(VISIBLE);
+ String name = "";
+
+ TLRPC.FileLocation photoPath = null;
+ TLRPC.User user = null;
+ TLRPC.Chat chat = null;
+ int lowerId = (int) dialog.id;
+ if (lowerId > 0) {
+ user = getMessagesController().getUser(lowerId);
+ if (user != null) {
+ if (UserObject.isUserSelf(user)) {
+ name = LocaleController.getString("SavedMessages", R.string.SavedMessages);
+ } else if (UserObject.isReplyUser(user)) {
+ name = LocaleController.getString("RepliesTitle", R.string.RepliesTitle);
+ } else if (UserObject.isDeleted(user)) {
+ name = LocaleController.getString("HiddenName", R.string.HiddenName);
+ } else {
+ name = ContactsController.formatName(user.first_name, user.last_name);
+ }
+ if (!UserObject.isReplyUser(user) && !UserObject.isUserSelf(user) && user != null && user.photo != null && user.photo.photo_small != null && user.photo.photo_small.volume_id != 0 && user.photo.photo_small.local_id != 0) {
+ photoPath = user.photo.photo_small;
+ }
+ }
+ } else {
+ chat = getMessagesController().getChat(-lowerId);
+ if (chat != null) {
+ name = chat.title;
+ if (chat.photo != null && chat.photo.photo_small != null && chat.photo.photo_small.volume_id != 0 && chat.photo.photo_small.local_id != 0) {
+ photoPath = chat.photo.photo_small;
+ }
+ }
+ }
+ ((TextView) cells[a].findViewById(R.id.shortcut_widget_item_text)).setText(name);
+
+ try {
+ Bitmap bitmap = null;
+ if (photoPath != null) {
+ File path = FileLoader.getPathToAttach(photoPath, true);
+ bitmap = BitmapFactory.decodeFile(path.toString());
+ }
+
+ int size = AndroidUtilities.dp(48);
+ Bitmap result = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+ result.eraseColor(Color.TRANSPARENT);
+ Canvas canvas = new Canvas(result);
+ if (bitmap == null) {
+ AvatarDrawable avatarDrawable;
+ if (user != null) {
+ avatarDrawable = new AvatarDrawable(user);
+ if (UserObject.isReplyUser(user)) {
+ avatarDrawable.setAvatarType(AvatarDrawable.AVATAR_TYPE_REPLIES);
+ } else if (UserObject.isUserSelf(user)) {
+ avatarDrawable.setAvatarType(AvatarDrawable.AVATAR_TYPE_SAVED);
+ }
+ } else {
+ avatarDrawable = new AvatarDrawable(chat);
+ }
+ avatarDrawable.setBounds(0, 0, size, size);
+ avatarDrawable.draw(canvas);
+ } else {
+ BitmapShader shader = new BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
+ if (roundPaint == null) {
+ roundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+ bitmapRect = new RectF();
+ }
+ float scale = size / (float) bitmap.getWidth();
+ canvas.save();
+ canvas.scale(scale, scale);
+ roundPaint.setShader(shader);
+ bitmapRect.set(0, 0, bitmap.getWidth(), bitmap.getHeight());
+ canvas.drawRoundRect(bitmapRect, bitmap.getWidth(), bitmap.getHeight(), roundPaint);
+ canvas.restore();
+ }
+ canvas.setBitmap(null);
+ ((ImageView) cells[a].findViewById(R.id.shortcut_widget_item_avatar)).setImageBitmap(result);
+ } catch (Throwable e) {
+ FileLog.e(e);
+ }
+
+ MessageObject message = getMessagesController().dialogMessage.get(dialog.id);
+ if (message != null) {
+ TLRPC.User fromUser = null;
+ TLRPC.Chat fromChat = null;
+ int fromId = message.getFromChatId();
+ if (fromId > 0) {
+ fromUser = getMessagesController().getUser(fromId);
+ } else {
+ fromChat = getMessagesController().getChat(-fromId);
+ }
+ CharSequence messageString;
+ CharSequence messageNameString;
+ int textColor = getContext().getResources().getColor(R.color.widget_text);
+ if (message.messageOwner instanceof TLRPC.TL_messageService) {
+ if (ChatObject.isChannel(chat) && (message.messageOwner.action instanceof TLRPC.TL_messageActionHistoryClear ||
+ message.messageOwner.action instanceof TLRPC.TL_messageActionChannelMigrateFrom)) {
+ messageString = "";
+ } else {
+ messageString = message.messageText;
+ }
+ textColor = getContext().getResources().getColor(R.color.widget_action_text);
+ } else {
+ boolean needEmoji = true;
+ if (chat != null && chat.id > 0 && fromChat == null && (!ChatObject.isChannel(chat) || ChatObject.isMegagroup(chat))) {
+ if (message.isOutOwner()) {
+ messageNameString = LocaleController.getString("FromYou", R.string.FromYou);
+ } else if (fromUser != null) {
+ messageNameString = UserObject.getFirstName(fromUser).replace("\n", "");
+ } else {
+ messageNameString = "DELETED";
+ }
+ SpannableStringBuilder stringBuilder;
+ String messageFormat = "%2$s: \u2068%1$s\u2069";
+ if (message.caption != null) {
+ String mess = message.caption.toString();
+ if (mess.length() > 150) {
+ mess = mess.substring(0, 150);
+ }
+ String emoji;
+ if (message.isVideo()) {
+ emoji = "\uD83D\uDCF9 ";
+ } else if (message.isVoice()) {
+ emoji = "\uD83C\uDFA4 ";
+ } else if (message.isMusic()) {
+ emoji = "\uD83C\uDFA7 ";
+ } else if (message.isPhoto()) {
+ emoji = "\uD83D\uDDBC ";
+ } else {
+ emoji = "\uD83D\uDCCE ";
+ }
+ stringBuilder = SpannableStringBuilder.valueOf(String.format(messageFormat, emoji + mess.replace('\n', ' '), messageNameString));
+ } else if (message.messageOwner.media != null && !message.isMediaEmpty()) {
+ textColor = getContext().getResources().getColor(R.color.widget_action_text);
+ String innerMessage;
+ if (message.messageOwner.media instanceof TLRPC.TL_messageMediaPoll) {
+ TLRPC.TL_messageMediaPoll mediaPoll = (TLRPC.TL_messageMediaPoll) message.messageOwner.media;
+ if (Build.VERSION.SDK_INT >= 18) {
+ innerMessage = String.format("\uD83D\uDCCA \u2068%s\u2069", mediaPoll.poll.question);
+ } else {
+ innerMessage = String.format("\uD83D\uDCCA %s", mediaPoll.poll.question);
+ }
+ } else if (message.messageOwner.media instanceof TLRPC.TL_messageMediaGame) {
+ if (Build.VERSION.SDK_INT >= 18) {
+ innerMessage = String.format("\uD83C\uDFAE \u2068%s\u2069", message.messageOwner.media.game.title);
+ } else {
+ innerMessage = String.format("\uD83C\uDFAE %s", message.messageOwner.media.game.title);
+ }
+ } else if (message.type == 14) {
+ if (Build.VERSION.SDK_INT >= 18) {
+ innerMessage = String.format("\uD83C\uDFA7 \u2068%s - %s\u2069", message.getMusicAuthor(), message.getMusicTitle());
+ } else {
+ innerMessage = String.format("\uD83C\uDFA7 %s - %s", message.getMusicAuthor(), message.getMusicTitle());
+ }
+ } else {
+ innerMessage = message.messageText.toString();
+ }
+ innerMessage = innerMessage.replace('\n', ' ');
+ stringBuilder = SpannableStringBuilder.valueOf(String.format(messageFormat, innerMessage, messageNameString));
+ try {
+ stringBuilder.setSpan(new ForegroundColorSpanThemable(Theme.key_chats_attachMessage), messageNameString.length() + 2, stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ } catch (Exception e) {
+ FileLog.e(e);
+ }
+ } else if (message.messageOwner.message != null) {
+ String mess = message.messageOwner.message;
+ if (mess.length() > 150) {
+ mess = mess.substring(0, 150);
+ }
+ mess = mess.replace('\n', ' ').trim();
+ stringBuilder = SpannableStringBuilder.valueOf(String.format(messageFormat, mess, messageNameString));
+ } else {
+ stringBuilder = SpannableStringBuilder.valueOf("");
+ }
+ try {
+ stringBuilder.setSpan(new ForegroundColorSpanThemable(Theme.key_chats_nameMessage), 0, messageNameString.length() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ } catch (Exception e) {
+ FileLog.e(e);
+ }
+ messageString = stringBuilder;
+ } else {
+ if (message.messageOwner.media instanceof TLRPC.TL_messageMediaPhoto && message.messageOwner.media.photo instanceof TLRPC.TL_photoEmpty && message.messageOwner.media.ttl_seconds != 0) {
+ messageString = LocaleController.getString("AttachPhotoExpired", R.string.AttachPhotoExpired);
+ } else if (message.messageOwner.media instanceof TLRPC.TL_messageMediaDocument && message.messageOwner.media.document instanceof TLRPC.TL_documentEmpty && message.messageOwner.media.ttl_seconds != 0) {
+ messageString = LocaleController.getString("AttachVideoExpired", R.string.AttachVideoExpired);
+ } else if (message.caption != null) {
+ String emoji;
+ if (message.isVideo()) {
+ emoji = "\uD83D\uDCF9 ";
+ } else if (message.isVoice()) {
+ emoji = "\uD83C\uDFA4 ";
+ } else if (message.isMusic()) {
+ emoji = "\uD83C\uDFA7 ";
+ } else if (message.isPhoto()) {
+ emoji = "\uD83D\uDDBC ";
+ } else {
+ emoji = "\uD83D\uDCCE ";
+ }
+ messageString = emoji + message.caption;
+ } else {
+ if (message.messageOwner.media instanceof TLRPC.TL_messageMediaPoll) {
+ TLRPC.TL_messageMediaPoll mediaPoll = (TLRPC.TL_messageMediaPoll) message.messageOwner.media;
+ messageString = "\uD83D\uDCCA " + mediaPoll.poll.question;
+ } else if (message.messageOwner.media instanceof TLRPC.TL_messageMediaGame) {
+ messageString = "\uD83C\uDFAE " + message.messageOwner.media.game.title;
+ } else if (message.type == 14) {
+ messageString = String.format("\uD83C\uDFA7 %s - %s", message.getMusicAuthor(), message.getMusicTitle());
+ } else {
+ messageString = message.messageText;
+ AndroidUtilities.highlightText(messageString, message.highlightedWords);
+ }
+ if (message.messageOwner.media != null && !message.isMediaEmpty()) {
+ textColor = getContext().getResources().getColor(R.color.widget_action_text);
+ }
+ }
+ }
+ }
+
+ ((TextView) cells[a].findViewById(R.id.shortcut_widget_item_time)).setText(LocaleController.stringForMessageListDate(message.messageOwner.date));
+ ((TextView) cells[a].findViewById(R.id.shortcut_widget_item_message)).setText(messageString.toString());
+ ((TextView) cells[a].findViewById(R.id.shortcut_widget_item_message)).setTextColor(textColor);
+ } else {
+ if (dialog != null && dialog.last_message_date != 0) {
+ ((TextView) cells[a].findViewById(R.id.shortcut_widget_item_time)).setText(LocaleController.stringForMessageListDate(dialog.last_message_date));
+ } else {
+ ((TextView) cells[a].findViewById(R.id.shortcut_widget_item_time)).setText("");
+ }
+ ((TextView) cells[a].findViewById(R.id.shortcut_widget_item_message)).setText("");
+ }
+ if (dialog != null && dialog.unread_count > 0) {
+ ((TextView) cells[a].findViewById(R.id.shortcut_widget_item_badge)).setText(String.format("%d", dialog.unread_count));
+ cells[a].findViewById(R.id.shortcut_widget_item_badge).setVisibility(VISIBLE);
+ if (getMessagesController().isDialogMuted(dialog.id)) {
+ cells[a].findViewById(R.id.shortcut_widget_item_badge).setBackgroundResource(R.drawable.widget_counter_muted);
+ } else {
+ cells[a].findViewById(R.id.shortcut_widget_item_badge).setBackgroundResource(R.drawable.widget_counter);
+ }
+ } else {
+ cells[a].findViewById(R.id.shortcut_widget_item_badge).setVisibility(GONE);
+ }
+ }
+ cells[0].findViewById(R.id.shortcut_widget_item_divider).setVisibility(cells[1].getVisibility());
+ cells[1].findViewById(R.id.shortcut_widget_item_divider).setVisibility(GONE);
+ } else if (widgetType == TYPE_CONTACTS) {
+ for (int position = 0; position < 2; position++) {
+ for (int a = 0; a < 2; a++) {
+ int num = position * 2 + a;
+ TLRPC.Dialog dialog;
+ if (selectedDialogs.isEmpty()) {
+ if (num < getMediaDataController().hints.size()) {
+ int userId = getMediaDataController().hints.get(num).peer.user_id;
+ dialog = getMessagesController().dialogs_dict.get(userId);
+ if (dialog == null) {
+ dialog = new TLRPC.TL_dialog();
+ dialog.id = userId;
+ }
+ } else {
+ dialog = null;
+ }
+ } else {
+ if (num < selectedDialogs.size()) {
+ dialog = getMessagesController().dialogs_dict.get(selectedDialogs.get(num));
+ if (dialog == null) {
+ dialog = new TLRPC.TL_dialog();
+ dialog.id = selectedDialogs.get(num);
+ }
+ } else {
+ dialog = null;
+ }
+ }
+ if (dialog == null) {
+ cells[position].findViewById(a == 0 ? R.id.contacts_widget_item1 : R.id.contacts_widget_item2).setVisibility(INVISIBLE);
+ if (num == 0 || num == 2) {
+ cells[position].setVisibility(GONE);
+ }
+ continue;
+ }
+ cells[position].findViewById(a == 0 ? R.id.contacts_widget_item1 : R.id.contacts_widget_item2).setVisibility(VISIBLE);
+ if (num == 0 || num == 2) {
+ cells[position].setVisibility(VISIBLE);
+ }
+
+ String name;
+
+ int lowerId = (int) dialog.id;
+ TLRPC.FileLocation photoPath = null;
+ TLRPC.User user = null;
+ TLRPC.Chat chat = null;
+ if (lowerId > 0) {
+ user = getMessagesController().getUser(lowerId);
+ if (UserObject.isUserSelf(user)) {
+ name = LocaleController.getString("SavedMessages", R.string.SavedMessages);
+ } else if (UserObject.isReplyUser(user)) {
+ name = LocaleController.getString("RepliesTitle", R.string.RepliesTitle);
+ } else if (UserObject.isDeleted(user)) {
+ name = LocaleController.getString("HiddenName", R.string.HiddenName);
+ } else {
+ name = UserObject.getFirstName(user);
+ }
+ if (!UserObject.isReplyUser(user) && !UserObject.isUserSelf(user) && user != null && user.photo != null && user.photo.photo_small != null && user.photo.photo_small.volume_id != 0 && user.photo.photo_small.local_id != 0) {
+ photoPath = user.photo.photo_small;
+ }
+ } else {
+ chat = getMessagesController().getChat(-lowerId);
+ name = chat.title;
+ if (chat.photo != null && chat.photo.photo_small != null && chat.photo.photo_small.volume_id != 0 && chat.photo.photo_small.local_id != 0) {
+ photoPath = chat.photo.photo_small;
+ }
+ }
+ ((TextView) cells[position].findViewById(a == 0 ? R.id.contacts_widget_item_text1 : R.id.contacts_widget_item_text2)).setText(name);
+ try {
+ Bitmap bitmap = null;
+ if (photoPath != null) {
+ File path = FileLoader.getPathToAttach(photoPath, true);
+ bitmap = BitmapFactory.decodeFile(path.toString());
+ }
+
+ int size = AndroidUtilities.dp(48);
+ Bitmap result = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+ result.eraseColor(Color.TRANSPARENT);
+ Canvas canvas = new Canvas(result);
+ if (bitmap == null) {
+ AvatarDrawable avatarDrawable;
+ if (user != null) {
+ avatarDrawable = new AvatarDrawable(user);
+ if (UserObject.isReplyUser(user)) {
+ avatarDrawable.setAvatarType(AvatarDrawable.AVATAR_TYPE_REPLIES);
+ } else if (UserObject.isUserSelf(user)) {
+ avatarDrawable.setAvatarType(AvatarDrawable.AVATAR_TYPE_SAVED);
+ }
+ } else {
+ avatarDrawable = new AvatarDrawable(chat);
+ }
+ avatarDrawable.setBounds(0, 0, size, size);
+ avatarDrawable.draw(canvas);
+ } else {
+ BitmapShader shader = new BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
+ float scale = size / (float) bitmap.getWidth();
+ canvas.save();
+ canvas.scale(scale, scale);
+ roundPaint.setShader(shader);
+ bitmapRect.set(0, 0, bitmap.getWidth(), bitmap.getHeight());
+ canvas.drawRoundRect(bitmapRect, bitmap.getWidth(), bitmap.getHeight(), roundPaint);
+ canvas.restore();
+ }
+ canvas.setBitmap(null);
+ ((ImageView) cells[position].findViewById(a == 0 ? R.id.contacts_widget_item_avatar1 : R.id.contacts_widget_item_avatar2)).setImageBitmap(result);
+ } catch (Throwable e) {
+ FileLog.e(e);
+ }
+
+ if (dialog != null && dialog.unread_count > 0) {
+ ((TextView) cells[position].findViewById(a == 0 ? R.id.contacts_widget_item_badge1 : R.id.contacts_widget_item_badge2)).setText(String.format("%d", dialog.unread_count));
+ cells[position].findViewById(a == 0 ? R.id.contacts_widget_item_badge_bg1 : R.id.contacts_widget_item_badge_bg2).setVisibility(VISIBLE);
+ } else {
+ cells[position].findViewById(a == 0 ? R.id.contacts_widget_item_badge_bg1 : R.id.contacts_widget_item_badge_bg2).setVisibility(GONE);
+ }
+ }
+ }
+ }
+ if (cells[0].getVisibility() == VISIBLE) {
+ previewImageView.setVisibility(GONE);
+ } else {
+ previewImageView.setVisibility(VISIBLE);
+ }
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(264), MeasureSpec.EXACTLY));
+ }
+
+ @Override
+ protected void onDraw(Canvas canvas) {
+ Drawable newDrawable = Theme.getCachedWallpaperNonBlocking();
+ if (newDrawable != backgroundDrawable && newDrawable != null) {
+ if (Theme.isAnimatingColor()) {
+ oldBackgroundDrawable = backgroundDrawable;
+ oldBackgroundGradientDisposable = backgroundGradientDisposable;
+ } else if (backgroundGradientDisposable != null) {
+ backgroundGradientDisposable.dispose();
+ backgroundGradientDisposable = null;
+ }
+ backgroundDrawable = newDrawable;
+ }
+ float themeAnimationValue = parentLayout.getThemeAnimationValue();
+ for (int a = 0; a < 2; a++) {
+ Drawable drawable = a == 0 ? oldBackgroundDrawable : backgroundDrawable;
+ if (drawable == null) {
+ continue;
+ }
+ if (a == 1 && oldBackgroundDrawable != null && parentLayout != null) {
+ drawable.setAlpha((int) (255 * themeAnimationValue));
+ } else {
+ drawable.setAlpha(255);
+ }
+ if (drawable instanceof ColorDrawable || drawable instanceof GradientDrawable) {
+ drawable.setBounds(0, 0, getMeasuredWidth(), getMeasuredHeight());
+ if (drawable instanceof BackgroundGradientDrawable) {
+ final BackgroundGradientDrawable backgroundGradientDrawable = (BackgroundGradientDrawable) drawable;
+ backgroundGradientDisposable = backgroundGradientDrawable.drawExactBoundsSize(canvas, this);
+ } else {
+ drawable.draw(canvas);
+ }
+ } else if (drawable instanceof BitmapDrawable) {
+ BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable;
+ if (bitmapDrawable.getTileModeX() == Shader.TileMode.REPEAT) {
+ canvas.save();
+ float scale = 2.0f / AndroidUtilities.density;
+ canvas.scale(scale, scale);
+ drawable.setBounds(0, 0, (int) Math.ceil(getMeasuredWidth() / scale), (int) Math.ceil(getMeasuredHeight() / scale));
+ } else {
+ int viewHeight = getMeasuredHeight();
+ float scaleX = (float) getMeasuredWidth() / (float) drawable.getIntrinsicWidth();
+ float scaleY = (float) (viewHeight) / (float) drawable.getIntrinsicHeight();
+ float scale = Math.max(scaleX, scaleY);
+ int width = (int) Math.ceil(drawable.getIntrinsicWidth() * scale);
+ int height = (int) Math.ceil(drawable.getIntrinsicHeight() * scale);
+ int x = (getMeasuredWidth() - width) / 2;
+ int y = (viewHeight - height) / 2;
+ canvas.save();
+ canvas.clipRect(0, 0, width, getMeasuredHeight());
+ drawable.setBounds(x, y, x + width, y + height);
+ }
+ drawable.draw(canvas);
+ canvas.restore();
+ }
+ if (a == 0 && oldBackgroundDrawable != null && themeAnimationValue >= 1.0f) {
+ if (oldBackgroundGradientDisposable != null) {
+ oldBackgroundGradientDisposable.dispose();
+ oldBackgroundGradientDisposable = null;
+ }
+ oldBackgroundDrawable = null;
+ invalidate();
+ }
+ }
+ shadowDrawable.setBounds(0, 0, getMeasuredWidth(), getMeasuredHeight());
+ shadowDrawable.draw(canvas);
+ }
+
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ if (backgroundGradientDisposable != null) {
+ backgroundGradientDisposable.dispose();
+ backgroundGradientDisposable = null;
+ }
+ if (oldBackgroundGradientDisposable != null) {
+ oldBackgroundGradientDisposable.dispose();
+ oldBackgroundGradientDisposable = null;
+ }
+ }
+
+ @Override
+ public boolean onInterceptTouchEvent(MotionEvent ev) {
+ return false;
+ }
+
+ @Override
+ public boolean dispatchTouchEvent(MotionEvent ev) {
+ return false;
+ }
+
+ @Override
+ protected void dispatchSetPressed(boolean pressed) {
+
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ return false;
+ }
+ }
+
+ public EditWidgetActivity(int type, int widgetId, boolean edit) {
+ super();
+ widgetType = type;
+ currentWidgetId = widgetId;
+ isEdit = edit;
+ if (edit) {
+ ArrayList users = new ArrayList<>();
+ ArrayList chats = new ArrayList<>();
+ getMessagesStorage().getWidgetDialogIds(currentWidgetId, widgetType, selectedDialogs, users, chats, true);
+ getMessagesController().putUsers(users, true);
+ getMessagesController().putChats(chats, true);
+ }
+ updateRows();
+ }
+
+ @Override
+ public boolean onFragmentCreate() {
+ DialogsActivity.loadDialogs(AccountInstance.getInstance(currentAccount));
+ getMediaDataController().loadHints(true);
+ return super.onFragmentCreate();
+ }
+
+ private void updateRows() {
+ rowCount = 0;
+ previewRow = rowCount++;
+ selectChatsRow = rowCount++;
+ if (selectedDialogs.isEmpty()) {
+ chatsStartRow = -1;
+ chatsEndRow = -1;
+ } else {
+ chatsStartRow = rowCount;
+ rowCount += selectedDialogs.size();
+ chatsEndRow = rowCount;
+ }
+ infoRow = rowCount++;
+
+ if (listAdapter != null) {
+ listAdapter.notifyDataSetChanged();
+ }
+ }
+
+ public void setDelegate(EditWidgetActivityDelegate editWidgetActivityDelegate) {
+ delegate = editWidgetActivityDelegate;
+ }
+
+ @Override
+ public View createView(Context context) {
+ actionBar.setBackButtonImage(R.drawable.ic_ab_back);
+ actionBar.setAllowOverlayTitle(false);
+ if (AndroidUtilities.isTablet()) {
+ actionBar.setOccupyStatusBar(false);
+ }
+
+ if (widgetType == TYPE_CHATS) {
+ actionBar.setTitle(LocaleController.getString("WidgetChats", R.string.WidgetChats));
+ } else {
+ actionBar.setTitle(LocaleController.getString("WidgetShortcuts", R.string.WidgetShortcuts));
+ }
+ ActionBarMenu menu = actionBar.createMenu();
+ menu.addItem(done_item, LocaleController.getString("Done", R.string.Done).toUpperCase());
+
+ actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
+ @Override
+ public void onItemClick(int id) {
+ if (id == -1) {
+ if (delegate == null) {
+ finishActivity();
+ return;
+ }
+ finishFragment();
+ } else if (id == done_item) {
+ if (getParentActivity() == null) {
+ return;
+ }
+ getMessagesStorage().putWidgetDialogs(currentWidgetId, selectedDialogs);
+
+ SharedPreferences preferences = getParentActivity().getSharedPreferences("shortcut_widget", Activity.MODE_PRIVATE);
+ preferences.edit().putInt("account" + currentWidgetId, currentAccount).commit();
+ preferences.edit().putInt("type" + currentWidgetId, widgetType).commit();
+
+ AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(getParentActivity());
+ if (widgetType == TYPE_CHATS) {
+ ChatsWidgetProvider.updateWidget(getParentActivity(), appWidgetManager, currentWidgetId, isEdit);
+ } else {
+ ContactsWidgetProvider.updateWidget(getParentActivity(), appWidgetManager, currentWidgetId, isEdit);
+ }
+ if (delegate != null) {
+ delegate.didSelectDialogs(selectedDialogs);
+ } else {
+ finishActivity();
+ }
+ }
+ }
+ });
+
+ listAdapter = new ListAdapter(context);
+
+ FrameLayout frameLayout = new FrameLayout(context);
+ frameLayout.setBackgroundColor(Theme.getColor(Theme.key_windowBackgroundGray));
+ fragmentView = frameLayout;
+
+ listView = new RecyclerListView(context);
+ listView.setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false));
+ listView.setVerticalScrollBarEnabled(false);
+ listView.setAdapter(listAdapter);
+ ((DefaultItemAnimator) listView.getItemAnimator()).setDelayAnimations(false);
+ frameLayout.addView(listView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT));
+ itemTouchHelper = new ItemTouchHelper(new TouchHelperCallback());
+ itemTouchHelper.attachToRecyclerView(listView);
+ listView.setOnItemClickListener((view, position) -> {
+ if (position == selectChatsRow) {
+ InviteMembersBottomSheet bottomSheet = new InviteMembersBottomSheet(context, currentAccount, null, 0, EditWidgetActivity.this);
+ bottomSheet.setDelegate(dids -> {
+ selectedDialogs.clear();
+ selectedDialogs.addAll(dids);
+ updateRows();
+ if (widgetPreviewCell != null) {
+ widgetPreviewCell.updateDialogs();
+ }
+ }, selectedDialogs);
+ bottomSheet.setSelectedContacts(selectedDialogs);
+ showDialog(bottomSheet);
+ }
+ });
+ listView.setOnItemLongClickListener(new RecyclerListView.OnItemLongClickListenerExtended() {
+
+ private Rect rect = new Rect();
+
+ @Override
+ public boolean onItemClick(View view, int position, float x, float y) {
+ if (getParentActivity() == null || !(view instanceof GroupCreateUserCell)) {
+ return false;
+ }
+ ImageView imageView = (ImageView) view.getTag(R.id.object_tag);
+ imageView.getHitRect(rect);
+ if (!rect.contains((int) x, (int) y)) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
+ CharSequence[] items = new CharSequence[]{LocaleController.getString("Delete", R.string.Delete)};
+ builder.setItems(items, (dialogInterface, i) -> {
+ if (i == 0) {
+ selectedDialogs.remove(position - chatsStartRow);
+ updateRows();
+ if (widgetPreviewCell != null) {
+ widgetPreviewCell.updateDialogs();
+ }
+ }
+ });
+ showDialog(builder.create());
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public void onMove(float dx, float dy) {
+
+ }
+
+ @Override
+ public void onLongClickRelease() {
+
+ }
+ });
+
+ return fragmentView;
+ }
+
+ private void finishActivity() {
+ if (getParentActivity() == null) {
+ return;
+ }
+ getParentActivity().finish();
+ AndroidUtilities.runOnUIThread(this::removeSelfFromStack, 1000);
+ }
+
+ private class ListAdapter extends RecyclerListView.SelectionAdapter {
+
+ private Context mContext;
+
+ public ListAdapter(Context context) {
+ mContext = context;
+ }
+
+ @Override
+ public int getItemCount() {
+ return rowCount;
+ }
+
+ @Override
+ public boolean isEnabled(RecyclerView.ViewHolder holder) {
+ int type = holder.getItemViewType();
+ return type == 1 || type == 3;
+ }
+
+ @Override
+ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ View view;
+ switch (viewType) {
+ case 0:
+ view = new TextInfoPrivacyCell(mContext);
+ view.setBackgroundDrawable(Theme.getThemedDrawable(mContext, R.drawable.greydivider, Theme.key_windowBackgroundGrayShadow));
+ break;
+ case 1:
+ view = new TextCell(mContext);
+ view.setBackgroundColor(Theme.getColor(Theme.key_windowBackgroundWhite));
+ break;
+ case 2:
+ view = widgetPreviewCell = new WidgetPreviewCell(mContext);
+ break;
+ case 3:
+ default:
+ GroupCreateUserCell cell = new GroupCreateUserCell(mContext, false, 0, false);
+ ImageView sortImageView = new ImageView(mContext);
+ sortImageView.setImageResource(R.drawable.list_reorder);
+ sortImageView.setScaleType(ImageView.ScaleType.CENTER);
+ cell.setTag(R.id.object_tag, sortImageView);
+ cell.addView(sortImageView, LayoutHelper.createFrame(40, LayoutHelper.MATCH_PARENT, Gravity.CENTER_VERTICAL | (LocaleController.isRTL ? Gravity.LEFT : Gravity.RIGHT), 10, 0, 10, 0));
+ sortImageView.setOnTouchListener((v, event) -> {
+ if (event.getAction() == MotionEvent.ACTION_DOWN) {
+ itemTouchHelper.startDrag(listView.getChildViewHolder(cell));
+ }
+ return false;
+ });
+ sortImageView.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_chats_pinnedIcon), PorterDuff.Mode.MULTIPLY));
+ view = cell;
+ break;
+ }
+ return new RecyclerListView.Holder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+ switch (holder.getItemViewType()) {
+ case 0: {
+ TextInfoPrivacyCell cell = (TextInfoPrivacyCell) holder.itemView;
+ if (position == infoRow) {
+ SpannableStringBuilder builder = new SpannableStringBuilder();
+ if (widgetType == TYPE_CHATS) {
+ builder.append(LocaleController.getString("EditWidgetChatsInfo", R.string.EditWidgetChatsInfo));
+ } else if (widgetType == TYPE_CONTACTS) {
+ builder.append(LocaleController.getString("EditWidgetContactsInfo", R.string.EditWidgetContactsInfo));
+ }
+ if (SharedConfig.passcodeHash.length() > 0) {
+ builder.append(AndroidUtilities.replaceTags(LocaleController.getString("WidgetPasscode", R.string.WidgetPasscode)));
+ }
+ cell.setText(builder);
+ }
+ break;
+ }
+ case 1: {
+ TextCell cell = (TextCell) holder.itemView;
+ cell.setColors(null, Theme.key_windowBackgroundWhiteBlueText4);
+ Drawable drawable1 = mContext.getResources().getDrawable(R.drawable.poll_add_circle);
+ Drawable drawable2 = mContext.getResources().getDrawable(R.drawable.poll_add_plus);
+ drawable1.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_switchTrackChecked), PorterDuff.Mode.MULTIPLY));
+ drawable2.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_checkboxCheck), PorterDuff.Mode.MULTIPLY));
+ CombinedDrawable combinedDrawable = new CombinedDrawable(drawable1, drawable2);
+ cell.setTextAndIcon(LocaleController.getString("SelectChats", R.string.SelectChats), combinedDrawable, chatsStartRow != -1);
+ cell.getImageView().setPadding(0, AndroidUtilities.dp(7), 0, 0);
+ break;
+ }
+ case 3: {
+ GroupCreateUserCell cell = (GroupCreateUserCell) holder.itemView;
+ long did = selectedDialogs.get(position - chatsStartRow);
+ int lowerId = (int) did;
+ if (lowerId > 0) {
+ TLRPC.User user = getMessagesController().getUser(lowerId);
+ cell.setObject(user, null, null, position != chatsEndRow - 1);
+ } else {
+ TLRPC.Chat chat = getMessagesController().getChat(-lowerId);
+ cell.setObject(chat, null, null, position != chatsEndRow - 1);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void onViewAttachedToWindow(RecyclerView.ViewHolder holder) {
+ int type = holder.getItemViewType();
+ if (type == 3 || type == 1) {
+ holder.itemView.setBackgroundColor(Theme.getColor(Theme.key_windowBackgroundWhite));
+ }
+ }
+
+ @Override
+ public int getItemViewType(int position) {
+ if (position == previewRow) {
+ return 2;
+ } else if (position == selectChatsRow) {
+ return 1;
+ } else if (position == infoRow) {
+ return 0;
+ }
+ return 3;
+ }
+
+ public boolean swapElements(int fromIndex, int toIndex) {
+ int idx1 = fromIndex - chatsStartRow;
+ int idx2 = toIndex - chatsStartRow;
+ int count = chatsEndRow - chatsStartRow;
+ if (idx1 < 0 || idx2 < 0 || idx1 >= count || idx2 >= count) {
+ return false;
+ }
+ Long did1 = selectedDialogs.get(idx1);
+ Long did2 = selectedDialogs.get(idx2);
+ selectedDialogs.set(idx1, did2);
+ selectedDialogs.set(idx2, did1);
+ notifyItemMoved(fromIndex, toIndex);
+ return true;
+ }
+ }
+
+ @Override
+ public boolean isSwipeBackEnabled(MotionEvent event) {
+ return false;
+ }
+
+ @Override
+ public boolean onBackPressed() {
+ if (delegate == null) {
+ finishActivity();
+ return false;
+ } else {
+ return super.onBackPressed();
+ }
+ }
+
+ @Override
+ public ArrayList getThemeDescriptions() {
+ ArrayList themeDescriptions = new ArrayList<>();
+
+ themeDescriptions.add(new ThemeDescription(listView, ThemeDescription.FLAG_CELLBACKGROUNDCOLOR, new Class[]{TextCell.class}, null, null, null, Theme.key_windowBackgroundWhite));
+ themeDescriptions.add(new ThemeDescription(fragmentView, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_windowBackgroundGray));
+
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_actionBarDefault));
+ themeDescriptions.add(new ThemeDescription(listView, ThemeDescription.FLAG_LISTGLOWCOLOR, null, null, null, null, Theme.key_actionBarDefault));
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_ITEMSCOLOR, null, null, null, null, Theme.key_actionBarDefaultIcon));
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_TITLECOLOR, null, null, null, null, Theme.key_actionBarDefaultTitle));
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SELECTORCOLOR, null, null, null, null, Theme.key_actionBarDefaultSelector));
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SUBMENUBACKGROUND, null, null, null, null, Theme.key_actionBarDefaultSubmenuBackground));
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SUBMENUITEM, null, null, null, null, Theme.key_actionBarDefaultSubmenuItem));
+ themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SUBMENUITEM | ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_actionBarDefaultSubmenuItemIcon));
+
+ themeDescriptions.add(new ThemeDescription(listView, ThemeDescription.FLAG_SELECTOR, null, null, null, null, Theme.key_listSelector));
+
+ themeDescriptions.add(new ThemeDescription(listView, 0, new Class[]{View.class}, Theme.dividerPaint, null, null, Theme.key_divider));
+
+ themeDescriptions.add(new ThemeDescription(listView, ThemeDescription.FLAG_BACKGROUNDFILTER, new Class[]{TextInfoPrivacyCell.class}, null, null, null, Theme.key_windowBackgroundGrayShadow));
+ themeDescriptions.add(new ThemeDescription(listView, 0, new Class[]{TextInfoPrivacyCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteGrayText4));
+
+ themeDescriptions.add(new ThemeDescription(listView, 0, new Class[]{TextCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteBlueText4));
+ themeDescriptions.add(new ThemeDescription(listView, 0, new Class[]{TextCell.class}, new String[]{"imageView"}, null, null, null, Theme.key_windowBackgroundWhiteBlueText4));
+
+
+ return themeDescriptions;
+ }
+}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/FeedWidgetConfigActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/FeedWidgetConfigActivity.java
index 49dc7fde1..8adfd46fa 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/FeedWidgetConfigActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/FeedWidgetConfigActivity.java
@@ -34,7 +34,7 @@ public class FeedWidgetConfigActivity extends ExternalActionActivity {
fragment.setDelegate((fragment1, dids, message, param) -> {
AccountInstance.getInstance(fragment1.getCurrentAccount()).getMessagesStorage().putWidgetDialogs(creatingAppWidgetId, dids);
- SharedPreferences preferences = FeedWidgetConfigActivity.this.getSharedPreferences("feed_widget", Activity.MODE_PRIVATE);
+ SharedPreferences preferences = FeedWidgetConfigActivity.this.getSharedPreferences("shortcut_widget", Activity.MODE_PRIVATE);
preferences.edit().putInt("account" + creatingAppWidgetId, fragment1.getCurrentAccount()).commit();
preferences.edit().putLong("dialogId" + creatingAppWidgetId, dids.get(0)).commit();
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/GroupCallActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/GroupCallActivity.java
index 53540a59e..f917b0150 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/GroupCallActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/GroupCallActivity.java
@@ -792,7 +792,9 @@ public class GroupCallActivity extends BottomSheet implements NotificationCenter
if (num == 6) {
String text = (String) args[1];
String error;
- if ("ANONYMOUS_CALLS_DISABLED".equals(text) || "GROUPCALL_ANONYMOUS_FORBIDDEN".equals(text)) {
+ if ("GROUPCALL_PARTICIPANTS_TOO_MUCH".equals(text)) {
+ error = LocaleController.getString("VoipGroupTooMuch", R.string.VoipGroupTooMuch);
+ } else if ("ANONYMOUS_CALLS_DISABLED".equals(text) || "GROUPCALL_ANONYMOUS_FORBIDDEN".equals(text)) {
error = LocaleController.getString("VoipGroupJoinAnonymousAdmin", R.string.VoipGroupJoinAnonymousAdmin);
} else {
error = LocaleController.getString("ErrorOccurred", R.string.ErrorOccurred) + "\n" + text;
@@ -2831,7 +2833,7 @@ public class GroupCallActivity extends BottomSheet implements NotificationCenter
items.add(LocaleController.getString("VoipGroupOpenProfile", R.string.VoipGroupOpenProfile));
icons.add(R.drawable.msg_openprofile);
options.add(6);
- if (!isAdmin) {
+ if (!isAdmin && ChatObject.canBlockUsers(currentChat)) {
items.add(LocaleController.getString("VoipGroupUserRemove", R.string.VoipGroupUserRemove));
icons.add(R.drawable.msg_block2);
options.add(2);
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java
index c151aac18..5860bed42 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/GroupCreateActivity.java
@@ -23,10 +23,6 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
-import androidx.annotation.Keep;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
import android.text.Editable;
import android.text.InputType;
import android.text.SpannableStringBuilder;
@@ -50,42 +46,46 @@ import android.view.inputmethod.EditorInfo;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ScrollView;
-import android.widget.Toast;
+
+import androidx.annotation.Keep;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.ChatObject;
import org.telegram.messenger.ContactsController;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.LocaleController;
+import org.telegram.messenger.MessagesController;
+import org.telegram.messenger.NotificationCenter;
+import org.telegram.messenger.R;
import org.telegram.messenger.UserObject;
import org.telegram.messenger.Utilities;
import org.telegram.tgnet.TLObject;
import org.telegram.tgnet.TLRPC;
-import org.telegram.messenger.MessagesController;
-import org.telegram.messenger.NotificationCenter;
-import org.telegram.messenger.R;
+import org.telegram.ui.ActionBar.ActionBar;
import org.telegram.ui.ActionBar.AlertDialog;
import org.telegram.ui.ActionBar.BackDrawable;
-import org.telegram.ui.ActionBar.Theme;
-import org.telegram.ui.ActionBar.ActionBar;
import org.telegram.ui.ActionBar.BaseFragment;
+import org.telegram.ui.ActionBar.Theme;
import org.telegram.ui.ActionBar.ThemeDescription;
import org.telegram.ui.Adapters.SearchAdapterHelper;
import org.telegram.ui.Cells.CheckBoxCell;
import org.telegram.ui.Cells.GroupCreateSectionCell;
import org.telegram.ui.Cells.GroupCreateUserCell;
import org.telegram.ui.Cells.TextCell;
+import org.telegram.ui.Components.BulletinFactory;
import org.telegram.ui.Components.CombinedDrawable;
import org.telegram.ui.Components.EditTextBoldCursor;
import org.telegram.ui.Components.FlickerLoadingView;
-import org.telegram.ui.Components.PermanentLinkBottomSheet;
-import org.telegram.ui.Components.StickerEmptyView;
-import org.telegram.ui.Components.VerticalPositionAutoAnimator;
import org.telegram.ui.Components.GroupCreateDividerItemDecoration;
import org.telegram.ui.Components.GroupCreateSpan;
import org.telegram.ui.Components.LayoutHelper;
+import org.telegram.ui.Components.PermanentLinkBottomSheet;
import org.telegram.ui.Components.RecyclerListView;
+import org.telegram.ui.Components.StickerEmptyView;
import org.telegram.ui.Components.TypefaceSpan;
+import org.telegram.ui.Components.VerticalPositionAutoAnimator;
import java.util.ArrayList;
import java.util.Collections;
@@ -526,6 +526,8 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
}
};
ViewGroup frameLayout = (ViewGroup) fragmentView;
+ frameLayout.setFocusableInTouchMode(true);
+ frameLayout.setDescendantFocusability(ViewGroup.FOCUS_BEFORE_DESCENDANTS);
scrollView = new ScrollView(context) {
@Override
@@ -677,19 +679,8 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
frameLayout.addView(listView);
listView.setOnItemClickListener((view, position) -> {
if (position == 0 && adapter.inviteViaLink != 0 && !adapter.searching) {
- sharedLinkBottomSheet = new PermanentLinkBottomSheet(context, false, this, info, chatId);
+ sharedLinkBottomSheet = new PermanentLinkBottomSheet(context, false, this, info, chatId, channelId != 0);
showDialog(sharedLinkBottomSheet);
-// int id = chatId != 0 ? chatId : channelId;
-// TLRPC.Chat chat = getMessagesController().getChat(id);
-// if (chat != null && chat.has_geo && !TextUtils.isEmpty(chat.username)) {
-// ChatEditTypeActivity activity = new ChatEditTypeActivity(id, true);
-// activity.setInfo(info);
-// presentFragment(activity);
-// return;
-// }
-// presentFragment(new GroupInviteActivity(id));
-
-
} else if (view instanceof GroupCreateUserCell) {
GroupCreateUserCell cell = (GroupCreateUserCell) view;
Object object = cell.getObject();
@@ -725,7 +716,7 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
if (addToGroup && user.bot) {
if (channelId == 0 && user.bot_nochats) {
try {
- Toast.makeText(getParentActivity(), LocaleController.getString("BotCantJoinGroups", R.string.BotCantJoinGroups), Toast.LENGTH_SHORT).show();
+ BulletinFactory.of(this).createErrorBulletin(LocaleController.getString("BotCantJoinGroups", R.string.BotCantJoinGroups)).show();
} catch (Exception e) {
FileLog.e(e);
}
@@ -873,9 +864,6 @@ public class GroupCreateActivity extends BaseFragment implements NotificationCen
@Override
public void onResume() {
super.onResume();
- if (editText != null) {
- editText.requestFocus();
- }
AndroidUtilities.requestAdjustResize(getParentActivity(), classGuid);
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
index 522b847fb..28d51b637 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
@@ -123,6 +123,7 @@ import org.telegram.ui.Components.RLottieImageView;
import org.telegram.ui.Components.RecyclerListView;
import org.telegram.ui.Components.SharingLocationsAlert;
import org.telegram.ui.Components.SideMenultItemAnimator;
+import org.telegram.ui.Components.StickerSetBulletinLayout;
import org.telegram.ui.Components.StickersAlert;
import org.telegram.ui.Components.Switch;
import org.telegram.ui.Components.TermsOfServiceView;
@@ -787,6 +788,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
NotificationCenter.getGlobalInstance().addObserver(this, NotificationCenter.didSetNewWallpapper);
NotificationCenter.getGlobalInstance().addObserver(this, NotificationCenter.notificationsCountUpdated);
NotificationCenter.getGlobalInstance().addObserver(this, NotificationCenter.screenStateChanged);
+ NotificationCenter.getGlobalInstance().addObserver(this, NotificationCenter.showBulletin);
NotificationCenter.getGlobalInstance().addObserver(drawerLayoutAdapter, NotificationCenter.proxySettingsChanged);
NotificationCenter.getGlobalInstance().addObserver(drawerLayoutAdapter, NotificationCenter.updateUserStatus);
@@ -1280,6 +1282,8 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
int push_enc_id = 0;
int push_msg_id = 0;
int open_settings = 0;
+ int open_widget_edit = -1;
+ int open_widget_edit_type = -1;
int open_new_dialog = 0;
long dialogId = 0;
boolean showDialogsList = false;
@@ -1696,6 +1700,8 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
}
} else if (path.startsWith("joinchat/")) {
group = path.replace("joinchat/", "");
+ } else if (path.startsWith("+")) {
+ group = path.replace("+", "");
} else if (path.startsWith("addstickers/")) {
sticker = path.replace("addstickers/", "");
} else if (path.startsWith("msg/") || path.startsWith("share/")) {
@@ -2137,20 +2143,27 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
int chatId = intent.getIntExtra("chatId", 0);
int userId = intent.getIntExtra("userId", 0);
int encId = intent.getIntExtra("encId", 0);
- if (push_msg_id == 0) {
- push_msg_id = intent.getIntExtra("message_id", 0);
- }
- if (chatId != 0) {
- NotificationCenter.getInstance(intentAccount[0]).postNotificationName(NotificationCenter.closeChats);
- push_chat_id = chatId;
- } else if (userId != 0) {
- NotificationCenter.getInstance(intentAccount[0]).postNotificationName(NotificationCenter.closeChats);
- push_user_id = userId;
- } else if (encId != 0) {
- NotificationCenter.getInstance(intentAccount[0]).postNotificationName(NotificationCenter.closeChats);
- push_enc_id = encId;
+ int widgetId = intent.getIntExtra("appWidgetId", 0);
+ if (widgetId != 0) {
+ open_settings = 6;
+ open_widget_edit = widgetId;
+ open_widget_edit_type = intent.getIntExtra("appWidgetType", 0);
} else {
- showDialogsList = true;
+ if (push_msg_id == 0) {
+ push_msg_id = intent.getIntExtra("message_id", 0);
+ }
+ if (chatId != 0) {
+ NotificationCenter.getInstance(intentAccount[0]).postNotificationName(NotificationCenter.closeChats);
+ push_chat_id = chatId;
+ } else if (userId != 0) {
+ NotificationCenter.getInstance(intentAccount[0]).postNotificationName(NotificationCenter.closeChats);
+ push_user_id = userId;
+ } else if (encId != 0) {
+ NotificationCenter.getInstance(intentAccount[0]).postNotificationName(NotificationCenter.closeChats);
+ push_enc_id = encId;
+ } else {
+ showDialogsList = true;
+ }
}
} else if (intent.getAction().equals("com.tmessages.openplayer")) {
showPlayer = true;
@@ -2199,18 +2212,21 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
ChatActivity fragment = new ChatActivity(args);
if (actionBarLayout.presentFragment(fragment, false, true, true, false)) {
pushOpened = true;
+ drawerLayoutContainer.closeDrawer();
}
}
}
} else if (push_chat_id != 0) {
Bundle args = new Bundle();
args.putInt("chat_id", push_chat_id);
- if (push_msg_id != 0)
+ if (push_msg_id != 0) {
args.putInt("message_id", push_msg_id);
+ }
if (mainFragmentsStack.isEmpty() || MessagesController.getInstance(intentAccount[0]).checkCanOpenChat(args, mainFragmentsStack.get(mainFragmentsStack.size() - 1))) {
ChatActivity fragment = new ChatActivity(args);
if (actionBarLayout.presentFragment(fragment, false, true, true, false)) {
pushOpened = true;
+ drawerLayoutContainer.closeDrawer();
}
}
} else if (push_enc_id != 0) {
@@ -2219,6 +2235,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
ChatActivity fragment = new ChatActivity(args);
if (actionBarLayout.presentFragment(fragment, false, true, true, false)) {
pushOpened = true;
+ drawerLayoutContainer.closeDrawer();
}
} else if (showDialogsList) {
if (!AndroidUtilities.isTablet()) {
@@ -2285,13 +2302,19 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
} else if (open_settings == 5) {
fragment = new ActionIntroActivity(ActionIntroActivity.ACTION_TYPE_CHANGE_PHONE_NUMBER);
closePrevious = true;
+ } else if (open_settings == 6) {
+ fragment = new EditWidgetActivity(open_widget_edit_type, open_widget_edit, true);
} else if (open_settings == 100) {
fragment = new NekoSettingsActivity();
} else {
fragment = null;
}
boolean closePreviousFinal = closePrevious;
- AndroidUtilities.runOnUIThread(() -> presentFragment(fragment, closePreviousFinal, false));
+ if (open_settings == 6) {
+ actionBarLayout.presentFragment(fragment, false, true, true, false);
+ } else {
+ AndroidUtilities.runOnUIThread(() -> presentFragment(fragment, closePreviousFinal, false));
+ }
if (AndroidUtilities.isTablet()) {
actionBarLayout.showLastFragment();
rightActionBarLayout.showLastFragment();
@@ -2546,7 +2569,9 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
}
if (!chatOpened) {
try {
- Toast.makeText(LaunchActivity.this, LocaleController.getString("ChannelPostDeleted", R.string.ChannelPostDeleted), Toast.LENGTH_SHORT).show();
+ if (!mainFragmentsStack.isEmpty()) {
+ BulletinFactory.of(mainFragmentsStack.get(mainFragmentsStack.size() - 1)).createErrorBulletin(LocaleController.getString("ChannelPostDeleted", R.string.ChannelPostDeleted)).show();
+ }
} catch (Exception e) {
FileLog.e(e);
}
@@ -2849,7 +2874,9 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
final TLRPC.User user = !res.users.isEmpty() ? res.users.get(0) : null;
if (user == null || user.bot && user.bot_nochats) {
try {
- Toast.makeText(LaunchActivity.this, LocaleController.getString("BotCantJoinGroups", R.string.BotCantJoinGroups), Toast.LENGTH_SHORT).show();
+ if (!mainFragmentsStack.isEmpty()) {
+ BulletinFactory.of(mainFragmentsStack.get(mainFragmentsStack.size() - 1)).createErrorBulletin(LocaleController.getString("BotCantJoinGroups", R.string.BotCantJoinGroups)).show();
+ }
} catch (Exception e) {
FileLog.e(e);
}
@@ -2928,10 +2955,13 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
}
} else {
try {
- if (error != null && error.text != null && error.text.startsWith("FLOOD_WAIT")) {
- Toast.makeText(LaunchActivity.this, LocaleController.getString("FloodWait", R.string.FloodWait), Toast.LENGTH_SHORT).show();
- } else {
- Toast.makeText(LaunchActivity.this, LocaleController.getString("NoUsernameFound", R.string.NoUsernameFound), Toast.LENGTH_SHORT).show();
+ if (!mainFragmentsStack.isEmpty()) {
+ BaseFragment fragment = mainFragmentsStack.get(mainFragmentsStack.size() - 1);
+ if (error != null && error.text != null && error.text.startsWith("FLOOD_WAIT")) {
+ BulletinFactory.of(fragment).createErrorBulletin(LocaleController.getString("FloodWait", R.string.FloodWait)).show();
+ } else {
+ BulletinFactory.of(fragment).createErrorBulletin(LocaleController.getString("NoUsernameFound", R.string.NoUsernameFound)).show();
+ }
}
} catch (Exception e) {
FileLog.e(e);
@@ -3009,6 +3039,9 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
builder.setTitle(LocaleController.getString("NekoX", R.string.NekoX));
if (error.text.startsWith("FLOOD_WAIT")) {
builder.setMessage(LocaleController.getString("FloodWait", R.string.FloodWait));
+ } else if (error.text.startsWith("INVITE_HASH_EXPIRED")) {
+ builder.setTitle(LocaleController.getString("ExpiredLink", R.string.ExpiredLink));
+ builder.setMessage(LocaleController.getString("InviteExpired", R.string.InviteExpired));
} else {
builder.setMessage(LocaleController.getString("JoinToGroupErrorNotExist", R.string.JoinToGroupErrorNotExist));
}
@@ -3766,6 +3799,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
NotificationCenter.getGlobalInstance().removeObserver(this, NotificationCenter.didSetPasscode);
NotificationCenter.getGlobalInstance().removeObserver(this, NotificationCenter.notificationsCountUpdated);
NotificationCenter.getGlobalInstance().removeObserver(this, NotificationCenter.screenStateChanged);
+ NotificationCenter.getGlobalInstance().removeObserver(this, NotificationCenter.showBulletin);
NotificationCenter.getGlobalInstance().removeObserver(drawerLayoutAdapter, NotificationCenter.proxySettingsChanged);
NotificationCenter.getGlobalInstance().removeObserver(drawerLayoutAdapter, NotificationCenter.updateUserStatus);
@@ -4477,6 +4511,17 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa
if (args.length > 1 && !mainFragmentsStack.isEmpty()) {
AlertsCreator.processError(currentAccount, (TLRPC.TL_error) args[2], mainFragmentsStack.get(mainFragmentsStack.size() - 1), (TLObject) args[1]);
}
+ } else if (id == NotificationCenter.showBulletin) {
+ if (!mainFragmentsStack.isEmpty()) {
+ int type = (int) args[0];
+ BaseFragment fragment = mainFragmentsStack.get(mainFragmentsStack.size() - 1);
+ if (type == Bulletin.TYPE_STICKER) {
+ TLRPC.Document sticker = (TLRPC.Document) args[1];
+ Bulletin.make(fragment, new StickerSetBulletinLayout(this, null, (int) args[2], sticker), Bulletin.DURATION_SHORT).show();
+ } else if (type == Bulletin.TYPE_ERROR) {
+ BulletinFactory.of(fragment).createErrorBulletin((String) args[1]).show();
+ }
+ }
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LinkEditActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LinkEditActivity.java
index 4d311731d..6911b9cb2 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/LinkEditActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/LinkEditActivity.java
@@ -2,12 +2,14 @@ package org.telegram.ui;
import android.content.Context;
import android.graphics.Canvas;
+import android.os.Vibrator;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
import android.text.method.DigitsKeyListener;
import android.util.TypedValue;
import android.view.Gravity;
+import android.view.MotionEvent;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
@@ -20,6 +22,7 @@ import org.telegram.messenger.R;
import org.telegram.tgnet.TLObject;
import org.telegram.tgnet.TLRPC;
import org.telegram.ui.ActionBar.ActionBar;
+import org.telegram.ui.ActionBar.AdjustPanLayoutHelper;
import org.telegram.ui.ActionBar.AlertDialog;
import org.telegram.ui.ActionBar.BaseFragment;
import org.telegram.ui.ActionBar.Theme;
@@ -54,6 +57,8 @@ public class LinkEditActivity extends BaseFragment {
private TextView buttonTextView;
private TextSettingsCell revokeLink;
private boolean ignoreSet;
+ private ScrollView scrollView;
+ private boolean finished;
public LinkEditActivity(int type, int chatId) {
this.type = type;
@@ -65,7 +70,6 @@ public class LinkEditActivity extends BaseFragment {
private ArrayList dispalyedUses = new ArrayList<>();
private final int[] defaultUses = new int[]{1, 10, 100};
- private int selectedDate;
private Callback callback;
AlertDialog progressDialog;
@@ -86,15 +90,61 @@ public class LinkEditActivity extends BaseFragment {
public void onItemClick(int id) {
if (id == -1) {
finishFragment();
+ AndroidUtilities.hideKeyboard(usesEditText);
}
}
});
- ScrollView scrollView = new ScrollView(context);
+ scrollView = new ScrollView(context);
SizeNotifierFrameLayout contentView = new SizeNotifierFrameLayout(context) {
int oldKeyboardHeight;
+
+ @Override
+ protected AdjustPanLayoutHelper createAdjustPanLayoutHelper() {
+ AdjustPanLayoutHelper panLayoutHelper = new AdjustPanLayoutHelper(this) {
+
+ @Override
+ protected void onTransitionStart(boolean keyboardVisible, int contentHeight) {
+ super.onTransitionStart(keyboardVisible, contentHeight);
+ scrollView.getLayoutParams().height = contentHeight;
+ }
+
+ @Override
+ protected void onTransitionEnd() {
+ super.onTransitionEnd();
+ scrollView.getLayoutParams().height = LinearLayout.LayoutParams.MATCH_PARENT;
+ scrollView.requestLayout();
+ }
+
+ @Override
+ protected void onPanTranslationUpdate(float y, float progress, boolean keyboardVisible) {
+ super.onPanTranslationUpdate(y, progress, keyboardVisible);
+ setTranslationY(0);
+ }
+
+ @Override
+ protected boolean heightAnimationEnabled() {
+ return !finished;
+ }
+ };
+ panLayoutHelper.setCheckHierarchyHeight(true);
+ return panLayoutHelper;
+ }
+
+ @Override
+ protected void onAttachedToWindow() {
+ super.onAttachedToWindow();
+ adjustPanLayoutHelper.onAttach();
+ }
+
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ adjustPanLayoutHelper.onDetach();
+ }
+
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -103,24 +153,79 @@ public class LinkEditActivity extends BaseFragment {
scrollToEnd = true;
invalidate();
}
+
+ if (keyboardHeight < AndroidUtilities.dp(20)) {
+ usesEditText.clearFocus();
+ }
+
oldKeyboardHeight = keyboardHeight;
}
+ @Override
+ protected void onLayout(boolean changed, int l, int t, int r, int b) {
+ int scrollY = scrollView.getScrollY();
+ super.onLayout(changed, l, t, r, b);
+
+ if (scrollY != scrollView.getScrollY() && !scrollToEnd) {
+ scrollView.setTranslationY(scrollView.getScrollY() - scrollY);
+ scrollView.animate().cancel();
+ scrollView.animate().translationY(0).setDuration(AdjustPanLayoutHelper.keyboardDuration).setInterpolator(AdjustPanLayoutHelper.keyboardInterpolator).start();
+ }
+ }
+
@Override
protected void dispatchDraw(Canvas canvas) {
super.dispatchDraw(canvas);
if (scrollToEnd) {
scrollToEnd = false;
- scrollView.scrollTo(0, Math.max(0, scrollView.getChildAt(0).getMeasuredHeight() - scrollView.getMeasuredHeight() - AndroidUtilities.dp(16)));
+ scrollView.smoothScrollTo(0, Math.max(0, scrollView.getChildAt(0).getMeasuredHeight() - scrollView.getMeasuredHeight()));
}
}
};
- contentView.setDelegate((keyboardHeight, isWidthGreater) -> {
- });
fragmentView = contentView;
- LinearLayout linearLayout = new LinearLayout(context);
+ LinearLayout linearLayout = new LinearLayout(context) {
+
+ boolean firstLayout = true;
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ int elementsHeight = 0;
+ int h = MeasureSpec.getSize(heightMeasureSpec);
+ for (int i = 0; i < getChildCount(); i++) {
+ View child = getChildAt(i);
+ if (child != buttonTextView) {
+ elementsHeight += child.getMeasuredHeight();
+ }
+ }
+
+ int topMargin;
+ int buttonH = AndroidUtilities.dp(48) + AndroidUtilities.dp(24) + AndroidUtilities.dp(16);
+ if (elementsHeight >= h - buttonH) {
+ topMargin = AndroidUtilities.dp(24);
+ } else {
+ topMargin = AndroidUtilities.dp(24) + (h - buttonH) - elementsHeight;
+ }
+
+ if (((LayoutParams) buttonTextView.getLayoutParams()).topMargin != topMargin) {
+ int oldMargin = ((LayoutParams) buttonTextView.getLayoutParams()).topMargin;
+ ((LayoutParams) buttonTextView.getLayoutParams()).topMargin = topMargin;
+ if (!firstLayout) {
+ buttonTextView.setTranslationY(oldMargin - topMargin);
+ buttonTextView.animate().translationY(0).setDuration(AdjustPanLayoutHelper.keyboardDuration).setInterpolator(AdjustPanLayoutHelper.keyboardInterpolator).start();
+ }
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+ }
+
+ @Override
+ protected void dispatchDraw(Canvas canvas) {
+ super.dispatchDraw(canvas);
+ firstLayout = false;
+ }
+ };
linearLayout.setOrientation(LinearLayout.VERTICAL);
scrollView.addView(linearLayout);
@@ -185,7 +290,15 @@ public class LinkEditActivity extends BaseFragment {
resetUses();
linearLayout.addView(usesChooseView);
- usesEditText = new EditText(context);
+ usesEditText = new EditText(context) {
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ if (event.getAction() == MotionEvent.ACTION_UP) {
+ setCursorVisible(true);
+ }
+ return super.onTouchEvent(event);
+ }
+ };
usesEditText.setPadding(AndroidUtilities.dp(22), 0, AndroidUtilities.dp(22), 0);
usesEditText.setGravity(Gravity.CENTER_VERTICAL);
usesEditText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16);
@@ -219,7 +332,11 @@ public class LinkEditActivity extends BaseFragment {
resetUses();
return;
}
- chooseUses(customUses);
+ if (customUses > 100000) {
+ resetUses();
+ } else {
+ chooseUses(customUses);
+ }
}
});
linearLayout.addView(usesEditText, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 50));
@@ -249,8 +366,8 @@ public class LinkEditActivity extends BaseFragment {
linearLayout.addView(revokeLink);
}
- contentView.addView(scrollView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, 0, 0, 0, 0, 80));
- contentView.addView(buttonTextView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 48, Gravity.BOTTOM, 16, 15, 16, 16));
+ contentView.addView(scrollView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT));
+ linearLayout.addView(buttonTextView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 48, Gravity.BOTTOM, 16, 15, 16, 16));
timeHeaderCell.setBackgroundColor(Theme.getColor(Theme.key_windowBackgroundWhite));
timeChooseView.setBackgroundColor(Theme.getColor(Theme.key_windowBackgroundWhite));
@@ -264,6 +381,17 @@ public class LinkEditActivity extends BaseFragment {
if (loading) {
return;
}
+
+ int timeIndex = timeChooseView.getSelectedIndex();
+ if (timeIndex < dispalyedDates.size() && dispalyedDates.get(timeIndex) < 0) {
+ AndroidUtilities.shakeView(timeEditText, 2, 0);
+ Vibrator vibrator = (Vibrator) timeEditText.getContext().getSystemService(Context.VIBRATOR_SERVICE);
+ if (vibrator != null) {
+ vibrator.vibrate(200);
+ }
+ return;
+ }
+
if (type == CREATE_TYPE) {
if (progressDialog != null) {
progressDialog.dismiss();
@@ -273,7 +401,7 @@ public class LinkEditActivity extends BaseFragment {
progressDialog.showDelayed(500);
TLRPC.TL_messages_exportChatInvite req = new TLRPC.TL_messages_exportChatInvite();
req.peer = getMessagesController().getInputPeer(-chatId);
- /*req.legacy_revoke_permanent = false; TODO layer 124
+ req.legacy_revoke_permanent = false;
int i = timeChooseView.getSelectedIndex();
req.flags |= 1;
@@ -289,7 +417,7 @@ public class LinkEditActivity extends BaseFragment {
req.usage_limit = dispalyedUses.get(i);
} else {
req.usage_limit = 0;
- }*/
+ }
getConnectionsManager().sendRequest(req, (response, error) -> {
AndroidUtilities.runOnUIThread(() -> {
@@ -321,19 +449,31 @@ public class LinkEditActivity extends BaseFragment {
req.peer = getMessagesController().getInputPeer(-chatId);
int i = timeChooseView.getSelectedIndex();
- req.flags |= 1;
if (i < dispalyedDates.size()) {
- req.expire_date = dispalyedDates.get(i) + getConnectionsManager().getCurrentTime();
+ if (currentInviteDate != dispalyedDates.get(i)) {
+ req.flags |= 1;
+ req.expire_date = dispalyedDates.get(i) + getConnectionsManager().getCurrentTime();
+ }
} else {
- req.expire_date = 0;
+ if (currentInviteDate != 0) {
+ req.flags |= 1;
+ req.expire_date = 0;
+ }
}
i = usesChooseView.getSelectedIndex();
- req.flags |= 2;
+
if (i < dispalyedUses.size()) {
- req.usage_limit = dispalyedUses.get(i);
+ int newLimit = dispalyedUses.get(i);
+ if (inviteToEdit.usage_limit != newLimit) {
+ req.flags |= 2;
+ req.usage_limit = newLimit;
+ }
} else {
- req.usage_limit = 0;
+ if (inviteToEdit.usage_limit != 0) {
+ req.flags |= 2;
+ req.usage_limit = 0;
+ }
}
getConnectionsManager().sendRequest(req, (response, error) -> {
@@ -366,7 +506,13 @@ public class LinkEditActivity extends BaseFragment {
timeEditText.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteBlackText));
timeEditText.setHintTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteGrayText));
+ usesEditText.setCursorVisible(false);
setInviteToEdit(inviteToEdit);
+
+ contentView.setClipChildren(false);
+ scrollView.setClipChildren(false);
+ linearLayout.setClipChildren(false);
+
return contentView;
}
@@ -401,7 +547,6 @@ public class LinkEditActivity extends BaseFragment {
}
private void chooseDate(int selectedDate) {
- this.selectedDate = selectedDate;
timeEditText.setText(LocaleController.formatDateAudio(selectedDate, false));
int originDate = selectedDate;
@@ -436,7 +581,7 @@ public class LinkEditActivity extends BaseFragment {
} else {
if (selectedDate < 86400L) {
options[i] = LocaleController.getString("MessageScheduleToday", R.string.MessageScheduleToday);
- } else if (selectedDate < 364 * 86400L){
+ } else if (selectedDate < 364 * 86400L) {
options[i] = LocaleController.getInstance().formatterScheduleDay.format(originDate * 1000L);
} else {
options[i] = LocaleController.getInstance().formatterYear.format(originDate * 1000L);
@@ -467,25 +612,42 @@ public class LinkEditActivity extends BaseFragment {
usesChooseView.setOptions(4, "1", "10", "100", LocaleController.getString("NoLimit", R.string.NoLimit));
}
+ int currentInviteDate;
+
public void setInviteToEdit(TLRPC.TL_chatInviteExported invite) {
inviteToEdit = invite;
if (fragmentView != null && invite != null) {
if (invite.expire_date > 0) {
chooseDate(invite.expire_date);
+ currentInviteDate = dispalyedDates.get(timeChooseView.getSelectedIndex());
+ } else {
+ currentInviteDate = 0;
}
if (invite.usage_limit > 0) {
chooseUses(invite.usage_limit);
+ usesEditText.setText(Integer.toString(invite.usage_limit));
}
}
}
public interface Callback {
void onLinkCreated(TLObject response);
+
void onLinkEdited(TLRPC.TL_chatInviteExported inviteToEdit, TLObject response);
+
void onLinkRemoved(TLRPC.TL_chatInviteExported inviteFinal);
+
void revokeLink(TLRPC.TL_chatInviteExported inviteFinal);
}
+ @Override
+ public void finishFragment() {
+ scrollView.getLayoutParams().height = scrollView.getHeight();
+ finished = true;
+ super.finishFragment();
+
+ }
+
@Override
public ArrayList getThemeDescriptions() {
ThemeDescription.ThemeDescriptionDelegate descriptionDelegate = new ThemeDescription.ThemeDescriptionDelegate() {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java
index d412c967e..371a3fdf7 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.java
@@ -1076,9 +1076,7 @@ public class LoginActivity extends BaseFragment implements NotificationCenter.No
}
} else if (dialog == permissionsShowDialog && !permissionsShowItems.isEmpty() && getParentActivity() != null) {
- AndroidUtilities.runOnUIThread(() -> {
- needRequestPermissions = false;
- }, 200);
+ AndroidUtilities.runOnUIThread(() -> needRequestPermissions = false, 200);
try {
getParentActivity().requestPermissions(permissionsShowItems.toArray(new String[0]), 7);
} catch (Exception ignore) {
@@ -2422,12 +2420,14 @@ public class LoginActivity extends BaseFragment implements NotificationCenter.No
private TextView confirmTextView;
private TextView titleTextView;
private ImageView blackImageView;
- private ImageView blueImageView;
+ private RLottieImageView blueImageView;
private TextView timeText;
private TextView problemText;
private Bundle currentParams;
private ProgressView progressView;
+ RLottieDrawable hintDrawable;
+
private Timer timeTimer;
private Timer codeTimer;
private int openTime;
@@ -2491,18 +2491,19 @@ public class LoginActivity extends BaseFragment implements NotificationCenter.No
blackImageView.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_windowBackgroundWhiteBlackText), PorterDuff.Mode.SRC_IN));
frameLayout.addView(blackImageView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.LEFT | Gravity.TOP, 0, 0, 0, 0));
- blueImageView = new ImageView(context);
+ blueImageView = new RLottieImageView(context);
blueImageView.setImageResource(R.drawable.sms_bubble);
blueImageView.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_chats_actionBackground), PorterDuff.Mode.SRC_IN));
frameLayout.addView(blueImageView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.LEFT | Gravity.TOP, 0, 0, 0, 0));
titleTextView.setText(LocaleController.getString("SentAppCodeTitle", R.string.SentAppCodeTitle));
} else {
- blueImageView = new ImageView(context);
- blueImageView.setImageResource(R.drawable.sms_code);
- blueImageView.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_chats_actionBackground), PorterDuff.Mode.SRC_IN));
- frameLayout.addView(blueImageView, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.LEFT | Gravity.TOP, 0, 0, 0, 0));
-
+ blueImageView = new RLottieImageView(context);
+ hintDrawable = new RLottieDrawable(R.raw.sms_incoming_info, "" + R.raw.sms_incoming_info, AndroidUtilities.dp(64), AndroidUtilities.dp(64), true, null);
+ hintDrawable.setLayerColor("Bubble.**", Theme.getColor(Theme.key_chats_actionBackground));
+ hintDrawable.setLayerColor("Phone.**", Theme.getColor(Theme.key_chats_actionBackground));
+ blueImageView.setAnimation(hintDrawable);
+ frameLayout.addView(blueImageView, LayoutHelper.createFrame(64, 64, Gravity.LEFT | Gravity.TOP, 0, 0, 0, 0));
titleTextView.setText(LocaleController.getString("SentSmsCodeTitle", R.string.SentSmsCodeTitle));
}
addView(titleTextView, LayoutHelper.createLinear(LayoutHelper.WRAP_CONTENT, LayoutHelper.WRAP_CONTENT, Gravity.CENTER_HORIZONTAL | Gravity.TOP, 0, 18, 0, 0));
@@ -3194,6 +3195,9 @@ public class LoginActivity extends BaseFragment implements NotificationCenter.No
if (currentType == 3) {
return;
}
+ if (hintDrawable != null) {
+ hintDrawable.setCurrentFrame(0);
+ }
AndroidUtilities.runOnUIThread(() -> {
if (codeField != null) {
for (int a = codeField.length - 1; a >= 0; a--) {
@@ -3205,6 +3209,9 @@ public class LoginActivity extends BaseFragment implements NotificationCenter.No
}
}
}
+ if (hintDrawable != null) {
+ hintDrawable.start();
+ }
}, 100);
}
@@ -4546,6 +4553,7 @@ public class LoginActivity extends BaseFragment implements NotificationCenter.No
}
}
+
@Override
public ArrayList getThemeDescriptions() {
for (int a = 0; a < views.length; a++) {
@@ -4565,6 +4573,18 @@ public class LoginActivity extends BaseFragment implements NotificationCenter.No
ArrayList arrayList = new ArrayList<>();
+ ThemeDescription.ThemeDescriptionDelegate descriptionDelegate = () -> {
+ for (int i = 0; i < views.length; i++) {
+ if (views[i] instanceof LoginActivitySmsView) {
+ LoginActivitySmsView smsView = (LoginActivitySmsView) views[i];
+ if (smsView.hintDrawable != null) {
+ smsView.hintDrawable.setLayerColor("Bubble.**", Theme.getColor(Theme.key_chats_actionBackground));
+ smsView.hintDrawable.setLayerColor("Phone.**", Theme.getColor(Theme.key_chats_actionBackground));
+ }
+ }
+ }
+ };
+
arrayList.add(new ThemeDescription(fragmentView, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_windowBackgroundWhite));
arrayList.add(new ThemeDescription(floatingButtonIcon, ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_chats_actionIcon));
@@ -4686,6 +4706,8 @@ public class LoginActivity extends BaseFragment implements NotificationCenter.No
arrayList.add(new ThemeDescription(smsView4.blackImageView, ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_windowBackgroundWhiteBlackText));
arrayList.add(new ThemeDescription(smsView4.blueImageView, ThemeDescription.FLAG_IMAGECOLOR, null, null, null, null, Theme.key_chats_actionBackground));
+ arrayList.add(new ThemeDescription(smsView4.blueImageView, 0, null, null, null, descriptionDelegate, Theme.key_chats_actionBackground));
+
return arrayList;
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ManageLinksActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ManageLinksActivity.java
index a2f2e4249..d84fbcdda 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ManageLinksActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ManageLinksActivity.java
@@ -1,9 +1,5 @@
package org.telegram.ui;
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
import android.content.Context;
import android.content.Intent;
import android.graphics.Canvas;
@@ -13,6 +9,7 @@ import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.RectF;
import android.graphics.drawable.Drawable;
+import android.os.Bundle;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.util.SparseIntArray;
@@ -21,7 +18,6 @@ import android.view.Gravity;
import android.view.HapticFeedbackConstants;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -38,6 +34,8 @@ import androidx.recyclerview.widget.RecyclerView;
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.ApplicationLoader;
import org.telegram.messenger.ChatObject;
+import org.telegram.messenger.ContactsController;
+import org.telegram.messenger.DocumentObject;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.ImageLocation;
import org.telegram.messenger.LocaleController;
@@ -45,8 +43,8 @@ import org.telegram.messenger.MediaDataController;
import org.telegram.messenger.MessagesController;
import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.R;
+import org.telegram.messenger.SvgHelper;
import org.telegram.messenger.UserConfig;
-import org.telegram.tgnet.RequestDelegate;
import org.telegram.tgnet.TLObject;
import org.telegram.tgnet.TLRPC;
import org.telegram.ui.ActionBar.ActionBar;
@@ -69,12 +67,13 @@ import org.telegram.ui.Components.FlickerLoadingView;
import org.telegram.ui.Components.InviteLinkBottomSheet;
import org.telegram.ui.Components.LayoutHelper;
import org.telegram.ui.Components.LinkActionView;
-import org.telegram.ui.Components.LoadingStickerDrawable;
import org.telegram.ui.Components.RecyclerListView;
import org.telegram.ui.Components.TimerParticles;
+import org.webrtc.RecyclerItemsEnterAnimator;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Locale;
public class ManageLinksActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate {
@@ -84,6 +83,8 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
private TLRPC.Chat currentChat;
private TLRPC.ChatFull info;
private TLRPC.TL_chatInviteExported invite;
+ private int adminId;
+
private boolean isChannel;
private int currentChatId;
@@ -104,6 +105,16 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
private int revokeAllDivider;
private int revokeAllRow;
private int createLinkHelpRow;
+ private int linksHeaderRow;
+
+ private int creatorRow;
+ private int creatorDividerRow;
+
+ private int adminsHeaderRow;
+ private int adminsDividerRow;
+ private int adminsStartRow;
+ private int adminsEndRow;
+
boolean linksLoading;
private int rowCount;
@@ -113,12 +124,20 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
boolean hasMore;
boolean deletingRevokedLinks;
+ boolean loadAdmins;
+ boolean adminsLoaded;
+ private int invitesCount;
+ private boolean isOpened;
+ private boolean transitionFinished;
+
+ private RecyclerItemsEnterAnimator recyclerItemsEnterAnimator;
private ArrayList invites = new ArrayList<>();
private ArrayList revokedInvites = new ArrayList<>();
private HashMap users = new HashMap<>();
private InviteLinkBottomSheet inviteLinkBottomSheet;
+ private ArrayList admins = new ArrayList<>();
long timeDif;
@@ -129,15 +148,34 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
}
+ Runnable updateTimerRunnable = new Runnable() {
+ @Override
+ public void run() {
+ if (listView == null) {
+ return;
+ }
+ for (int i = 0; i < listView.getChildCount(); i++) {
+ View child = listView.getChildAt(i);
+ if (child instanceof LinkCell) {
+ LinkCell linkCell = (LinkCell) child;
+ if (linkCell.timerRunning) {
+ linkCell.setLink(linkCell.invite, linkCell.position);
+ }
+ }
+
+ }
+ AndroidUtilities.runOnUIThread(this, 500);
+ }
+ };
+
private static class EmptyView extends LinearLayout implements NotificationCenter.NotificationCenterDelegate {
private BackupImageView stickerView;
- private LoadingStickerDrawable drawable;
- private int currentAccount = UserConfig.selectedAccount;
+ private final int currentAccount = UserConfig.selectedAccount;
- private static final String stickerSetName = "UtyaDuck";
+ private static final String stickerSetName = "tg_placeholders";
public EmptyView(Context context) {
super(context);
@@ -146,17 +184,6 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
setOrientation(LinearLayout.VERTICAL);
stickerView = new BackupImageView(context);
- drawable = new LoadingStickerDrawable(stickerView, "M476.1,397.4c25.8-47.2,0.3-105.9-50.9-120c-2.5-6.9-7.8-12.7-15-16.4l0.4-229.4c0-12.3-10-22.4-22.4-22.4" +
- "H128.5c-12.3,0-22.4,10-22.4,22.4l-0.4,229.8v0c0,6.7,2.9,12.6,7.6,16.7c-51.6,15.9-79.2,77.2-48.1,116.4" +
- "c-8.7,11.7-13.4,27.5-14,47.2c-1.7,34.5,21.6,45.8,55.9,45.8c52.3,0,99.1,4.6,105.1-36.2c16.5,0.9,7.1-37.3-6.5-53.3" +
- "c18.4-22.4,18.3-52.9,4.9-78.2c-0.7-5.3-3.8-9.8-8.1-12.6c-1.5-2-1.6-2-2.1-2.7c0.2-1,1.2-11.8-3.4-20.9h138.5" +
- "c-4.8,8.8-4.7,17-2.9,22.1c-5.3,4.8-6.8,12.3-5.2,17c-11.4,24.9-10,53.8,4.3,77.5c-6.8,9.7-11.2,21.7-12.6,31.6" +
- "c-0.2-0.2-0.4-0.3-0.6-0.5c0.8-3.3,0.4-6.4-1.3-7.8c9.3-12.1-4.5-29.2-17-21.7c-3.8-2.8-10.6-3.2-18.1-0.5" +
- "c-2.4-10.6-21.1-10.6-28.6-1c-1.3,0.3-2.9,0.8-4.5,1.9c-5.2-0.9-10.9,0.1-14.1,4.4c-6.9,3-9.5,10.4-7.8,17c-0.9,1.8-1.1,4-0.8,6.3" +
- "c-1.6,1.2-2.3,3.1-2,4.9c0.1,0.6,10.4,56.6,11.2,62c0.3,1.8,1.5,3.2,3.1,3.9c8.7,3.4,12,3.8,30.1,9.4c2.7,0.8,2.4,0.8,6.7-0.1" +
- "c16.4-3.5,30.2-8.9,30.8-9.2c1.6-0.6,2.7-2,3.1-3.7c0.1-0.4,6.8-36.5,10-53.2c0.9,4.2,3.3,7.3,7.4,7.5c1.2,7.8,4.4,14.5,9.5,19.9" +
- "c16.4,17.3,44.9,15.7,64.9,16.1c38.3,0.8,74.5,1.5,84.4-24.4C488.9,453.5,491.3,421.3,476.1,397.4z", AndroidUtilities.dp(104), AndroidUtilities.dp(104));
- stickerView.setImageDrawable(drawable);
addView(stickerView, LayoutHelper.createLinear(104, 104, Gravity.CENTER_HORIZONTAL | Gravity.TOP, 0, 2, 0, 0));
}
@@ -165,13 +192,13 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
if (set == null) {
set = MediaDataController.getInstance(currentAccount).getStickerSetByEmojiOrName(stickerSetName);
}
- if (set != null && set.documents.size() >= 34) {
- TLRPC.Document document = set.documents.get(33);
+ if (set != null && set.documents.size() >= 4) {
+ TLRPC.Document document = set.documents.get(3);
ImageLocation imageLocation = ImageLocation.getForDocument(document);
- stickerView.setImage(imageLocation, "104_104", "tgs", drawable, set);
+ SvgHelper.SvgDrawable svgThumb = DocumentObject.getSvgThumb(document, Theme.key_windowBackgroundGray, 1.0f);
+ stickerView.setImage(imageLocation, "104_104", "tgs", svgThumb, set);
} else {
MediaDataController.getInstance(currentAccount).loadStickersByEmojiOrName(stickerSetName, false, set == null);
- stickerView.setImageDrawable(drawable);
}
}
@@ -199,93 +226,52 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
}
}
- public ManageLinksActivity(int chatId) {
+ public ManageLinksActivity(int chatId, int adminId, int invitesCount) {
super();
-
currentChatId = chatId;
+ this.invitesCount = invitesCount;
currentChat = MessagesController.getInstance(currentAccount).getChat(chatId);
isChannel = ChatObject.isChannel(currentChat) && !currentChat.megagroup;
+ if (adminId == 0) {
+ this.adminId = getAccountInstance().getUserConfig().clientUserId;
+ } else {
+ this.adminId = adminId;
+ }
}
boolean loadRevoked = false;
private void loadLinks() {
- TLRPC.TL_messages_getExportedChatInvites req = new TLRPC.TL_messages_getExportedChatInvites();
- req.peer = getMessagesController().getInputPeer(-currentChatId);
- req.admin_id = getMessagesController().getInputUser(getUserConfig().getCurrentUser());
-
- boolean revoked = loadRevoked;
- if (loadRevoked) {
- req.revoked = true;
- if (!revokedInvites.isEmpty()) {
- req.flags |= 4;
- req.offset_link = revokedInvites.get(revokedInvites.size() - 1).link;
- }
- } else {
- if (!invites.isEmpty()) {
- req.flags |= 4;
- req.offset_link = invites.get(invites.size() - 1).link;
- }
- }
-
- linksLoading = true;
- TLRPC.TL_chatInviteExported inviteFinal = isPublic ? null : invite;
- getConnectionsManager().sendRequest(req, (response, error) -> {
-
- TLRPC.TL_chatInviteExported permanentLink = null;
- if (error == null) {
- TLRPC.TL_messages_exportedChatInvites invites = (TLRPC.TL_messages_exportedChatInvites) response;
- if (invites.invites.size() > 0 && inviteFinal != null) {
- for (int i = 0; i < invites.invites.size(); i++) {
- if (((TLRPC.TL_chatInviteExported) invites.invites.get(i)).link.equals(inviteFinal.link)) {
- permanentLink = (TLRPC.TL_chatInviteExported) invites.invites.remove(i);
- break;
- }
- }
- }
- }
-
- TLRPC.TL_chatInviteExported finalPermanentLink = permanentLink;
- AndroidUtilities.runOnUIThread(() -> {
- getNotificationCenter().doOnIdle(() -> {
- linksLoading = false;
- hasMore = false;
- if (finalPermanentLink != null) {
- invite = finalPermanentLink;
- if (info != null) {
- info.exported_invite = finalPermanentLink;
- }
- }
- if (error == null) {
- TLRPC.TL_messages_exportedChatInvites invites = (TLRPC.TL_messages_exportedChatInvites) response;
-
- if (revoked) {
- for (int i = 0; i < invites.invites.size(); i++) {
- TLRPC.TL_chatInviteExported in = (TLRPC.TL_chatInviteExported) invites.invites.get(i);
- fixDate(in);
- this.revokedInvites.add(in);
+ if (loadAdmins && !adminsLoaded) {
+ linksLoading = true;
+ TLRPC.TL_messages_getAdminsWithInvites req = new TLRPC.TL_messages_getAdminsWithInvites();
+ req.peer = getMessagesController().getInputPeer(-currentChatId);
+ int reqId = getConnectionsManager().sendRequest(req, (response, error) -> {
+ AndroidUtilities.runOnUIThread(() -> {
+ getNotificationCenter().doOnIdle(() -> {
+ linksLoading = false;
+ if (error == null) {
+ TLRPC.TL_messages_chatAdminsWithInvites adminsWithInvites = (TLRPC.TL_messages_chatAdminsWithInvites) response;
+ for (int i = 0; i < adminsWithInvites.admins.size(); i++) {
+ TLRPC.TL_chatAdminWithInvites admin = adminsWithInvites.admins.get(i);
+ if (admin.admin_id != getAccountInstance().getUserConfig().clientUserId) {
+ admins.add(admin);
+ }
}
- } else {
- for (int i = 0; i < invites.invites.size(); i++) {
- TLRPC.TL_chatInviteExported in = (TLRPC.TL_chatInviteExported) invites.invites.get(i);
- fixDate(in);
- this.invites.add(in);
+ for (int i = 0; i < adminsWithInvites.users.size(); i++) {
+ TLRPC.User user = adminsWithInvites.users.get(i);
+ users.put(user.id, user);
}
- }
- for (int i = 0; i < invites.users.size(); i++) {
- users.put(invites.users.get(i).id, invites.users.get(i));
}
int oldRowsCount = rowCount;
- if (invites.invites.size() == 0) {
- hasMore = false;
- } else if (revoked) {
- hasMore = this.revokedInvites.size() + 1 < invites.count;
- } else {
- hasMore = this.invites.size() + 1 < invites.count;
- }
- if (invites.invites.size() > 0 || loadRevoked) {
- showItemsAnimated(oldRowsCount - 1);
+ adminsLoaded = true;
+
+ hasMore = false;
+ if (admins.size() > 0) {
+ if (recyclerItemsEnterAnimator != null && !isPaused && isOpened) {
+ recyclerItemsEnterAnimator.showItemsAnimated(oldRowsCount + 1);
+ }
}
if (!hasMore && !loadRevoked) {
@@ -294,14 +280,148 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
loadLinks();
}
updateRows(true);
- if (info != null && !revoked) {
- info.invitesCount = invites.count;
- getMessagesStorage().saveChatLinksCount(currentChatId, info.invitesCount);
+ if (!hasMore || (invites.size() + revokedInvites.size() + admins.size()) >= 5) {
+ resumeDelayedFragmentAnimation();
}
- }
+ });
});
});
- });
+ getConnectionsManager().bindRequestToGuid(reqId, getClassGuid());
+ } else {
+ TLRPC.TL_messages_getExportedChatInvites req = new TLRPC.TL_messages_getExportedChatInvites();
+ req.peer = getMessagesController().getInputPeer(-currentChatId);
+ if (adminId == getUserConfig().getClientUserId()) {
+ req.admin_id = getMessagesController().getInputUser(getUserConfig().getCurrentUser());
+ } else {
+ req.admin_id = getMessagesController().getInputUser(adminId);
+ }
+
+ boolean revoked = loadRevoked;
+ if (loadRevoked) {
+ req.revoked = true;
+ if (!revokedInvites.isEmpty()) {
+ req.flags |= 4;
+ req.offset_link = revokedInvites.get(revokedInvites.size() - 1).link;
+ req.offset_date = revokedInvites.get(revokedInvites.size() - 1).date;
+ }
+ } else {
+ if (!invites.isEmpty()) {
+ req.flags |= 4;
+ req.offset_link = invites.get(invites.size() - 1).link;
+ req.offset_date = invites.get(revokedInvites.size() - 1).date;
+ }
+ }
+
+ linksLoading = true;
+ TLRPC.TL_chatInviteExported inviteFinal = isPublic ? null : invite;
+ int reqId = getConnectionsManager().sendRequest(req, (response, error) -> {
+
+ TLRPC.TL_chatInviteExported permanentLink = null;
+ if (error == null) {
+ TLRPC.TL_messages_exportedChatInvites invites = (TLRPC.TL_messages_exportedChatInvites) response;
+ if (invites.invites.size() > 0 && inviteFinal != null) {
+ for (int i = 0; i < invites.invites.size(); i++) {
+ if (((TLRPC.TL_chatInviteExported) invites.invites.get(i)).link.equals(inviteFinal.link)) {
+ permanentLink = (TLRPC.TL_chatInviteExported) invites.invites.remove(i);
+ break;
+ }
+ }
+ }
+ }
+
+ TLRPC.TL_chatInviteExported finalPermanentLink = permanentLink;
+ AndroidUtilities.runOnUIThread(() -> {
+ getNotificationCenter().doOnIdle(() -> {
+ linksLoading = false;
+ hasMore = false;
+ if (finalPermanentLink != null) {
+ invite = finalPermanentLink;
+ if (info != null) {
+ info.exported_invite = finalPermanentLink;
+ }
+ }
+ DiffCallback callback = saveListState();
+ boolean updateByDiffUtils = false;
+
+ if (error == null) {
+ TLRPC.TL_messages_exportedChatInvites invites = (TLRPC.TL_messages_exportedChatInvites) response;
+
+
+ if (revoked) {
+ for (int i = 0; i < invites.invites.size(); i++) {
+ TLRPC.TL_chatInviteExported in = (TLRPC.TL_chatInviteExported) invites.invites.get(i);
+ fixDate(in);
+ this.revokedInvites.add(in);
+ }
+ } else {
+ if (adminId != getAccountInstance().getUserConfig().clientUserId && this.invites.size() == 0 && invites.invites.size() > 0) {
+ invite = (TLRPC.TL_chatInviteExported) invites.invites.get(0);
+ invites.invites.remove(0);
+ }
+ for (int i = 0; i < invites.invites.size(); i++) {
+ TLRPC.TL_chatInviteExported in = (TLRPC.TL_chatInviteExported) invites.invites.get(i);
+ fixDate(in);
+ this.invites.add(in);
+ }
+ }
+
+ for (int i = 0; i < invites.users.size(); i++) {
+ users.put(invites.users.get(i).id, invites.users.get(i));
+ }
+ int oldRowsCount = rowCount;
+ if (invites.invites.size() == 0) {
+ hasMore = false;
+ } else if (revoked) {
+ hasMore = this.revokedInvites.size() + 1 < invites.count;
+ } else {
+ hasMore = this.invites.size() + 1 < invites.count;
+ }
+ if (invites.invites.size() > 0 && isOpened) {
+ if (recyclerItemsEnterAnimator != null && !isPaused) {
+ recyclerItemsEnterAnimator.showItemsAnimated(oldRowsCount + 1);
+ }
+ } else {
+ updateByDiffUtils = true;
+ }
+ if (info != null && !revoked) {
+ info.invitesCount = invites.count;
+ getMessagesStorage().saveChatLinksCount(currentChatId, info.invitesCount);
+ }
+ } else {
+ hasMore = false;
+ }
+
+ boolean loadNext = false;
+ if (!hasMore && !loadRevoked && adminId == getAccountInstance().getUserConfig().clientUserId) {
+ hasMore = true;
+ loadAdmins = true;
+ loadNext = true;
+ } else if (!hasMore && !loadRevoked) {
+ hasMore = true;
+ loadRevoked = true;
+ loadNext = true;
+ }
+
+ if (!hasMore || (invites.size() + revokedInvites.size() + admins.size()) >= 5) {
+ resumeDelayedFragmentAnimation();
+ }
+
+ if (loadNext) {
+ loadLinks();
+ }
+ if (updateByDiffUtils && isOpened && listViewAdapter != null && listView.getChildCount() > 0) {
+ updateRows(false);
+ callback.fillPositions(callback.newPositionToItem);
+ DiffUtil.calculateDiff(callback).dispatchUpdatesTo(listViewAdapter);
+ AndroidUtilities.updateVisibleRows(listView);
+ } else {
+ updateRows(true);
+ }
+ });
+ });
+ });
+ getConnectionsManager().bindRequestToGuid(reqId, getClassGuid());
+ }
}
private void updateRows(boolean notify) {
@@ -310,6 +430,8 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
return;
}
+ creatorRow = -1;
+ creatorDividerRow = -1;
linksStartRow = -1;
linksEndRow = -1;
linksLoadingRow = -1;
@@ -321,14 +443,35 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
revokeAllRow = -1;
revokeAllDivider = -1;
createLinkHelpRow = -1;
+ helpRow = -1;
+ createNewLinkRow = -1;
+ adminsEndRow = -1;
+ adminsStartRow = -1;
+ adminsDividerRow = -1;
+ adminsHeaderRow = -1;
+ linksHeaderRow = -1;
+ dividerRow = -1;
rowCount = 0;
- helpRow = rowCount++;
+ boolean otherAdmin = adminId != getAccountInstance().getUserConfig().clientUserId;
+ if (otherAdmin) {
+ creatorRow = rowCount++;
+ creatorDividerRow = rowCount++;
+ } else {
+ helpRow = rowCount++;
+ }
+
permanentLinkHeaderRow = rowCount++;
permanentLinkRow = rowCount++;
- dividerRow = rowCount++;
- createNewLinkRow = rowCount++;
+
+ if (!otherAdmin) {
+ dividerRow = rowCount++;
+ createNewLinkRow = rowCount++;
+ } else if (!invites.isEmpty() || (linksLoading && !loadRevoked)) {
+ dividerRow = rowCount++;
+ linksHeaderRow = rowCount++;
+ }
if (!invites.isEmpty()) {
linksStartRow = rowCount;
@@ -336,8 +479,28 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
linksEndRow = rowCount;
}
+ if (!otherAdmin && invites.isEmpty() && createNewLinkRow >= 0 && (!linksLoading || loadAdmins || loadRevoked)) {
+ createLinkHelpRow = rowCount++;
+ }
+
+ if (!otherAdmin && admins.size() > 0) {
+ if ((!invites.isEmpty() || createNewLinkRow >= 0) && createLinkHelpRow == -1) {
+ adminsDividerRow = rowCount++;
+ }
+ adminsHeaderRow = rowCount++;
+ adminsStartRow = rowCount;
+ rowCount += admins.size();
+ adminsEndRow = rowCount;
+ }
+
if (!revokedInvites.isEmpty()) {
- revokedDivider = rowCount++;
+ if (adminsStartRow >= 0) {
+ revokedDivider = rowCount++;
+ } else if ((!invites.isEmpty() || createNewLinkRow >= 0) && createLinkHelpRow == -1) {
+ revokedDivider = rowCount++;
+ } else if (otherAdmin && linksStartRow == -1) {
+ revokedDivider = rowCount++;
+ }
revokedHeader = rowCount++;
revokedLinksStartRow = rowCount;
rowCount += revokedInvites.size();
@@ -346,14 +509,10 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
revokeAllRow = rowCount++;
}
- if (linksLoading || hasMore) {
+ if (!loadAdmins && !loadRevoked && (linksLoading || hasMore)) {
linksLoadingRow = rowCount++;
}
- if (invites.isEmpty() && revokedInvites.isEmpty() && !linksLoading) {
- createLinkHelpRow = rowCount++;
- }
-
if (!invites.isEmpty() || !revokedInvites.isEmpty()) {
lastDivider = rowCount++;
}
@@ -377,13 +536,31 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
}
});
- fragmentView = new FrameLayout(context);
+ fragmentView = new FrameLayout(context) {
+ @Override
+ protected void onAttachedToWindow() {
+ super.onAttachedToWindow();
+ AndroidUtilities.runOnUIThread(updateTimerRunnable, 500);
+ }
+
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ AndroidUtilities.cancelRunOnUIThread(updateTimerRunnable);
+ }
+ };
fragmentView.setBackgroundColor(Theme.getColor(Theme.key_windowBackgroundGray));
fragmentView.setTag(Theme.key_windowBackgroundGray);
FrameLayout frameLayout = (FrameLayout) fragmentView;
- listView = new RecyclerListView(context);
+ listView = new RecyclerListView(context) {
+ @Override
+ protected void dispatchDraw(Canvas canvas) {
+ recyclerItemsEnterAnimator.dispatchDraw();
+ super.dispatchDraw(canvas);
+ }
+ };
LinearLayoutManager layoutManager = new LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false);
listView.setLayoutManager(layoutManager);
listView.setAdapter(listViewAdapter = new ListAdapter(context));
@@ -399,6 +576,7 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
}
}
});
+ recyclerItemsEnterAnimator = new RecyclerItemsEnterAnimator(listView);
DefaultItemAnimator defaultItemAnimator = new DefaultItemAnimator();
defaultItemAnimator.setDelayAnimations(false);
defaultItemAnimator.setSupportsChangeAnimations(false);
@@ -407,17 +585,26 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
frameLayout.addView(listView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT));
listView.setOnItemClickListener((view, position) -> {
- if (position == createNewLinkRow) {
+ if (position == creatorRow) {
+ TLRPC.User user = users.get(invite.admin_id);
+ if (user != null) {
+ Bundle bundle = new Bundle();
+ bundle.putInt("user_id", user.id);
+ MessagesController.getInstance(UserConfig.selectedAccount).putUser(user, false);
+ ProfileActivity profileActivity = new ProfileActivity(bundle);
+ presentFragment(profileActivity);
+ }
+ } else if (position == createNewLinkRow) {
LinkEditActivity linkEditActivity = new LinkEditActivity(LinkEditActivity.CREATE_TYPE, currentChatId);
linkEditActivity.setCallback(linkEditActivityCallback);
presentFragment(linkEditActivity);
} else if (position >= linksStartRow && position < linksEndRow) {
TLRPC.TL_chatInviteExported invite = invites.get(position - linksStartRow);
- inviteLinkBottomSheet = new InviteLinkBottomSheet(context, invite, info, users, this, currentChatId, false);
+ inviteLinkBottomSheet = new InviteLinkBottomSheet(context, invite, info, users, this, currentChatId, false, isChannel);
inviteLinkBottomSheet.show();
} else if (position >= revokedLinksStartRow && position < revokedLinksEndRow) {
TLRPC.TL_chatInviteExported invite = revokedInvites.get(position - revokedLinksStartRow);
- inviteLinkBottomSheet = new InviteLinkBottomSheet(context, invite, info, users, this, currentChatId, false);
+ inviteLinkBottomSheet = new InviteLinkBottomSheet(context, invite, info, users, this, currentChatId, false, isChannel);
inviteLinkBottomSheet.show();
} else if (position == revokeAllRow) {
if (deletingRevokedLinks) {
@@ -430,6 +617,11 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
builder.setPositiveButton(LocaleController.getString("Delete", R.string.Delete), (dialogInterface2, i2) -> {
TLRPC.TL_messages_deleteRevokedExportedChatInvites req = new TLRPC.TL_messages_deleteRevokedExportedChatInvites();
req.peer = getMessagesController().getInputPeer(-currentChatId);
+ if (adminId == getUserConfig().getClientUserId()) {
+ req.admin_id = getMessagesController().getInputUser(getUserConfig().getCurrentUser());
+ } else {
+ req.admin_id = getMessagesController().getInputUser(adminId);
+ }
deletingRevokedLinks = true;
getConnectionsManager().sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
deletingRevokedLinks = false;
@@ -444,6 +636,15 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
});
builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
showDialog(builder.create());
+ } else if (position >= adminsStartRow && position < adminsEndRow) {
+ int p = position - adminsStartRow;
+ TLRPC.TL_chatAdminWithInvites admin = admins.get(p);
+ if (users.containsKey(admin.admin_id)) {
+ getMessagesController().putUser(users.get(admin.admin_id), false);
+ }
+ ManageLinksActivity fragment = new ManageLinksActivity(currentChatId, admin.admin_id, admin.invites_count);
+ fragment.setInfo(info, null);
+ presentFragment(fragment);
}
});
listView.setOnItemLongClickListener((view, position) -> {
@@ -497,7 +698,7 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
messageTextView.setTextColor(Theme.getColor(Theme.key_chats_message));
messageTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
messageTextView.setGravity(Gravity.CENTER);
- messageTextView.setText(LocaleController.getString("PrimaryLinkHelp", R.string.PrimaryLinkHelp));
+ messageTextView.setText(isChannel ? LocaleController.getString("PrimaryLinkHelpChannel", R.string.PrimaryLinkHelpChannel) : LocaleController.getString("PrimaryLinkHelp", R.string.PrimaryLinkHelp));
addView(messageTextView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT, Gravity.TOP | Gravity.LEFT, 52, 143, 52, 18));
}
@@ -519,7 +720,9 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
@Override
public boolean isEnabled(RecyclerView.ViewHolder holder) {
int position = holder.getAdapterPosition();
- if (createNewLinkRow == position) {
+ if (creatorRow == position) {
+ return true;
+ } else if (createNewLinkRow == position) {
return true;
} else if (position >= linksStartRow && position < linksEndRow) {
return true;
@@ -527,6 +730,8 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
return true;
} else if (position == revokeAllRow) {
return true;
+ } else if (position >= adminsStartRow && position < adminsEndRow) {
+ return true;
}
return false;
}
@@ -550,7 +755,7 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
view.setBackgroundColor(Theme.getColor(Theme.key_windowBackgroundWhite));
break;
case 2:
- LinkActionView linkActionView = new LinkActionView(mContext, ManageLinksActivity.this, null, currentChatId, true);
+ LinkActionView linkActionView = new LinkActionView(mContext, ManageLinksActivity.this, null, currentChatId, true, isChannel);
linkActionView.setPermanent(true);
linkActionView.setDelegate(new LinkActionView.Delegate() {
@Override
@@ -560,7 +765,8 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
@Override
public void showUsersForPermanentLink() {
- inviteLinkBottomSheet = new InviteLinkBottomSheet(linkActionView.getContext(), invite, info, users, ManageLinksActivity.this, currentChatId, true);
+ boolean canEdit = adminId == getAccountInstance().getUserConfig().clientUserId;
+ inviteLinkBottomSheet = new InviteLinkBottomSheet(linkActionView.getContext(), invite, info, users, ManageLinksActivity.this, currentChatId, true, isChannel);
inviteLinkBottomSheet.show();
}
});
@@ -602,6 +808,11 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
cell.setBackground(Theme.getThemedDrawable(mContext, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow));
view = cell;
break;
+ case 10:
+ ManageChatUserCell userCell = new ManageChatUserCell(mContext, 8, 6, false);
+ userCell.setBackgroundColor(Theme.getColor(Theme.key_windowBackgroundWhite));
+ view = userCell;
+ break;
}
view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
return new RecyclerListView.Holder(view);
@@ -612,29 +823,41 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
switch (holder.getItemViewType()) {
case 2:
LinkActionView linkActionView = (LinkActionView) holder.itemView;
- if (isPublic) {
+ linkActionView.setCanEdit(adminId == getAccountInstance().getUserConfig().clientUserId);
+ if (isPublic && adminId == getAccountInstance().getUserConfig().clientUserId) {
if (info != null) {
linkActionView.setLink("https://t.me/" + currentChat.username);
linkActionView.setUsers(0, null);
- linkActionView.setPublic(true);
+ linkActionView.showRevokeOption(true);
}
} else {
- linkActionView.setPublic(false);
+ linkActionView.showRevokeOption(false);
if (invite != null) {
TLRPC.TL_chatInviteExported inviteExported = invite;
linkActionView.setLink(inviteExported.link);
linkActionView.loadUsers(inviteExported, currentChatId);
} else {
linkActionView.setLink(null);
+ linkActionView.loadUsers(null, currentChatId);
}
}
break;
case 1:
HeaderCell headerCell = (HeaderCell) holder.itemView;
if (position == permanentLinkHeaderRow) {
- headerCell.setText(LocaleController.getString("ChannelLinkTitle", R.string.ChannelLinkTitle));
- } else {
+ if (isPublic && adminId == getAccountInstance().getUserConfig().clientUserId) {
+ headerCell.setText(LocaleController.getString("PublicLink", R.string.PublicLink));
+ } else if (adminId == getAccountInstance().getUserConfig().clientUserId) {
+ headerCell.setText(LocaleController.getString("ChannelLinkTitle", R.string.ChannelLinkTitle));
+ } else {
+ headerCell.setText(LocaleController.getString("PermanentLinkForThisAdmin", R.string.PermanentLinkForThisAdmin));
+ }
+ } else if (position == revokedHeader) {
headerCell.setText(LocaleController.getString("RevokedLinks", R.string.RevokedLinks));
+ } else if (position == linksHeaderRow) {
+ headerCell.setText(LocaleController.getString("LinksCreatedByThisAdmin", R.string.LinksCreatedByThisAdmin));
+ } else if (position == adminsHeaderRow) {
+ headerCell.setText(LocaleController.getString("LinksCreatedByOtherAdmins", R.string.LinksCreatedByOtherAdmins));
}
break;
case 3:
@@ -645,18 +868,48 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
drawable2.setColorFilter(new PorterDuffColorFilter(Theme.getColor(Theme.key_checkboxCheck), PorterDuff.Mode.MULTIPLY));
CombinedDrawable combinedDrawable = new CombinedDrawable(drawable1, drawable2);
- textCell.setTextAndIcon(LocaleController.getString("CreateNewLink", R.string.CreateNewLink), combinedDrawable, false);
+ textCell.setTextAndIcon(LocaleController.getString("CreateNewLink", R.string.CreateNewLink), combinedDrawable, !invites.isEmpty());
break;
case 5:
TLRPC.TL_chatInviteExported invite;
+ boolean drawDivider = true;
if (position >= linksStartRow && position < linksEndRow) {
invite = invites.get(position - linksStartRow);
+ if (position == linksEndRow - 1) {
+ drawDivider = false;
+ }
} else {
invite = revokedInvites.get(position - revokedLinksStartRow);
+ if (position == revokedLinksEndRow - 1) {
+ drawDivider = false;
+ }
}
LinkCell cell = (LinkCell) holder.itemView;
cell.setLink(invite, position - linksStartRow);
+ cell.drawDivider = drawDivider;
break;
+ case 10:
+ ManageChatUserCell userCell = (ManageChatUserCell) holder.itemView;
+ TLRPC.User user;
+ int count;
+ drawDivider = true;
+ if (position == creatorRow) {
+ user = getMessagesController().getUser(adminId);
+ count = invitesCount;
+ drawDivider = false;
+ } else {
+ int p = position - adminsStartRow;
+ TLRPC.TL_chatAdminWithInvites admin = admins.get(p);
+ user = users.get(admin.admin_id);
+ count = admin.invites_count;
+ if (position == adminsEndRow - 1) {
+ drawDivider = false;
+ }
+ }
+
+ if (user != null) {
+ userCell.setData(user, ContactsController.formatName(user.first_name, user.last_name), LocaleController.formatPluralString("InviteLinkCount", count), drawDivider);
+ }
}
}
@@ -671,13 +924,13 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
public int getItemViewType(int position) {
if (position == helpRow) {
return 0;
- } else if (position == permanentLinkHeaderRow || position == revokedHeader) {
+ } else if (position == permanentLinkHeaderRow || position == revokedHeader || position == adminsHeaderRow || position == linksHeaderRow) {
return 1;
} else if (position == permanentLinkRow) {
return 2;
} else if (position == createNewLinkRow) {
return 3;
- } else if (position == dividerRow || position == revokedDivider || position == revokeAllDivider) {
+ } else if (position == dividerRow || position == revokedDivider || position == revokeAllDivider || position == creatorDividerRow || position == adminsDividerRow) {
return 4;
} else if ((position >= linksStartRow && position < linksEndRow) || (position >= revokedLinksStartRow && position < revokedLinksEndRow)) {
return 5;
@@ -689,48 +942,55 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
return 8;
} else if (position == createLinkHelpRow) {
return 9;
+ } else if (position == creatorRow || (position >= adminsStartRow && position < adminsEndRow)) {
+ return 10;
}
return 1;
}
}
private void revokePermanent() {
- TLRPC.TL_messages_exportChatInvite req = new TLRPC.TL_messages_exportChatInvite();
- req.peer = getMessagesController().getInputPeer(-currentChatId);
- //req.legacy_revoke_permanent = true; TODO layer 124
- TLRPC.TL_chatInviteExported oldInvite = invite;
- invite = null;
- info.exported_invite = null;
- listViewAdapter.notifyItemChanged(permanentLinkRow);
- final int reqId = getConnectionsManager().sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
- if (error == null) {
- invite = (TLRPC.TL_chatInviteExported) response;
- if (info != null) {
- info.exported_invite = invite;
+ if (adminId == getAccountInstance().getUserConfig().clientUserId) {
+ TLRPC.TL_messages_exportChatInvite req = new TLRPC.TL_messages_exportChatInvite();
+ req.peer = getMessagesController().getInputPeer(-currentChatId);
+ req.legacy_revoke_permanent = true;
+ TLRPC.TL_chatInviteExported oldInvite = invite;
+ invite = null;
+ info.exported_invite = null;
+ final int reqId = getConnectionsManager().sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
+ if (error == null) {
+ invite = (TLRPC.TL_chatInviteExported) response;
+ if (info != null) {
+ info.exported_invite = invite;
+ }
+
+ if (getParentActivity() == null) {
+ return;
+ }
+
+ oldInvite.revoked = true;
+ DiffCallback callback = saveListState();
+ revokedInvites.add(0, oldInvite);
+ updateRows(false);
+ callback.fillPositions(callback.newPositionToItem);
+ DiffUtil.calculateDiff(callback).dispatchUpdatesTo(listViewAdapter);
+ AndroidUtilities.updateVisibleRows(listView);
+ BulletinFactory.of(this).createSimpleBulletin(R.raw.linkbroken, LocaleController.getString("InviteRevokedHint", R.string.InviteRevokedHint)).show();
}
- if (getParentActivity() == null) {
- return;
- }
-
- listViewAdapter.notifyItemChanged(permanentLinkRow);
- oldInvite.revoked = true;
- DiffCallback callback = saveListState();
- revokedInvites.add(0, oldInvite);
- updateRows(false);
- callback.fillPositions(callback.newPositionToItem);
- DiffUtil.calculateDiff(callback).dispatchUpdatesTo(listViewAdapter);
- AndroidUtilities.updateVisibleRows(listView);
- }
-
- }));
- getConnectionsManager().bindRequestToGuid(reqId, classGuid);
+ }));
+ AndroidUtilities.updateVisibleRows(listView);
+ getConnectionsManager().bindRequestToGuid(reqId, classGuid);
+ } else {
+ revokeLink(invite);
+ }
}
public static class TextCell extends FrameLayout {
private SimpleTextView textView;
private ImageView imageView;
+ boolean divider;
public TextCell(Context context) {
super(context);
@@ -745,6 +1005,7 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
imageView = new ImageView(context);
imageView.setScaleType(ImageView.ScaleType.CENTER);
addView(imageView);
+ setWillNotDraw(false);
}
@Override
@@ -775,9 +1036,18 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
imageView.layout(viewLeft, 0, viewLeft + imageView.getMeasuredWidth(), imageView.getMeasuredHeight());
}
+ @Override
+ protected void onDraw(Canvas canvas) {
+ super.onDraw(canvas);
+ if (divider) {
+ canvas.drawLine(AndroidUtilities.dp(70), getMeasuredHeight() - 1, getMeasuredWidth(), getMeasuredHeight(), Theme.dividerPaint);
+ }
+ }
+
public void setTextAndIcon(String text, Drawable icon, boolean divider) {
textView.setText(text);
imageView.setImageDrawable(icon);
+ this.divider = divider;
}
}
@@ -805,6 +1075,7 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
float animateToStateProgress = 1f;
float lastDrawExpringProgress;
boolean animateHideExpiring;
+ boolean drawDivider;
public LinkCell(@NonNull Context context) {
@@ -856,9 +1127,11 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
icons.add(R.drawable.baseline_forward_24);
actions.add(1);
- items.add(LocaleController.getString("Edit", R.string.Edit));
- icons.add(R.drawable.baseline_edit_24);
- actions.add(2);
+ if (!invite.permanent) {
+ items.add(LocaleController.getString("Edit", R.string.Edit));
+ icons.add(R.drawable.baseline_edit_24);
+ actions.add(2);
+ }
items.add(LocaleController.getString("RevokeLink", R.string.RevokeLink));
icons.add(R.drawable.baseline_delete_24);
@@ -924,7 +1197,9 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
builder.setTitle(LocaleController.getString("InviteLink", R.string.InviteLink));
AlertDialog alert = builder.create();
builder.show();
+ //if (adminId == getAccountInstance().getUserConfig().getClientUserId()) {
alert.setItemColor(items.size() - 1, Theme.getColor(Theme.key_dialogTextRed2), Theme.getColor(Theme.key_dialogRedIcon));
+ // }
});
optionsView.setBackground(Theme.createSelectorDrawable(Theme.getColor(Theme.key_listSelector), 1));
addView(optionsView, LayoutHelper.createFrame(40, 48, Gravity.RIGHT | Gravity.CENTER_VERTICAL));
@@ -934,6 +1209,7 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
setWillNotDraw(false);
}
+ boolean timerRunning;
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
@@ -941,7 +1217,6 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
paint2.setStrokeWidth(AndroidUtilities.dp(2));
}
-
private TimerParticles timerParticles = new TimerParticles();
@Override
@@ -955,18 +1230,27 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
int drawState;
float progress = 0;
+ float timeProgress = 1f;
if (invite.expired || invite.revoked) {
drawState = invite.revoked ? LINK_STATE_GRAY : LINK_STATE_RED;
- } else if (invite.expire_date > 0) {
- long currentTime = System.currentTimeMillis() + timeDif * 1000L;
- long expireTime = invite.expire_date * 1000L;
- long date = (invite.start_date <= 0 ? invite.date : invite.start_date) * 1000L;
- long from = currentTime - date;
- long to = expireTime - date;
- progress = (1f - from / (float) to);
+ } else if (invite.expire_date > 0 || invite.usage_limit > 0) {
+ float usageProgress = 1f;
+ if (invite.expire_date > 0) {
+ long currentTime = System.currentTimeMillis() + timeDif * 1000L;
+ long expireTime = invite.expire_date * 1000L;
+ long date = (invite.start_date <= 0 ? invite.date : invite.start_date) * 1000L;
+ long from = currentTime - date;
+ long to = expireTime - date;
+ timeProgress = (1f - from / (float) to);
+ }
+ if (invite.usage_limit > 0) {
+ usageProgress = (invite.usage_limit - invite.usage) / (float) invite.usage_limit;
+ }
+ progress = Math.min(timeProgress, usageProgress);
if (progress <= 0) {
invite.expired = true;
drawState = LINK_STATE_RED;
+ AndroidUtilities.updateVisibleRows(listView);
} else {
drawState = LINK_STATE_GREEN;
}
@@ -1006,7 +1290,7 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
canvas.drawCircle(cX, cY, AndroidUtilities.dp(32) / 2f, paint);
if (animateHideExpiring || (!invite.expired && invite.expire_date > 0 && !invite.revoked)) {
if (animateHideExpiring) {
- progress = lastDrawExpringProgress;
+ timeProgress = lastDrawExpringProgress;
}
paint2.setColor(color);
@@ -1017,17 +1301,17 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
float a = (animateHideExpiring ? (1f - animateToStateProgress) : animateToStateProgress);
float s = (float) (0.7 + 0.3f * a);
canvas.scale(s, s, rectF.centerX(), rectF.centerY());
- canvas.drawArc(rectF, -90, -progress * 360, false, paint2);
- timerParticles.draw(canvas, paint2, rectF, -progress * 360 , a);
+ canvas.drawArc(rectF, -90, -timeProgress * 360, false, paint2);
+ timerParticles.draw(canvas, paint2, rectF, -timeProgress * 360, a);
canvas.restore();
} else {
- canvas.drawArc(rectF, -90, -progress * 360, false, paint2);
- timerParticles.draw(canvas, paint2, rectF, -progress * 360, 1f);
+ canvas.drawArc(rectF, -90, -timeProgress * 360, false, paint2);
+ timerParticles.draw(canvas, paint2, rectF, -timeProgress * 360, 1f);
}
if (!isPaused) {
invalidate();
}
- lastDrawExpringProgress = progress;
+ lastDrawExpringProgress = timeProgress;
}
if (invite.revoked) {
@@ -1038,6 +1322,9 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
linkIcon.draw(canvas);
}
+ if (drawDivider) {
+ canvas.drawLine(AndroidUtilities.dp(70), getMeasuredHeight() - 1, getMeasuredWidth(), getMeasuredHeight(), Theme.dividerPaint);
+ }
}
private boolean hasProgress(int state) {
@@ -1052,19 +1339,20 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
float p = (progress - 0.5f) / 0.5f;
return ColorUtils.blendARGB(Theme.getColor(Theme.key_chat_attachLocationBackground), Theme.getColor(Theme.key_chat_attachPollBackground), (1f - p));
} else {
- float p = progress /0.5f;
- return ColorUtils.blendARGB(Theme.getColor(Theme.key_chat_attachPollBackground),Theme.getColor(Theme.key_chat_attachAudioBackground), (1f - p));
+ float p = progress / 0.5f;
+ return ColorUtils.blendARGB(Theme.getColor(Theme.key_chat_attachPollBackground), Theme.getColor(Theme.key_chat_attachAudioBackground), (1f - p));
}
} else if (state == LINK_STATE_YELLOW) {
return Theme.getColor(Theme.key_chat_attachPollBackground);
} else if (state == LINK_STATE_GRAY) {
- return Theme.getColor(Theme.key_windowBackgroundWhiteGrayIcon);
+ return Theme.getColor(Theme.key_chats_unreadCounterMuted);
} else {
return Theme.getColor(Theme.key_featuredStickers_addButton);
}
}
public void setLink(TLRPC.TL_chatInviteExported invite, int position) {
+ timerRunning = false;
if (this.invite == null || invite == null || !this.invite.link.equals(invite.link)) {
lastDrawingState = -1;
animateToStateProgress = 1f;
@@ -1072,14 +1360,40 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
this.invite = invite;
this.position = position;
- if (invite.link.startsWith("https://")) {
+ if (invite == null) {
+ return;
+ }
+
+ if (invite.link.startsWith("https://t.me/+")) {
+ titleView.setText(invite.link.substring("https://t.me/+".length()));
+ } else if (invite.link.startsWith("https://t.me/joinchat/")) {
+ titleView.setText(invite.link.substring("https://t.me/joinchat/".length()));
+ } else if (invite.link.startsWith("https://")) {
titleView.setText(invite.link.substring("https://".length()));
} else {
titleView.setText(invite.link);
}
- String joinedString = invite.usage == 0 ? LocaleController.getString("NoOneJoinedYet", R.string.NoOneJoinedYet) : LocaleController.formatPluralString("PeopleJoined", invite.usage);
- if (invite.expired || invite.revoked) {
+ String joinedString;
+ if (invite.usage == 0 && invite.usage_limit == 0) {
+ joinedString = LocaleController.getString("NoOneJoinedYet", R.string.NoOneJoinedYet);
+ } else {
+ if (invite.usage_limit > 0 && invite.usage == 0 && !invite.expired && !invite.revoked) {
+ joinedString = LocaleController.formatPluralString("CanJoin", invite.usage_limit);
+ } else if (invite.usage_limit > 0 && invite.expired && invite.revoked) {
+ joinedString = LocaleController.formatPluralString("PeopleJoined", invite.usage) + ", " + LocaleController.formatPluralString("PeopleJoinedRemaining", (invite.usage_limit - invite.usage));
+ } else {
+ joinedString = LocaleController.formatPluralString("PeopleJoined", invite.usage);
+ }
+ }
+ if (invite.permanent && !invite.revoked) {
+ SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(joinedString);
+ DotDividerSpan dotDividerSpan = new DotDividerSpan();
+ dotDividerSpan.setTopPadding(AndroidUtilities.dp(1.5f));
+ spannableStringBuilder.append(" . ").setSpan(dotDividerSpan, spannableStringBuilder.length() - 3, spannableStringBuilder.length() - 2, 0);
+ spannableStringBuilder.append(LocaleController.getString("Permanent", R.string.Permanent));
+ subtitleView.setText(spannableStringBuilder);
+ } else if (invite.expired || invite.revoked) {
if (invite.revoked && invite.usage == 0) {
joinedString = LocaleController.getString("NoOneJoined", R.string.NoOneJoined);
}
@@ -1093,10 +1407,40 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
spannableStringBuilder.append(invite.revoked ? LocaleController.getString("Revoked", R.string.Revoked) : LocaleController.getString("Expired", R.string.Expired));
}
subtitleView.setText(spannableStringBuilder);
+ } else if (invite.expire_date > 0) {
+ SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(joinedString);
+ DotDividerSpan dotDividerSpan = new DotDividerSpan();
+ dotDividerSpan.setTopPadding(AndroidUtilities.dp(1.5f));
+ spannableStringBuilder.append(" . ").setSpan(dotDividerSpan, spannableStringBuilder.length() - 3, spannableStringBuilder.length() - 2, 0);
+
+
+ long currentTime = System.currentTimeMillis() + timeDif * 1000L;
+ long expireTime = invite.expire_date * 1000L;
+
+ long timeLeft = expireTime - currentTime;
+ if (timeLeft < 0) {
+ timeLeft = 0;
+ }
+ if (timeLeft > 86400000L) {
+ spannableStringBuilder.append(LocaleController.formatPluralString("DaysLeft", (int) (timeLeft / 86400000L)));
+ } else {
+ int s = (int) ((timeLeft / 1000) % 60);
+ int m = (int) ((timeLeft / 1000 / 60) % 60);
+ int h = (int) ((timeLeft / 1000 / 60 / 60));
+ spannableStringBuilder.append(String.format(Locale.ENGLISH, "%02d", h)).append(String.format(Locale.ENGLISH, ":%02d", m)).append(String.format(Locale.ENGLISH, ":%02d", s));
+ timerRunning = true;
+ }
+ subtitleView.setText(spannableStringBuilder);
} else {
subtitleView.setText(joinedString);
}
+// if (adminId != getAccountInstance().getUserConfig().getClientUserId() && invite.revoked) {
+// optionsView.setVisibility(View.GONE);
+// } else {
+// optionsView.setVisibility(View.VISIBLE);
+// }
+
// if (invite.revoked) {
// optionsView.setVisibility(View.GONE);
// } else {
@@ -1109,17 +1453,11 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
TLRPC.TL_messages_deleteExportedChatInvite req = new TLRPC.TL_messages_deleteExportedChatInvite();
req.link = invite.link;
req.peer = getMessagesController().getInputPeer(-currentChatId);
- TLRPC.TL_chatInviteExported inviteFinal = invite;
- getConnectionsManager().sendRequest(req, new RequestDelegate() {
- @Override
- public void run(TLObject response, TLRPC.TL_error error) {
- AndroidUtilities.runOnUIThread(() -> {
- if (error == null) {
- linkEditActivityCallback.onLinkRemoved(inviteFinal);
- }
- });
+ getConnectionsManager().sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
+ if (error == null) {
+ linkEditActivityCallback.onLinkRemoved(invite);
}
- });
+ }));
}
public void editLink(TLRPC.TL_chatInviteExported invite) {
@@ -1134,81 +1472,45 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
req.link = invite.link;
req.revoked = true;
req.peer = getMessagesController().getInputPeer(-currentChatId);
- TLRPC.TL_chatInviteExported inviteFinal = invite;
getConnectionsManager().sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
if (error == null) {
- linkEditActivityCallback.onLinkEdited(inviteFinal, response);
- if (info != null) {
- info.invitesCount--;
- if (info.invitesCount < 0) {
- info.invitesCount = 0;
+ if (response instanceof TLRPC.TL_messages_exportedChatInviteReplaced) {
+ TLRPC.TL_messages_exportedChatInviteReplaced replaced = (TLRPC.TL_messages_exportedChatInviteReplaced) response;
+ if (!isPublic) {
+ ManageLinksActivity.this.invite = (TLRPC.TL_chatInviteExported) replaced.new_invite;
+ }
+
+ invite.revoked = true;
+ DiffCallback callback = saveListState();
+ if (isPublic) {
+ invites.remove(invite);
+ invites.add(0, (TLRPC.TL_chatInviteExported) replaced.new_invite);
+ }
+ revokedInvites.add(0, invite);
+ updateRows(false);
+
+ if (getParentActivity() == null) {
+ listViewAdapter.notifyDataSetChanged();
+ return;
+ }
+ callback.fillPositions(callback.newPositionToItem);
+ DiffUtil.calculateDiff(callback).dispatchUpdatesTo(listViewAdapter);
+ AndroidUtilities.updateVisibleRows(listView);
+ } else {
+ linkEditActivityCallback.onLinkEdited(invite, response);
+ if (info != null) {
+ info.invitesCount--;
+ if (info.invitesCount < 0) {
+ info.invitesCount = 0;
+ }
+ getMessagesStorage().saveChatLinksCount(currentChatId, info.invitesCount);
}
- getMessagesStorage().saveChatLinksCount(currentChatId, info.invitesCount);
}
+ BulletinFactory.of(this).createSimpleBulletin(R.raw.linkbroken, LocaleController.getString("InviteRevokedHint", R.string.InviteRevokedHint)).show();
}
}));
}
- private void showItemsAnimated(int from) {
- if (isPaused || listView == null) {
- return;
- }
- View progressView = null;
- for (int i = 0; i < listView.getChildCount(); i++) {
- View child = listView.getChildAt(i);
- if (listView.getChildAdapterPosition(child) >= 0 && child instanceof FlickerLoadingView) {
- progressView = child;
- }
- }
- final View finalProgressView = progressView;
- if (finalProgressView != null) {
- listView.removeView(finalProgressView);
- }
-
- listView.invalidate();
- if (finalProgressView != null && finalProgressView.getParent() == null) {
- RecyclerView.LayoutManager layoutManager = listView.getLayoutManager();
- listView.addView(finalProgressView);
- if (layoutManager != null) {
- layoutManager.ignoreView(finalProgressView);
- Animator animator = ObjectAnimator.ofFloat(finalProgressView, View.ALPHA, finalProgressView.getAlpha(), 0);
- animator.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animation) {
- finalProgressView.setAlpha(1f);
- layoutManager.stopIgnoringView(finalProgressView);
- listView.removeView(finalProgressView);
- }
- });
- animator.start();
- }
- }
- listView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
- @Override
- public boolean onPreDraw() {
- listView.getViewTreeObserver().removeOnPreDrawListener(this);
- int n = listView.getChildCount();
- AnimatorSet animatorSet = new AnimatorSet();
- for (int i = 0; i < n; i++) {
- View child = listView.getChildAt(i);
- if (child == finalProgressView || listView.getChildAdapterPosition(child) < from) {
- continue;
- }
- child.setAlpha(0);
- int s = Math.min(listView.getMeasuredHeight(), Math.max(0, child.getTop()));
- int delay = (int) ((s / (float) listView.getMeasuredHeight()) * 100);
- ObjectAnimator a = ObjectAnimator.ofFloat(child, View.ALPHA, 0, 1f);
- a.setStartDelay(delay);
- a.setDuration(200);
- animatorSet.playTogether(a);
- }
-
- animatorSet.start();
- return false;
- }
- });
- }
-
private final LinkEditActivity.Callback linkEditActivityCallback = new LinkEditActivity.Callback() {
@Override
public void onLinkCreated(TLObject response) {
@@ -1282,6 +1584,8 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
int oldLinksEndRow;
int oldRevokedLinksStartRow;
int oldRevokedLinksEndRow;
+ int oldAdminsStartRow;
+ int oldAdminsEndRow;
SparseIntArray oldPositionToItem = new SparseIntArray();
SparseIntArray newPositionToItem = new SparseIntArray();
@@ -1318,6 +1622,9 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
return oldItem.link.equals(newItem.link);
}
}
+ if (oldItemPosition >= oldAdminsStartRow && oldItemPosition < oldAdminsEndRow && newItemPosition >= adminsStartRow && newItemPosition < adminsEndRow) {
+ return (oldItemPosition - oldAdminsStartRow) == (newItemPosition - adminsStartRow);
+ }
int oldItem = oldPositionToItem.get(oldItemPosition, -1);
int newItem = newPositionToItem.get(newItemPosition, -1);
return oldItem >= 0 && oldItem == newItem;
@@ -1343,6 +1650,12 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
put(++pointer, revokeAllDivider, sparseIntArray);
put(++pointer, revokeAllRow, sparseIntArray);
put(++pointer, createLinkHelpRow, sparseIntArray);
+ put(++pointer, creatorRow, sparseIntArray);
+ put(++pointer, creatorDividerRow, sparseIntArray);
+ put(++pointer, adminsHeaderRow, sparseIntArray);
+ put(++pointer, adminsDividerRow, sparseIntArray);
+ put(++pointer, linksHeaderRow, sparseIntArray);
+ put(++pointer, linksLoadingRow, sparseIntArray);
}
private void put(int id, int position, SparseIntArray sparseIntArray) {
@@ -1359,6 +1672,8 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
callback.oldLinksEndRow = linksEndRow;
callback.oldRevokedLinksStartRow = revokedLinksStartRow;
callback.oldRevokedLinksEndRow = revokedLinksEndRow;
+ callback.oldAdminsStartRow = adminsStartRow;
+ callback.oldAdminsEndRow = adminsEndRow;
callback.oldRowCount = rowCount;
callback.oldLinks.clear();
callback.oldLinks.addAll(invites);
@@ -1431,7 +1746,7 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
themeDescriptions.add(new ThemeDescription(listView, 0, new Class[]{HintInnerCell.class}, new String[]{"messageTextView"}, null, null, null, Theme.key_chats_message));
themeDescriptions.add(new ThemeDescription(listView, ThemeDescription.FLAG_CHECKTAG, new Class[]{ManageChatTextCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteBlackText));
- themeDescriptions.add(new ThemeDescription(listView, ThemeDescription.FLAG_CHECKTAG, new Class[]{ManageChatTextCell.class}, new String[]{"imageView"}, null, null, null, Theme.key_windowBackgroundWhiteGrayIcon));
+ themeDescriptions.add(new ThemeDescription(listView, ThemeDescription.FLAG_CHECKTAG, new Class[]{ManageChatTextCell.class}, new String[]{"imageView"}, null, null, null, Theme.key_chats_unreadCounterMuted));
themeDescriptions.add(new ThemeDescription(listView, ThemeDescription.FLAG_CHECKTAG, new Class[]{ManageChatTextCell.class}, new String[]{"imageView"}, null, null, null, Theme.key_windowBackgroundWhiteBlueButton));
themeDescriptions.add(new ThemeDescription(listView, ThemeDescription.FLAG_CHECKTAG, new Class[]{ManageChatTextCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteBlueIcon));
@@ -1445,4 +1760,17 @@ public class ManageLinksActivity extends BaseFragment implements NotificationCen
themeDescriptions.add(new ThemeDescription(listView, ThemeDescription.FLAG_IMAGECOLOR, new Class[]{LinkCell.class}, new String[]{"optionsView"}, null, null, null, Theme.key_dialogTextGray3));
return themeDescriptions;
}
+
+ @Override
+ public boolean needDelayOpenAnimation() {
+ return true;
+ }
+
+ @Override
+ protected void onTransitionAnimationEnd(boolean isOpen, boolean backward) {
+ super.onTransitionAnimationEnd(isOpen, backward);
+ if (isOpen) {
+ isOpened = true;
+ }
+ }
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java
index db558e137..4b7ec49db 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java
@@ -1888,7 +1888,7 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No
((SharedAudioCell) view).setChecked(true, true);
}
if (!actionBar.isActionModeShowed()) {
- actionBar.showActionMode(null, actionModeBackground, null, null, null, 0);
+ actionBar.showActionMode(true, null, actionModeBackground, null, null, null, 0);
resetScroll();
}
return true;
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PasscodeActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/PasscodeActivity.java
index 7ae910b1f..7cb7a8780 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/PasscodeActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/PasscodeActivity.java
@@ -8,7 +8,9 @@
package org.telegram.ui;
+import android.app.Activity;
import android.content.Context;
+import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
@@ -19,6 +21,7 @@ import android.os.Build;
import android.text.Editable;
import android.text.InputFilter;
import android.text.InputType;
+import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.DigitsKeyListener;
@@ -607,6 +610,7 @@ public class PasscodeActivity extends BaseFragment implements NotificationCenter
private class ListAdapter extends RecyclerListView.SelectionAdapter {
private Context mContext;
+ private Boolean hasWidgets;
public ListAdapter(Context context) {
mContext = context;
@@ -688,7 +692,15 @@ public class PasscodeActivity extends BaseFragment implements NotificationCenter
case 2: {
TextInfoPrivacyCell cell = (TextInfoPrivacyCell) holder.itemView;
if (position == passcodeDetailRow) {
- cell.setText(LocaleController.getString("ChangePasscodeInfo", R.string.ChangePasscodeInfo));
+ SpannableStringBuilder stringBuilder = new SpannableStringBuilder(LocaleController.getString("ChangePasscodeInfo", R.string.ChangePasscodeInfo));
+ if (hasWidgets == null) {
+ SharedPreferences preferences = mContext.getSharedPreferences("shortcut_widget", Activity.MODE_PRIVATE);
+ hasWidgets = !preferences.getAll().isEmpty();
+ }
+ if (hasWidgets) {
+ stringBuilder.append(AndroidUtilities.replaceTags(LocaleController.getString("WidgetPasscodeEnable", R.string.WidgetPasscodeEnable)));
+ }
+ cell.setText(stringBuilder);
if (autoLockDetailRow != -1) {
cell.setBackgroundDrawable(Theme.getThemedDrawable(mContext, R.drawable.greydivider, Theme.key_windowBackgroundGrayShadow));
} else {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
index 9154120a0..8e37f16be 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
@@ -203,6 +203,7 @@ import org.telegram.ui.Components.PhotoPaintView;
import org.telegram.ui.Components.PhotoViewerCaptionEnterView;
import org.telegram.ui.Components.PickerBottomLayoutViewer;
import org.telegram.ui.Components.PipVideoView;
+import org.telegram.ui.Components.PlayPauseDrawable;
import org.telegram.ui.Components.RLottieDrawable;
import org.telegram.ui.Components.RadialProgressView;
import org.telegram.ui.Components.RecyclerListView;
@@ -1323,6 +1324,9 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
private float scale = 1.0f;
private boolean visible;
+ private final CombinedDrawable playDrawable;
+ private final PlayPauseDrawable playPauseDrawable;
+
public PhotoProgressView(View parentView) {
if (decelerateInterpolator == null) {
decelerateInterpolator = new DecelerateInterpolator(1.5f);
@@ -1334,6 +1338,12 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
}
parent = parentView;
resetAlphas();
+
+ playPauseDrawable = new PlayPauseDrawable(28);
+ playPauseDrawable.setDuration(200);
+
+ final Drawable circleDrawable = ContextCompat.getDrawable(parentActivity, R.drawable.circle_big);
+ playDrawable = new CombinedDrawable(circleDrawable.mutate(), playPauseDrawable);
}
private void updateAnimation(boolean withProgressAnimation) {
@@ -1404,6 +1414,16 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
if (backgroundState == state) {
return;
}
+ if (playPauseDrawable != null) {
+ boolean animateIcon = backgroundState == 3 || backgroundState == 4;
+ if (state == 3) {
+ playPauseDrawable.setPause(false, animateIcon);
+ } else if (state == 4) {
+ playPauseDrawable.setPause(true, animateIcon);
+ }
+ playPauseDrawable.setParent(parent);
+ playPauseDrawable.invalidateSelf();
+ }
lastUpdateTime = System.currentTimeMillis();
if (animated && backgroundState != state) {
previousBackgroundState = backgroundState;
@@ -1497,8 +1517,13 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
final float alpha = calculateAlpha();
- if (previousBackgroundState >= 0 && previousBackgroundState < progressDrawables.length) {
- Drawable drawable = progressDrawables[previousBackgroundState];
+ if (previousBackgroundState >= 0 && previousBackgroundState < progressDrawables.length + 2) {
+ Drawable drawable;
+ if (previousBackgroundState < progressDrawables.length) {
+ drawable = progressDrawables[previousBackgroundState];
+ } else {
+ drawable = playDrawable;
+ }
if (drawable != null) {
drawable.setAlpha((int) (255 * animatedAlphaValue * alpha));
drawable.setBounds(x, y, x + sizeScaled, y + sizeScaled);
@@ -1506,8 +1531,13 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
}
}
- if (backgroundState >= 0 && backgroundState < progressDrawables.length) {
- Drawable drawable = progressDrawables[backgroundState];
+ if (backgroundState >= 0 && backgroundState < progressDrawables.length + 2) {
+ Drawable drawable;
+ if (backgroundState < progressDrawables.length) {
+ drawable = progressDrawables[backgroundState];
+ } else {
+ drawable = playDrawable;
+ }
if (drawable != null) {
if (previousBackgroundState != -2) {
drawable.setAlpha((int) (255 * (1.0f - animatedAlphaValue) * alpha));
@@ -1865,7 +1895,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
}
@Override
- protected void onTransitionStart(boolean keyboardVisible) {
+ protected void onTransitionStart(boolean keyboardVisible, int contentHeight) {
windowView.setClipChildren(false);
if (captionEditText.getTag() != null && keyboardVisible) {
if (isCurrentVideo) {
@@ -1885,6 +1915,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
if (lastTitle != null) {
if (!isCurrentVideo) {
actionBar.setTitleAnimated(lastTitle, false, 220);
+ lastTitle = null;
}
}
}
@@ -1912,7 +1943,6 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
setClipChildren(false);
setClipToPadding(false);
paint.setColor(0x33000000);
-
}
@Override
@@ -2147,7 +2177,13 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
@Override
protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
if (child == mentionListView || child == captionEditText) {
- if (currentEditMode != 0 || !captionEditText.isPopupShowing() && captionEditText.getEmojiPadding() == 0 && (AndroidUtilities.usingHardwareInput && captionEditText.getTag() == null || getKeyboardHeight() == 0)) {
+ if (currentEditMode != 0 && currentPanTranslationY == 0) {
+ return false;
+ } else if (AndroidUtilities.isInMultiwindow || AndroidUtilities.usingHardwareInput) {
+ if (!captionEditText.isPopupShowing() && captionEditText.getEmojiPadding() == 0 && captionEditText.getTag() == null) {
+ return false;
+ }
+ } else if (!captionEditText.isPopupShowing() && captionEditText.getEmojiPadding() == 0 && getKeyboardHeight() == 0) {
if (currentPanTranslationY == 0) {
return false;
}
@@ -2165,7 +2201,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
bottomTouchEnabled = false;
} else {
int paddingBottom = getKeyboardHeight() <= AndroidUtilities.dp(20) && !AndroidUtilities.isInMultiwindow ? captionEditText.getEmojiPadding() : 0;
- if (captionEditText.isPopupShowing() || AndroidUtilities.usingHardwareInput && captionEditText.getTag() != null || getKeyboardHeight() > AndroidUtilities.dp(80) || paddingBottom != 0) {
+ if (captionEditText.isPopupShowing() || (AndroidUtilities.isInMultiwindow || AndroidUtilities.usingHardwareInput) && captionEditText.getTag() != null || getKeyboardHeight() > AndroidUtilities.dp(80) || paddingBottom != 0) {
bottomTouchEnabled = false;
return false;
} else {
@@ -3153,6 +3189,57 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
preparePlayer(Uri.fromFile(new File(finalPath)), false, true, editState.savedFilterState);
}
}
+ } else if (id == NotificationCenter.messagesDeleted) {
+ boolean scheduled = (Boolean) args[2];
+ if (scheduled) {
+ return;
+ }
+ int channelId = (Integer) args[1];
+ ArrayList markAsDeletedMessages = (ArrayList) args[0];
+ boolean reset = false;
+ for (int x = 0; x < 2; x++) {
+ ArrayList arr = x == 0 ? imagesArr : imagesArrTemp;
+ SparseArray[] ids = x == 0 ? imagesByIds : imagesByIdsTemp;
+ if (!arr.isEmpty()) {
+ for (int b = 0; b < 2; b++) {
+ if (ids[b].size() > 0) {
+ MessageObject messageObject = ids[b].valueAt(0);
+ if (messageObject.messageOwner.peer_id.channel_id == channelId) {
+ for (int a = 0, N = markAsDeletedMessages.size(); a < N; a++) {
+ int mid = markAsDeletedMessages.get(a);
+ MessageObject message = ids[b].get(markAsDeletedMessages.get(a));
+ if (message != null) {
+ ids[b].remove(mid);
+ arr.remove(message);
+ if (b == 0) {
+ totalImagesCount--;
+ } else {
+ totalImagesCountMerge--;
+ }
+ reset = true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ if (reset) {
+ if (this == PipInstance) {
+ destroyPhotoViewer();
+ } else {
+ if (!imagesArr.isEmpty()) {
+ int index = currentIndex;
+ currentIndex = -1;
+ if (index >= imagesArr.size()) {
+ index = imagesArr.size() - 1;
+ }
+ setImageIndex(index);
+ } else {
+ closePhoto(false, false);
+ }
+ }
+ }
}
}
@@ -3263,14 +3350,10 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
if (progressDrawables == null) {
final Drawable circleDrawable = ContextCompat.getDrawable(parentActivity, R.drawable.circle_big);
- final CombinedDrawable playDrawable = new CombinedDrawable(circleDrawable.mutate(), ContextCompat.getDrawable(parentActivity, R.drawable.video_play1));
- final CombinedDrawable pauseDrawable = new CombinedDrawable(circleDrawable.mutate(), ContextCompat.getDrawable(parentActivity, R.drawable.video_pause1));
progressDrawables = new Drawable[]{
circleDrawable, // PROGRESS_EMPTY
ContextCompat.getDrawable(parentActivity, R.drawable.cancel_big), // PROGRESS_CANCEL
ContextCompat.getDrawable(parentActivity, R.drawable.load_big), // PROGRESS_LOAD
- playDrawable, // PROGRESS_PLAY
- pauseDrawable // PROGRESS_PAUSE
};
}
@@ -3457,6 +3540,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
containerView = new FrameLayoutDrawer(activity);
containerView.setFocusable(false);
+
windowView.addView(containerView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, Gravity.TOP | Gravity.LEFT));
if (Build.VERSION.SDK_INT >= 21) {
containerView.setFitsSystemWindows(true);
@@ -5429,7 +5513,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
@Override
public void onTextChanged(CharSequence text) {
if (mentionsAdapter != null && captionEditText != null && parentChatActivity != null && text != null) {
- mentionsAdapter.searchUsernameOrHashtag(text.toString(), captionEditText.getCursorPosition(), parentChatActivity.messages, false);
+ mentionsAdapter.searchUsernameOrHashtag(text.toString(), captionEditText.getCursorPosition(), parentChatActivity.messages, false, false);
}
int color = Theme.getColor(Theme.key_dialogFloatingIcon);
if (captionEditText.getCaptionLimitOffset() < 0) {
@@ -5679,6 +5763,9 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
}
private void showScheduleDatePickerDialog() {
+ if (parentChatActivity == null) {
+ return;
+ }
final AlertsCreator.ScheduleDatePickerColors colors = new AlertsCreator.ScheduleDatePickerColors(0xffffffff, 0xff252525, 0xffffffff, 0x1effffff, 0xffffffff, 0xf9222222, 0x24ffffff);
AlertsCreator.createScheduleDatePickerDialog(parentActivity, parentChatActivity.getDialogId(), this::sendPressed, colors);
}
@@ -6596,7 +6683,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
private boolean isAccessibilityEnabled() {
try {
AccessibilityManager am = (AccessibilityManager) activityContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
- return am.isEnabled();
+ return am.isEnabled() && am.isTouchExplorationEnabled();
} catch (Exception e) {
FileLog.e(e);
}
@@ -9048,7 +9135,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
return ImageLocation.getForDocument(message.getDocument());
} else {
TLRPC.FileLocation location;
- TLRPC.PhotoSize sizeFull = FileLoader.getClosestPhotoSizeWithSize(message.photoThumbs, AndroidUtilities.getPhotoSize());
+ TLRPC.PhotoSize sizeFull = FileLoader.getClosestPhotoSizeWithSize(message.photoThumbs, AndroidUtilities.getPhotoSize(), false, null, true);
if (sizeFull != null) {
if (size != null) {
size[0] = sizeFull.size;
@@ -9126,7 +9213,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
}
} else if (message.messageOwner.media instanceof TLRPC.TL_messageMediaPhoto && message.messageOwner.media.photo != null || message.messageOwner.media instanceof TLRPC.TL_messageMediaWebPage && message.messageOwner.media.webpage != null) {
TLRPC.FileLocation location;
- TLRPC.PhotoSize sizeFull = FileLoader.getClosestPhotoSizeWithSize(message.photoThumbs, AndroidUtilities.getPhotoSize());
+ TLRPC.PhotoSize sizeFull = FileLoader.getClosestPhotoSizeWithSize(message.photoThumbs, AndroidUtilities.getPhotoSize(), false, null, true);
if (sizeFull != null) {
if (size != null) {
size[0] = sizeFull.size;
@@ -9820,15 +9907,14 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
allowShare = true;
menuItem.showSubItem(gallery_menu_save);
menuItem.showSubItem(gallery_menu_scan);
- shareButton.setVisibility(!videoPlayerControlVisible ? View.VISIBLE : View.GONE);
- if (shareButton.getVisibility() == View.VISIBLE) {
- paintButton.setVisibility(!isVideo && canSendMediaToParentChatActivity() ? View.VISIBLE : View.GONE);
- bottomButtonsLayout.setVisibility(!videoPlayerControlVisible ? View.VISIBLE : View.GONE);
- if (bottomButtonsLayout.getVisibility() == View.VISIBLE) {
- menuItem.hideSubItem(gallery_menu_share);
- } else {
- menuItem.showSubItem(gallery_menu_share);
- }
+
+ boolean canPaint = newMessageObject.getDocument() == null || newMessageObject.canPreviewDocument() || newMessageObject.getMimeType().startsWith("video/");
+ paintButton.setVisibility(canPaint && canSendMediaToParentChatActivity() ? View.VISIBLE : View.GONE);
+ bottomButtonsLayout.setVisibility(!videoPlayerControlVisible ? View.VISIBLE : View.GONE);
+ if (bottomButtonsLayout.getVisibility() == View.VISIBLE) {
+ menuItem.hideSubItem(gallery_menu_share);
+ } else {
+ menuItem.showSubItem(gallery_menu_share);
}
}
groupedPhotosListView.fillList();
@@ -10146,6 +10232,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
groupedPhotosListView.fillList();
pageBlocksAdapter.updateSlideshowCell(pageBlock);
}
+
setCurrentCaption(newMessageObject, caption, animateCaption);
}
@@ -11431,15 +11518,15 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
}
if (photoEntry.isVideo) {
if (videoEditedInfo != null) {
- SendMessagesHelper.prepareSendingVideo(parentChatActivity.getAccountInstance(), photoEntry.path, videoEditedInfo, parentChatActivity.getDialogId(), null, parentChatActivity.getThreadMessage(), photoEntry.caption, photoEntry.entities, photoEntry.ttl, editingMessageObject, notify, scheduleDate);
+ SendMessagesHelper.prepareSendingVideo(parentChatActivity.getAccountInstance(), photoEntry.path, videoEditedInfo, parentChatActivity.getDialogId(), parentChatActivity.getReplyMessage(), parentChatActivity.getThreadMessage(), photoEntry.caption, photoEntry.entities, photoEntry.ttl, editingMessageObject, notify, scheduleDate);
} else {
- SendMessagesHelper.prepareSendingVideo(parentChatActivity.getAccountInstance(), photoEntry.path, null, parentChatActivity.getDialogId(), null, parentChatActivity.getThreadMessage(), photoEntry.caption, photoEntry.entities, photoEntry.ttl, editingMessageObject, notify, scheduleDate);
+ SendMessagesHelper.prepareSendingVideo(parentChatActivity.getAccountInstance(), photoEntry.path, null, parentChatActivity.getDialogId(), parentChatActivity.getReplyMessage(), parentChatActivity.getThreadMessage(), photoEntry.caption, photoEntry.entities, photoEntry.ttl, editingMessageObject, notify, scheduleDate);
}
} else {
if (photoEntry.imagePath != null) {
- SendMessagesHelper.prepareSendingPhoto(parentChatActivity.getAccountInstance(), photoEntry.imagePath, photoEntry.thumbPath, null, parentChatActivity.getDialogId(), null, parentChatActivity.getThreadMessage(), photoEntry.caption, photoEntry.entities, photoEntry.stickers, null, photoEntry.ttl, editingMessageObject, videoEditedInfo, notify, scheduleDate);
+ SendMessagesHelper.prepareSendingPhoto(parentChatActivity.getAccountInstance(), photoEntry.imagePath, photoEntry.thumbPath, null, parentChatActivity.getDialogId(), parentChatActivity.getReplyMessage(), parentChatActivity.getThreadMessage(), photoEntry.caption, photoEntry.entities, photoEntry.stickers, null, photoEntry.ttl, editingMessageObject, videoEditedInfo, notify, scheduleDate);
} else if (photoEntry.path != null) {
- SendMessagesHelper.prepareSendingPhoto(parentChatActivity.getAccountInstance(), photoEntry.path, photoEntry.thumbPath, null, parentChatActivity.getDialogId(), null, parentChatActivity.getThreadMessage(), photoEntry.caption, photoEntry.entities, photoEntry.stickers, null, photoEntry.ttl, editingMessageObject, videoEditedInfo, notify, scheduleDate);
+ SendMessagesHelper.prepareSendingPhoto(parentChatActivity.getAccountInstance(), photoEntry.path, photoEntry.thumbPath, null, parentChatActivity.getDialogId(), parentChatActivity.getReplyMessage(), parentChatActivity.getThreadMessage(), photoEntry.caption, photoEntry.entities, photoEntry.stickers, null, photoEntry.ttl, editingMessageObject, videoEditedInfo, notify, scheduleDate);
}
}
}
@@ -11575,15 +11662,18 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
doneButtonPressed = false;
allowShowFullscreenButton = true;
parentChatActivity = chatActivity;
+ lastTitle = null;
actionBar.setTitle(LocaleController.formatString("Of", R.string.Of, 1, 1));
actionBar.setTitleScrollNonFitText(false);
+
NotificationCenter.getInstance(currentAccount).addObserver(this, NotificationCenter.fileDidFailToLoad);
NotificationCenter.getInstance(currentAccount).addObserver(this, NotificationCenter.fileDidLoad);
NotificationCenter.getInstance(currentAccount).addObserver(this, NotificationCenter.FileLoadProgressChanged);
NotificationCenter.getInstance(currentAccount).addObserver(this, NotificationCenter.mediaCountDidLoad);
NotificationCenter.getInstance(currentAccount).addObserver(this, NotificationCenter.mediaDidLoad);
NotificationCenter.getInstance(currentAccount).addObserver(this, NotificationCenter.dialogPhotosLoaded);
+ NotificationCenter.getInstance(currentAccount).addObserver(this, NotificationCenter.messagesDeleted);
NotificationCenter.getGlobalInstance().addObserver(this, NotificationCenter.emojiDidLoad);
NotificationCenter.getInstance(currentAccount).addObserver(this, NotificationCenter.filePreparingFailed);
NotificationCenter.getInstance(currentAccount).addObserver(this, NotificationCenter.fileNewChunkAvailable);
@@ -12298,6 +12388,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
NotificationCenter.getInstance(currentAccount).removeObserver(this, NotificationCenter.mediaCountDidLoad);
NotificationCenter.getInstance(currentAccount).removeObserver(this, NotificationCenter.mediaDidLoad);
NotificationCenter.getInstance(currentAccount).removeObserver(this, NotificationCenter.dialogPhotosLoaded);
+ NotificationCenter.getInstance(currentAccount).removeObserver(this, NotificationCenter.messagesDeleted);
NotificationCenter.getGlobalInstance().removeObserver(this, NotificationCenter.emojiDidLoad);
NotificationCenter.getInstance(currentAccount).removeObserver(this, NotificationCenter.filePreparingFailed);
NotificationCenter.getInstance(currentAccount).removeObserver(this, NotificationCenter.fileNewChunkAvailable);
@@ -13044,6 +13135,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
currentScale = ts;
currentTranslationY = ty;
currentTranslationX = tx;
+ updateMinMax(currentScale);
containerView.invalidate();
} else {
if (animationStartTime != 0) {
@@ -13089,14 +13181,26 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
}
if (isActionBarVisible) {
- if (scale <= 1.0001f) {
+ if (currentScale <= 1.0001f) {
if (!allowShowFullscreenButton) {
- fullscreenButton[0].animate().alpha(1.0f).setDuration(120).start();
+ fullscreenButton[0].animate().alpha(1.0f).setDuration(120).setListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ fullscreenButton[0].setTag(null);
+ }
+ }).start();
+ fullscreenButton[0].setTag(1);
allowShowFullscreenButton = true;
}
} else {
if (allowShowFullscreenButton) {
- fullscreenButton[0].animate().alpha(0.0f).setDuration(120).start();
+ fullscreenButton[0].animate().alpha(0.0f).setDuration(120).setListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ fullscreenButton[0].setTag(null);
+ }
+ }).start();
+ fullscreenButton[0].setTag(1);
allowShowFullscreenButton = false;
}
}
@@ -13466,7 +13570,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
photoProgressViews[0].setAlpha(progressAlpha);
photoProgressViews[0].onDraw(canvas);
- if (isActionBarVisible && allowShowFullscreenButton) {
+ if (isActionBarVisible && allowShowFullscreenButton && fullscreenButton[0].getTag() == null) {
fullscreenButton[0].setAlpha(alpha);
}
@@ -13718,6 +13822,19 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
if (!canZoom && !doubleTapEnabled) {
return onSingleTapConfirmed(e);
}
+ if (containerView.getTag() != null && photoProgressViews[0] != null && containerView != null) {
+ float x = e.getX();
+ float y = e.getY();
+ boolean rez = false;
+ if (x >= (getContainerViewWidth() - AndroidUtilities.dp(100)) / 2.0f && x <= (getContainerViewWidth() + AndroidUtilities.dp(100)) / 2.0f &&
+ y >= (getContainerViewHeight() - AndroidUtilities.dp(100)) / 2.0f && y <= (getContainerViewHeight() + AndroidUtilities.dp(100)) / 2.0f) {
+ rez = onSingleTapConfirmed(e);
+ }
+ if (rez) {
+ discardTap = true;
+ return true;
+ }
+ }
return false;
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
index 291f6fe7e..76c326f87 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
@@ -153,6 +153,7 @@ import org.telegram.ui.Components.RadialProgressView;
import org.telegram.ui.Components.RecyclerListView;
import org.telegram.ui.Components.ScamDrawable;
import org.telegram.ui.Components.SharedMediaLayout;
+import org.telegram.ui.Components.TimerDrawable;
import org.telegram.ui.Components.UndoView;
import org.telegram.ui.Components.voip.VoIPHelper;
@@ -221,6 +222,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
private View avatarOverlay;
private AnimatorSet avatarAnimation;
private RadialProgressView avatarProgressView;
+ private ImageView timeItem;
+ private TimerDrawable timerDrawable;
private ProfileGalleryView avatarsViewPager;
private PagerIndicatorView avatarsViewPagerIndicatorView;
private AvatarDrawable avatarDrawable;
@@ -427,6 +430,9 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
private boolean hideNumber;
+ private boolean firstLayout = true;
+ private boolean invalidateScroll = true;
+
private final Property HEADER_SHADOW = new AnimationProperties.FloatProperty("headerShadow") {
@Override
public void setValue(ProfileActivity object, float value) {
@@ -1096,11 +1102,20 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
animator.setInterpolator(CubicBezierInterpolator.EASE_BOTH);
animator.addUpdateListener(a -> {
final float value = AndroidUtilities.lerp(animatorValues, a.getAnimatedFraction());
- final View menuItem = getSecondaryMenuItem();
- if (menuItem != null) {
- menuItem.setScaleX(1f - value);
- menuItem.setScaleY(1f - value);
- menuItem.setAlpha(1f - value);
+ if (searchItem != null && !isPulledDown) {
+ searchItem.setScaleX(1f - value);
+ searchItem.setScaleY(1f - value);
+ searchItem.setAlpha(1f - value);
+ }
+ if (editItemVisible) {
+ editItem.setScaleX(1f - value);
+ editItem.setScaleY(1f - value);
+ editItem.setAlpha(1f - value);
+ }
+ if (callItemVisible) {
+ callItem.setScaleX(1f - value);
+ callItem.setScaleY(1f - value);
+ callItem.setAlpha(1f - value);
}
if (videoCallItemVisible) {
videoCallItem.setScaleX(1f - value);
@@ -1116,9 +1131,14 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
@Override
public void onAnimationEnd(Animator animation) {
if (isIndicatorVisible) {
- final View menuItem = getSecondaryMenuItem();
- if (menuItem != null) {
- menuItem.setVisibility(GONE);
+ if (searchItem != null) {
+ searchItem.setVisibility(GONE);
+ }
+ if (editItemVisible) {
+ editItem.setVisibility(GONE);
+ }
+ if (callItemVisible) {
+ callItem.setVisibility(GONE);
}
if (videoCallItemVisible) {
videoCallItem.setVisibility(GONE);
@@ -1130,9 +1150,14 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
@Override
public void onAnimationStart(Animator animation) {
- final View menuItem = getSecondaryMenuItem();
- if (menuItem != null && (menuItem != searchItem || !expanded)) {
- menuItem.setVisibility(VISIBLE);
+ if (searchItem != null && !expanded) {
+ searchItem.setVisibility(VISIBLE);
+ }
+ if (editItemVisible) {
+ editItem.setVisibility(VISIBLE);
+ }
+ if (callItemVisible) {
+ callItem.setVisibility(VISIBLE);
}
if (videoCallItemVisible) {
videoCallItem.setVisibility(VISIBLE);
@@ -1583,7 +1608,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
builder.setPositiveButton(LocaleController.getString("Delete", R.string.Delete), (dialogInterface, i) -> {
ArrayList arrayList = new ArrayList<>();
arrayList.add(user);
- getContactsController().deleteContact(arrayList);
+ getContactsController().deleteContact(arrayList, true);
});
builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null);
AlertDialog dialog = builder.create();
@@ -1994,7 +2019,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
fragmentView = new NestedFrameLayout(context) {
private boolean ignoreLayout;
- private boolean firstLayout = true;
private Paint grayPaint = new Paint();
@Override
@@ -2044,6 +2068,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
}
}
}
+
if (!fragmentOpened && (expandPhoto || openAnimationInProgress && playProfileAnimation == 2)) {
ignoreLayout = true;
@@ -2147,14 +2172,18 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
if (actionBar.isSearchFieldVisible()) {
layoutManager.scrollToPositionWithOffset(sharedMediaRow, -paddingTop);
layout = true;
- } else if ((!changed || !allowPullingDown) && view != null) {
- if (pos == 0 && !allowPullingDown && top > AndroidUtilities.dp(88)) {
- top = AndroidUtilities.dp(88);
+ } else if (invalidateScroll || currentPaddingTop != paddingTop) {
+ if (savedScrollPosition >= 0) {
+ layoutManager.scrollToPositionWithOffset(savedScrollPosition, savedScrollOffset - paddingTop);
+ } else if ((!changed || !allowPullingDown) && view != null) {
+ if (pos == 0 && !allowPullingDown && top > AndroidUtilities.dp(88)) {
+ top = AndroidUtilities.dp(88);
+ }
+ layoutManager.scrollToPositionWithOffset(pos, top - paddingTop);
+ layout = true;
+ } else {
+ layoutManager.scrollToPositionWithOffset(0, AndroidUtilities.dp(88) - paddingTop);
}
- layoutManager.scrollToPositionWithOffset(pos, top - paddingTop);
- layout = true;
- } else {
- layoutManager.scrollToPositionWithOffset(0, AndroidUtilities.dp(88) - paddingTop);
}
if (currentPaddingTop != paddingTop || listView.getPaddingBottom() != paddingBottom) {
listView.setPadding(0, paddingTop, 0, paddingBottom);
@@ -2175,7 +2204,9 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom);
+ savedScrollPosition = -1;
firstLayout = false;
+ invalidateScroll = false;
checkListViewScroll();
}
@@ -2205,17 +2236,20 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
int count = listView.getChildCount();
sortedChildren.clear();
+ boolean hasRemovingItems = false;
for (int i = 0; i < count; i++) {
View child = listView.getChildAt(i);
if (listView.getChildAdapterPosition(child) != RecyclerView.NO_POSITION) {
sortedChildren.add(listView.getChildAt(i));
+ } else {
+ hasRemovingItems = true;
}
}
Collections.sort(sortedChildren, viewComparator);
boolean hasBackground = false;
float lastY = listView.getY();
count = sortedChildren.size();
- if (!openAnimationInProgress && count > 0) {
+ if (!openAnimationInProgress && count > 0 && !hasRemovingItems) {
lastY += sortedChildren.get(0).getY();
}
float alpha = 1f;
@@ -3214,6 +3248,13 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
avatarProgressView.setNoProgress(false);
avatarContainer.addView(avatarProgressView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT));
+ timeItem = new ImageView(context);
+ timeItem.setPadding(AndroidUtilities.dp(10), AndroidUtilities.dp(10), AndroidUtilities.dp(5), AndroidUtilities.dp(5));
+ timeItem.setScaleType(ImageView.ScaleType.CENTER);
+ timeItem.setImageDrawable(timerDrawable = new TimerDrawable(context));
+ frameLayout.addView(timeItem, LayoutHelper.createFrame(34, 34, Gravity.TOP | Gravity.LEFT));
+ updateTimeItem();
+
showAvatarProgress(false, false);
if (avatarsViewPager != null) {
@@ -3294,6 +3335,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
TextView textView = new TextView(context);
textView.setTextColor(Theme.getColor(Theme.key_player_actionBarSubtitle));
textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+ textView.setSingleLine(true);
+ textView.setEllipsize(TextUtils.TruncateAt.END);
textView.setGravity(Gravity.LEFT);
return textView;
}
@@ -4284,7 +4327,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
otherItem.hideSubItem(set_as_main);
otherItem.hideSubItem(edit_avatar);
otherItem.hideSubItem(delete_avatar);
- otherItem.hideSubItem(add_photo);
+ otherItem.showSubItem(add_photo);
otherItem.showSubItem(logout);
}
}*/
@@ -4356,6 +4399,9 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
avatarImage.setRoundRadius((int) AndroidUtilities.lerp(AndroidUtilities.dpf2(21f), 0f, animationProgress));
avatarContainer.setTranslationX(AndroidUtilities.lerp(avX, 0, animationProgress));
avatarContainer.setTranslationY(AndroidUtilities.lerp((float) Math.ceil(avY), 0f, animationProgress));
+ float extra = (avatarContainer.getMeasuredWidth() - AndroidUtilities.dp(42)) * avatarScale;
+ timeItem.setTranslationX(avatarContainer.getX() + AndroidUtilities.dp(16) + extra);
+ timeItem.setTranslationY(avatarContainer.getY() + AndroidUtilities.dp(15) + extra);
avatarContainer.setScaleX(avatarScale);
avatarContainer.setScaleY(avatarScale);
@@ -4385,6 +4431,9 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
avatarContainer.setScaleY(avatarScale);
avatarContainer.setTranslationX(avatarX);
avatarContainer.setTranslationY((float) Math.ceil(avatarY));
+ float extra = AndroidUtilities.dp(42) * avatarScale - AndroidUtilities.dp(42);
+ timeItem.setTranslationX(avatarContainer.getX() + AndroidUtilities.dp(16) + extra);
+ timeItem.setTranslationY(avatarContainer.getY() + AndroidUtilities.dp(15) + extra);
}
nameX = -21 * AndroidUtilities.density * diff;
nameY = (float) Math.floor(avatarY) + AndroidUtilities.dp(1.3f) + AndroidUtilities.dp(7) * diff;
@@ -4477,7 +4526,20 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
int viewWidth = AndroidUtilities.isTablet() ? AndroidUtilities.dp(490) : AndroidUtilities.displaySize.x;
ActionBarMenuItem item = avatarsViewPagerIndicatorView.getSecondaryMenuItem();
- int buttonsWidth = AndroidUtilities.dp(118 + 8 + (40 + (item != null ? 48 * (1.0f - mediaHeaderAnimationProgress) : 0) + (videoCallItemVisible || chat_id != 0 && callItemVisible ? 48 * (1.0f - mediaHeaderAnimationProgress) : 0)));
+ int extra = 0;
+ if (editItemVisible) {
+ extra += 48;
+ }
+ if (callItemVisible) {
+ extra += 48;
+ }
+ if (videoCallItemVisible) {
+ extra += 48;
+ }
+ if (searchItem != null) {
+ extra += 48;
+ }
+ int buttonsWidth = AndroidUtilities.dp(118 + 8 + (40 + extra * (1.0f - mediaHeaderAnimationProgress)));
int minWidth = viewWidth - buttonsWidth;
int width = (int) (viewWidth - buttonsWidth * Math.max(0.0f, 1.0f - (diff != 1.0f ? diff * 0.15f / (1.0f - diff) : 1.0f)) - nameTextView[1].getTranslationX());
@@ -4630,6 +4692,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
if (currentEncryptedChat != null && chat.id == currentEncryptedChat.id) {
currentEncryptedChat = chat;
updateListAnimated(false);
+ updateTimeItem();
}
} else if (id == NotificationCenter.blockedUsersDidLoad) {
boolean oldValue = userBlocked;
@@ -4677,6 +4740,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
if (currentChat.megagroup && (loadChannelParticipants || !byChannelUsers)) {
getChannelParticipants(true);
}
+ updateTimeItem();
}
} else if (id == NotificationCenter.closeChats) {
removeSelfFromStack();
@@ -4708,6 +4772,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
needLayout(true);
}
}
+ updateTimeItem();
}
} else if (id == NotificationCenter.didReceiveNewMessages) {
boolean scheduled = (Boolean) args[2];
@@ -4735,6 +4800,38 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
}
}
+ private void updateTimeItem() {
+ if (timerDrawable == null) {
+ return;
+ }
+ if (currentEncryptedChat != null) {
+ timerDrawable.setTime(currentEncryptedChat.ttl);
+ timeItem.setTag(1);
+ timeItem.setVisibility(View.VISIBLE);
+ } else if (userInfo != null) {
+ timerDrawable.setTime(userInfo.ttl_period);
+ if (userInfo.ttl_period != 0) {
+ timeItem.setTag(1);
+ timeItem.setVisibility(View.VISIBLE);
+ } else {
+ timeItem.setTag(null);
+ timeItem.setVisibility(View.GONE);
+ }
+ } else if (chatInfo != null) {
+ timerDrawable.setTime(chatInfo.ttl_period);
+ if (chatInfo.ttl_period != 0) {
+ timeItem.setTag(1);
+ timeItem.setVisibility(View.VISIBLE);
+ } else {
+ timeItem.setTag(null);
+ timeItem.setVisibility(View.GONE);
+ }
+ } else {
+ timeItem.setTag(null);
+ timeItem.setVisibility(View.GONE);
+ }
+ }
+
@Override
public boolean needDelayOpenAnimation() {
if (playProfileAnimation == 0) {
@@ -4764,7 +4861,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
}
invalidateIsInLandscapeMode();
if (listAdapter != null) {
- saveScrollPosition();
+ // saveScrollPosition();
+ firstLayout = true;
listAdapter.notifyDataSetChanged();
}
@@ -4867,6 +4965,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
}
if (!fragmentOpened) {
fragmentOpened = true;
+ invalidateScroll = true;
fragmentView.requestLayout();
}
}
@@ -5034,6 +5133,11 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
animators.add(ObjectAnimator.ofFloat(onlineTextView[a], View.ALPHA, a == 0 ? 0.0f : 1.0f));
animators.add(ObjectAnimator.ofFloat(nameTextView[a], View.ALPHA, a == 0 ? 0.0f : 1.0f));
}
+ if (timeItem.getTag() != null) {
+ animators.add(ObjectAnimator.ofFloat(timeItem, View.ALPHA, 0.0f));
+ animators.add(ObjectAnimator.ofFloat(timeItem, View.SCALE_X, 0.0f));
+ animators.add(ObjectAnimator.ofFloat(timeItem, View.SCALE_Y, 0.0f));
+ }
if (animatingItem != null) {
animatingItem.setAlpha(1.0f);
animators.add(ObjectAnimator.ofFloat(animatingItem, View.ALPHA, 0.0f));
@@ -5064,6 +5168,11 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
animators.add(ObjectAnimator.ofFloat(onlineTextView[a], View.ALPHA, a == 0 ? 1.0f : 0.0f));
animators.add(ObjectAnimator.ofFloat(nameTextView[a], View.ALPHA, a == 0 ? 1.0f : 0.0f));
}
+ if (timeItem.getTag() != null) {
+ animators.add(ObjectAnimator.ofFloat(timeItem, View.ALPHA, 1.0f));
+ animators.add(ObjectAnimator.ofFloat(timeItem, View.SCALE_X, 1.0f));
+ animators.add(ObjectAnimator.ofFloat(timeItem, View.SCALE_Y, 1.0f));
+ }
if (animatingItem != null) {
animatingItem.setAlpha(0.0f);
animators.add(ObjectAnimator.ofFloat(animatingItem, View.ALPHA, 1.0f));
@@ -5236,7 +5345,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
TLRPC.User user = getMessagesController().getUser(uid);
getMessagesController().deleteUserFromChat(chat_id, user, chatInfo);
if (currentChat != null && user != null && BulletinFactory.canShowBulletin(this)) {
- BulletinFactory.createRemoveFromChatBulletin(this, user.first_name, currentChat.title).show();
+ BulletinFactory.createRemoveFromChatBulletin(this, user, currentChat.title).show();
}
if (chatInfo.participants.participants.remove(participant)) {
updateListAnimated(true);
@@ -5876,7 +5985,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
callItemVisible = false;
videoCallItemVisible = false;
canSearchMembers = false;
-
+ boolean selfUser = false;
if (user_id != 0) {
TLRPC.User user = getMessagesController().getUser(user_id);
if (user == null) {
@@ -6003,10 +6112,13 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
//otherItem.addSubItem(edit_avatar, R.drawable.photo_paint, LocaleController.getString("EditPhoto", R.string.EditPhoto));
otherItem.addSubItem(delete_avatar, R.drawable.baseline_delete_24, LocaleController.getString("Delete", R.string.Delete));
}
+ if (selfUser) {
+ otherItem.addSubItem(logout, R.drawable.msg_leave, LocaleController.getString("LogOut", R.string.LogOut));
+ }
if (!isPulledDown) {
otherItem.hideSubItem(gallery_menu_save);
otherItem.hideSubItem(set_as_main);
- otherItem.hideSubItem(add_photo);
+ otherItem.showSubItem(add_photo);
otherItem.hideSubItem(edit_avatar);
otherItem.hideSubItem(delete_avatar);
}
@@ -6371,7 +6483,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
src.renameTo(destFile);
String oldKey = avatar.volume_id + "_" + avatar.local_id + "@50_50";
String newKey = small.location.volume_id + "_" + small.location.local_id + "@50_50";
- ImageLoader.getInstance().replaceImageInCache(oldKey, newKey, ImageLocation.getForUser(user, false), true);
+ ImageLoader.getInstance().replaceImageInCache(oldKey, newKey, ImageLocation.getForUser(user, false), false);
}
if (big != null && avatarBig != null) {
File destFile = FileLoader.getPathToAttach(big, true);
@@ -6417,6 +6529,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
listView.smoothScrollBy(0, view.getTop() - AndroidUtilities.dp(88), CubicBezierInterpolator.EASE_OUT_QUINT);
}
}
+ actionBar.createMenu().requestLayout();
});
}
@@ -6573,7 +6686,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
int totalHeight = 0;
for (int i = 0; i < n; i++) {
View view = listView.getChildAt(i);
- if (listView.getChildAdapterPosition(view) != bottomPaddingRow) {
+ int p = listView.getChildAdapterPosition(view);
+ if (p >= 0 && p != bottomPaddingRow) {
totalHeight += listView.getChildAt(i).getMeasuredHeight();
}
}
@@ -6946,6 +7060,9 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
userCell.setData(getMessagesController().getUser(part.user_id), null, null, 0, position != membersEndRow - 1);
}
break;
+ case 12:
+ holder.itemView.requestLayout();
+ break;
}
}
@@ -7735,25 +7852,40 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
if (updateOnlineCount) {
updateOnlineCount(false);
}
+ saveScrollPosition();
updateRowsIds();
diffCallback.fillPositions(diffCallback.newPositionToItem);
DiffUtil.calculateDiff(diffCallback).dispatchUpdatesTo(listAdapter);
- saveScrollPosition();
+ if (savedScrollPosition >= 0) {
+ layoutManager.scrollToPositionWithOffset(savedScrollPosition, savedScrollOffset - listView.getPaddingTop());
+ }
AndroidUtilities.updateVisibleRows(listView);
}
+ int savedScrollPosition = -1;
+ int savedScrollOffset;
+
private void saveScrollPosition() {
if (listView != null && layoutManager != null && listView.getChildCount() > 0) {
View view = null;
int position = -1;
+ int top = Integer.MAX_VALUE;
for (int i = 0; i < listView.getChildCount(); i++) {
- position = listView.getChildAdapterPosition(listView.getChildAt(i));
- if (position != RecyclerListView.NO_POSITION) {
- view = listView.getChildAt(i);
- break;
+ int childPosition = listView.getChildAdapterPosition(listView.getChildAt(i));
+ View child = listView.getChildAt(i);
+ if (childPosition != RecyclerListView.NO_POSITION && child.getTop() < top) {
+ view = child;
+ position = childPosition;
+ top = child.getTop();
}
}
if (view != null) {
+ savedScrollPosition = position;
+ savedScrollOffset = view.getTop();
+ if (savedScrollPosition == 0 && !allowPullingDown && savedScrollOffset > AndroidUtilities.dp(88)) {
+ savedScrollOffset = AndroidUtilities.dp(88);
+ }
+
layoutManager.scrollToPositionWithOffset(position, view.getTop() - listView.getPaddingTop());
}
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java
index d4f3ee2ae..1f9eef144 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java
@@ -29,19 +29,24 @@ import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.TextView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import org.telegram.messenger.AndroidUtilities;
-import org.telegram.messenger.ChatObject;
-import org.telegram.messenger.MessagesController;
import org.telegram.messenger.ApplicationLoader;
+import org.telegram.messenger.ChatObject;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.LocaleController;
+import org.telegram.messenger.MessagesController;
import org.telegram.messenger.MessagesStorage;
import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.NotificationsController;
import org.telegram.messenger.R;
import org.telegram.tgnet.TLObject;
import org.telegram.tgnet.TLRPC;
+import org.telegram.ui.ActionBar.ActionBar;
import org.telegram.ui.ActionBar.AlertDialog;
+import org.telegram.ui.ActionBar.BaseFragment;
import org.telegram.ui.ActionBar.Theme;
import org.telegram.ui.ActionBar.ThemeDescription;
import org.telegram.ui.Cells.HeaderCell;
@@ -50,8 +55,6 @@ import org.telegram.ui.Cells.ShadowSectionCell;
import org.telegram.ui.Cells.TextCheckBoxCell;
import org.telegram.ui.Cells.TextCheckCell;
import org.telegram.ui.Cells.TextColorCell;
-import org.telegram.ui.ActionBar.ActionBar;
-import org.telegram.ui.ActionBar.BaseFragment;
import org.telegram.ui.Cells.TextInfoPrivacyCell;
import org.telegram.ui.Cells.TextSettingsCell;
import org.telegram.ui.Cells.UserCell2;
@@ -61,9 +64,6 @@ import org.telegram.ui.Components.RecyclerListView;
import java.util.ArrayList;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
public class ProfileNotificationsActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate {
private RecyclerListView listView;
@@ -387,7 +387,7 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
preferences.edit().putBoolean("content_preview_" + dialog_id, !checkCell.isChecked()).commit();
checkCell.setChecked(!checkCell.isChecked());
} else if (position == callsVibrateRow) {
- showDialog(AlertsCreator.createVibrationSelectDialog(getParentActivity(), dialog_id, "calls_vibrate_", () -> {
+ showDialog(AlertsCreator.createVibrationSelectDialog(getParentActivity(), dialog_id, "calls_vibrate_" + dialog_id, () -> {
if (adapter != null) {
adapter.notifyItemChanged(callsVibrateRow);
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java
index eef439eb5..3cb212669 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java
@@ -1257,6 +1257,7 @@ public class ProxyListActivity extends BaseFragment implements NotificationCente
}
}
+ @SuppressWarnings("unchecked")
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position, @NonNull List payloads) {
if (holder.getItemViewType() == 3 && payloads.contains(PAYLOAD_CHECKED_CHANGED)) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ReportOtherActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ReportOtherActivity.java
deleted file mode 100644
index 33968c936..000000000
--- a/TMessagesProj/src/main/java/org/telegram/ui/ReportOtherActivity.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * This is the source code of Telegram for Android v. 5.x.x.
- * It is licensed under GNU GPL v. 2 or later.
- * You should have received a copy of the license in this archive (see LICENSE).
- *
- * Copyright Nikolai Kudashov, 2013-2018.
- */
-
-package org.telegram.ui;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.text.InputType;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.EditorInfo;
-import android.widget.LinearLayout;
-import android.widget.Toast;
-
-import org.telegram.messenger.AndroidUtilities;
-import org.telegram.messenger.LocaleController;
-import org.telegram.messenger.MessagesController;
-import org.telegram.messenger.R;
-import org.telegram.messenger.UserConfig;
-import org.telegram.tgnet.ConnectionsManager;
-import org.telegram.tgnet.TLObject;
-import org.telegram.tgnet.TLRPC;
-import org.telegram.ui.ActionBar.ActionBar;
-import org.telegram.ui.ActionBar.ActionBarMenu;
-import org.telegram.ui.ActionBar.BaseFragment;
-import org.telegram.ui.ActionBar.Theme;
-import org.telegram.ui.ActionBar.ThemeDescription;
-import org.telegram.ui.Components.EditTextBoldCursor;
-import org.telegram.ui.Components.LayoutHelper;
-
-import java.util.ArrayList;
-
-public class ReportOtherActivity extends BaseFragment {
-
- private EditTextBoldCursor firstNameField;
- private View headerLabelView;
- private long dialog_id;
- private int message_id;
- private View doneButton;
-
- private final static int done_button = 1;
-
- public ReportOtherActivity(Bundle args) {
- super(args);
- dialog_id = getArguments().getLong("dialog_id", 0);
- message_id = getArguments().getInt("message_id", 0);
- }
-
- @Override
- public View createView(Context context) {
- actionBar.setBackButtonImage(R.drawable.ic_ab_back);
- actionBar.setAllowOverlayTitle(true);
- actionBar.setTitle(LocaleController.getString("ReportChat", R.string.ReportChat));
- actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() {
- @Override
- public void onItemClick(int id) {
- if (id == -1) {
- finishFragment();
- } else if (id == done_button) {
- if (firstNameField.getText().length() != 0) {
- TLObject req;
- TLRPC.InputPeer peer = MessagesController.getInstance(UserConfig.selectedAccount).getInputPeer((int) dialog_id);
- if (message_id != 0) {
- TLRPC.TL_messages_report request = new TLRPC.TL_messages_report();
- request.peer = peer;
- request.id.add(message_id);
- TLRPC.TL_inputReportReasonOther reportReasonOther = new TLRPC.TL_inputReportReasonOther();
- reportReasonOther.text = firstNameField.getText().toString();
- request.reason = reportReasonOther;
- req = request;
- } else {
- TLRPC.TL_account_reportPeer request = new TLRPC.TL_account_reportPeer();
- request.peer = MessagesController.getInstance(currentAccount).getInputPeer((int) dialog_id);
- TLRPC.TL_inputReportReasonOther reportReasonOther = new TLRPC.TL_inputReportReasonOther();
- reportReasonOther.text = firstNameField.getText().toString();
- request.reason = reportReasonOther;
- req = request;
- }
- ConnectionsManager.getInstance(currentAccount).sendRequest(req, (response, error) -> {
-
- });
- if (getParentActivity() != null) {
- Toast.makeText(getParentActivity(), LocaleController.getString("ReportChatSent", R.string.ReportChatSent), Toast.LENGTH_SHORT).show();
- }
- finishFragment();
- }
- }
- }
- });
-
- ActionBarMenu menu = actionBar.createMenu();
- doneButton = menu.addItemWithWidth(done_button, R.drawable.ic_done, AndroidUtilities.dp(56), LocaleController.getString("Done", R.string.Done));
-
- LinearLayout linearLayout = new LinearLayout(context);
- fragmentView = linearLayout;
- fragmentView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
- ((LinearLayout) fragmentView).setOrientation(LinearLayout.VERTICAL);
- fragmentView.setOnTouchListener((v, event) -> true);
-
- firstNameField = new EditTextBoldCursor(context);
- firstNameField.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 18);
- firstNameField.setHintTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteHintText));
- firstNameField.setTextColor(Theme.getColor(Theme.key_windowBackgroundWhiteBlackText));
- firstNameField.setBackgroundDrawable(Theme.createEditTextDrawable(context, false));
- firstNameField.setMaxLines(3);
- firstNameField.setPadding(0, 0, 0, 0);
- firstNameField.setGravity(LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT);
- firstNameField.setInputType(InputType.TYPE_TEXT_FLAG_CAP_SENTENCES | InputType.TYPE_TEXT_FLAG_MULTI_LINE | InputType.TYPE_TEXT_FLAG_AUTO_CORRECT);
- firstNameField.setImeOptions(EditorInfo.IME_ACTION_DONE);
- firstNameField.setGravity(LocaleController.isRTL ? Gravity.RIGHT : Gravity.LEFT);
- firstNameField.setCursorColor(Theme.getColor(Theme.key_windowBackgroundWhiteBlackText));
- firstNameField.setCursorSize(AndroidUtilities.dp(20));
- firstNameField.setCursorWidth(1.5f);
- firstNameField.setOnEditorActionListener((textView, i, keyEvent) -> {
- if (i == EditorInfo.IME_ACTION_DONE && doneButton != null) {
- doneButton.performClick();
- return true;
- }
- return false;
- });
-
- linearLayout.addView(firstNameField, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 36, 24, 24, 24, 0));
- firstNameField.setHint(LocaleController.getString("ReportChatDescription", R.string.ReportChatDescription));
- firstNameField.setSelection(firstNameField.length());
-
- return fragmentView;
- }
-
- @Override
- public void onResume() {
- super.onResume();
- SharedPreferences preferences = MessagesController.getGlobalMainSettings();
- boolean animations = preferences.getBoolean("view_animations", true);
- if (!animations) {
- firstNameField.requestFocus();
- AndroidUtilities.showKeyboard(firstNameField);
- }
- }
-
- @Override
- public void onTransitionAnimationEnd(boolean isOpen, boolean backward) {
- if (isOpen) {
- AndroidUtilities.runOnUIThread(() -> {
- if (firstNameField != null) {
- firstNameField.requestFocus();
- AndroidUtilities.showKeyboard(firstNameField);
- }
- }, 100);
- }
- }
-
- @Override
- public ArrayList getThemeDescriptions() {
- ArrayList themeDescriptions = new ArrayList<>();
-
- themeDescriptions.add(new ThemeDescription(fragmentView, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_windowBackgroundWhite));
-
- themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_BACKGROUND, null, null, null, null, Theme.key_actionBarDefault));
- themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_ITEMSCOLOR, null, null, null, null, Theme.key_actionBarDefaultIcon));
- themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_TITLECOLOR, null, null, null, null, Theme.key_actionBarDefaultTitle));
- themeDescriptions.add(new ThemeDescription(actionBar, ThemeDescription.FLAG_AB_SELECTORCOLOR, null, null, null, null, Theme.key_actionBarDefaultSelector));
-
- themeDescriptions.add(new ThemeDescription(firstNameField, ThemeDescription.FLAG_TEXTCOLOR, null, null, null, null, Theme.key_windowBackgroundWhiteBlackText));
- themeDescriptions.add(new ThemeDescription(firstNameField, ThemeDescription.FLAG_HINTTEXTCOLOR, null, null, null, null, Theme.key_windowBackgroundWhiteHintText));
- themeDescriptions.add(new ThemeDescription(firstNameField, ThemeDescription.FLAG_BACKGROUNDFILTER, null, null, null, null, Theme.key_windowBackgroundWhiteInputField));
- themeDescriptions.add(new ThemeDescription(firstNameField, ThemeDescription.FLAG_BACKGROUNDFILTER | ThemeDescription.FLAG_DRAWABLESELECTEDSTATE, null, null, null, null, Theme.key_windowBackgroundWhiteInputFieldActivated));
-
- return themeDescriptions;
- }
-}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SecretMediaViewer.java b/TMessagesProj/src/main/java/org/telegram/ui/SecretMediaViewer.java
index 3040c6043..a782848c0 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/SecretMediaViewer.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/SecretMediaViewer.java
@@ -26,7 +26,6 @@ import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
-import androidx.annotation.Keep;
import android.util.SparseArray;
import android.view.GestureDetector;
import android.view.Gravity;
@@ -39,18 +38,20 @@ import android.view.WindowManager;
import android.view.animation.DecelerateInterpolator;
import android.widget.FrameLayout;
+import androidx.annotation.Keep;
+
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
import org.telegram.messenger.AndroidUtilities;
+import org.telegram.messenger.FileLoader;
+import org.telegram.messenger.FileLog;
import org.telegram.messenger.ImageLocation;
import org.telegram.messenger.ImageReceiver;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.MessageObject;
import org.telegram.messenger.NotificationCenter;
-import org.telegram.messenger.FileLoader;
-import org.telegram.messenger.FileLog;
import org.telegram.messenger.R;
import org.telegram.messenger.UserConfig;
import org.telegram.tgnet.ConnectionsManager;
@@ -666,7 +667,7 @@ public class SecretMediaViewer implements NotificationCenter.NotificationCenterD
centerImage.setForceCrossfade(true);
}
- public void openMedia(MessageObject messageObject, PhotoViewer.PhotoViewerProvider provider) {
+ public void openMedia(MessageObject messageObject, PhotoViewer.PhotoViewerProvider provider, Runnable onOpen) {
if (parentActivity == null || messageObject == null || !messageObject.needDrawBluredPreview() || provider == null) {
return;
}
@@ -823,6 +824,9 @@ public class SecretMediaViewer implements NotificationCenter.NotificationCenterD
photoAnimationEndRunnable = () -> {
photoAnimationInProgress = 0;
imageMoveAnimation = null;
+ if (onOpen != null) {
+ onOpen.run();
+ }
if (containerView == null) {
return;
}
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ThemeActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ThemeActivity.java
index 9e588b988..db54294ce 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ThemeActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ThemeActivity.java
@@ -2135,9 +2135,7 @@ public class ThemeActivity extends BaseFragment implements NotificationCenter.No
themeDescriptions.add(new ThemeDescription(listView, 0, new Class[]{ChatListCell.class}, null, null, null, Theme.key_radioBackground));
themeDescriptions.add(new ThemeDescription(listView, 0, new Class[]{ChatListCell.class}, null, null, null, Theme.key_radioBackgroundChecked));
-
- themeDescriptions.add(new ThemeDescription(listView, 0, new Class[]{TextCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteBlueText4));
- themeDescriptions.add(new ThemeDescription(listView, 0, new Class[]{TextCell.class}, new String[]{"imageView"}, null, null, null, Theme.key_windowBackgroundWhiteBlueText4));
+ ;
themeDescriptions.add(new ThemeDescription(listView, 0, new Class[]{NotificationsCheckCell.class}, new String[]{"textView"}, null, null, null, Theme.key_windowBackgroundWhiteBlackText));
themeDescriptions.add(new ThemeDescription(listView, 0, new Class[]{NotificationsCheckCell.class}, new String[]{"valueTextView"}, null, null, null, Theme.key_windowBackgroundWhiteGrayText2));
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/VoIPFragment.java b/TMessagesProj/src/main/java/org/telegram/ui/VoIPFragment.java
index fec57252e..814adaf7b 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/VoIPFragment.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/VoIPFragment.java
@@ -799,6 +799,9 @@ public class VoIPFragment implements VoIPBaseService.StateListener, Notification
speakerPhoneIcon.setPadding(AndroidUtilities.dp(12), AndroidUtilities.dp(12), AndroidUtilities.dp(12), AndroidUtilities.dp(12));
frameLayout.addView(speakerPhoneIcon, LayoutHelper.createFrame(56, 56, Gravity.TOP | Gravity.RIGHT));
speakerPhoneIcon.setOnClickListener(view -> {
+ if (speakerPhoneIcon.getTag() == null) {
+ return;
+ }
if (VoIPService.getSharedInstance() != null) {
VoIPService.getSharedInstance().toggleSpeakerphoneOrShowRouteSheet(activity, false);
}
@@ -1803,10 +1806,12 @@ public class VoIPFragment implements VoIPBaseService.StateListener, Notification
if (currentUserIsVideo || callingUserIsVideo) {
setFrontalCameraAction(bottomButtons[0], service, animated);
if (uiVisible) {
+ speakerPhoneIcon.setTag(1);
speakerPhoneIcon.animate().alpha(1f).start();
}
} else {
setSpeakerPhoneAction(bottomButtons[0], service, animated);
+ speakerPhoneIcon.setTag(null);
speakerPhoneIcon.animate().alpha(0f).start();
}
setVideoAction(bottomButtons[1], service, animated);
@@ -1927,6 +1932,7 @@ public class VoIPFragment implements VoIPBaseService.StateListener, Notification
bottomButton.setChecked(false, animated);
}
bottomButton.setCheckableForAccessibility(true);
+ bottomButton.setEnabled(true);
bottomButton.setOnClickListener(view -> {
if (VoIPService.getSharedInstance() != null) {
VoIPService.getSharedInstance().toggleSpeakerphoneOrShowRouteSheet(activity, false);
diff --git a/TMessagesProj/src/main/java/org/webrtc/RecyclerItemsEnterAnimator.java b/TMessagesProj/src/main/java/org/webrtc/RecyclerItemsEnterAnimator.java
new file mode 100644
index 000000000..bb91c1bb4
--- /dev/null
+++ b/TMessagesProj/src/main/java/org/webrtc/RecyclerItemsEnterAnimator.java
@@ -0,0 +1,117 @@
+package org.webrtc;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.util.SparseArray;
+import android.view.View;
+import android.view.ViewTreeObserver;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.telegram.ui.Components.FlickerLoadingView;
+import org.telegram.ui.Components.RecyclerListView;
+
+import java.util.HashSet;
+
+public class RecyclerItemsEnterAnimator {
+
+ private final RecyclerListView listView;
+ private final SparseArray listAlphaItems = new SparseArray<>();
+ HashSet ignoreView = new HashSet<>();
+ boolean invalidateAlpha;
+
+ public RecyclerItemsEnterAnimator(RecyclerListView listView) {
+ this.listView = listView;
+ }
+
+ public void dispatchDraw() {
+ if (invalidateAlpha || listAlphaItems.size() > 0) {
+ for (int i = 0; i < listView.getChildCount(); i++) {
+ View child = listView.getChildAt(i);
+ int position = listView.getChildAdapterPosition(child);
+ if (position >= 0 && !ignoreView.contains(child)) {
+ Float alpha = listAlphaItems.get(position, null);
+ if (alpha == null) {
+ child.setAlpha(1f);
+ } else {
+ child.setAlpha(alpha);
+ }
+ }
+ }
+ invalidateAlpha = false;
+ }
+ }
+
+ public void showItemsAnimated(int from) {
+ int n = listView.getChildCount();
+ View progressView = null;
+ for (int i = 0; i < n; i++) {
+ View child = listView.getChildAt(i);
+ if (listView.getChildAdapterPosition(child) >= 0 && child instanceof FlickerLoadingView) {
+ progressView = child;
+ }
+ }
+ final View finalProgressView = progressView;
+ RecyclerView.LayoutManager layoutManager = listView.getLayoutManager();
+ if (progressView != null && layoutManager != null) {
+ listView.removeView(progressView);
+ ignoreView.add(finalProgressView);
+ listView.addView(finalProgressView);
+ layoutManager.ignoreView(finalProgressView);
+ Animator animator = ObjectAnimator.ofFloat(finalProgressView, View.ALPHA, finalProgressView.getAlpha(), 0);
+ animator.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ finalProgressView.setAlpha(1f);
+ layoutManager.stopIgnoringView(finalProgressView);
+ ignoreView.remove(finalProgressView);
+ listView.removeView(finalProgressView);
+ }
+ });
+ animator.start();
+ from--;
+ }
+ int finalFrom = from;
+ listView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+ @Override
+ public boolean onPreDraw() {
+ listView.getViewTreeObserver().removeOnPreDrawListener(this);
+ int n = listView.getChildCount();
+ AnimatorSet animatorSet = new AnimatorSet();
+ for (int i = 0; i < n; i++) {
+ View child = listView.getChildAt(i);
+ int position = listView.getChildAdapterPosition(child);
+ if (child != finalProgressView && position >= finalFrom - 1 && listAlphaItems.get(position, null) == null) {
+ listAlphaItems.put(position, 0f);
+ child.setAlpha(0);
+ int s = Math.min(listView.getMeasuredHeight(), Math.max(0, child.getTop()));
+ int delay = (int) ((s / (float) listView.getMeasuredHeight()) * 100);
+ ValueAnimator a = ValueAnimator.ofFloat(0, 1f);
+ a.addUpdateListener(valueAnimator -> {
+ Float alpha = (Float) valueAnimator.getAnimatedValue();
+ listAlphaItems.put(position, alpha);
+ invalidateAlpha = true;
+ listView.invalidate();
+ });
+ a.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ listAlphaItems.remove(position);
+ invalidateAlpha = true;
+ listView.invalidate();
+ }
+ });
+ a.setStartDelay(delay);
+ a.setDuration(200);
+ animatorSet.playTogether(a);
+ }
+ }
+ animatorSet.start();
+ return false;
+ }
+ });
+ }
+}
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/channelintro.png b/TMessagesProj/src/main/res/drawable-hdpi/channelintro.png
deleted file mode 100644
index 85f044e03..000000000
Binary files a/TMessagesProj/src/main/res/drawable-hdpi/channelintro.png and /dev/null differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/msg_delete_auto.png b/TMessagesProj/src/main/res/drawable-hdpi/msg_delete_auto.png
new file mode 100644
index 000000000..dcef48c58
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/msg_delete_auto.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widget_bg.9.png b/TMessagesProj/src/main/res/drawable-hdpi/widget_bg.9.png
new file mode 100644
index 000000000..fee3bb471
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widget_bg.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widget_check.png b/TMessagesProj/src/main/res/drawable-hdpi/widget_check.png
new file mode 100644
index 000000000..3c1ed349b
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widget_check.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widget_clock.png b/TMessagesProj/src/main/res/drawable-hdpi/widget_clock.png
new file mode 100644
index 000000000..b30664fb2
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widget_clock.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widget_counter.9.png b/TMessagesProj/src/main/res/drawable-hdpi/widget_counter.9.png
new file mode 100644
index 000000000..db87d8af0
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widget_counter.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widget_counter_muted.9.png b/TMessagesProj/src/main/res/drawable-hdpi/widget_counter_muted.9.png
new file mode 100644
index 000000000..f8cecf181
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widget_counter_muted.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widget_edit.9.png b/TMessagesProj/src/main/res/drawable-hdpi/widget_edit.9.png
new file mode 100644
index 000000000..7bbed19ff
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widget_edit.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widget_halfcheck.png b/TMessagesProj/src/main/res/drawable-hdpi/widget_halfcheck.png
new file mode 100644
index 000000000..d3a2666b7
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widget_halfcheck.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widget_muted.png b/TMessagesProj/src/main/res/drawable-hdpi/widget_muted.png
new file mode 100644
index 000000000..27e099689
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widget_muted.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widget_online.png b/TMessagesProj/src/main/res/drawable-hdpi/widget_online.png
new file mode 100644
index 000000000..cde098fc4
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widget_online.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widget_pin.png b/TMessagesProj/src/main/res/drawable-hdpi/widget_pin.png
new file mode 100644
index 000000000..8d248b6f1
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widget_pin.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widget_verified.png b/TMessagesProj/src/main/res/drawable-hdpi/widget_verified.png
new file mode 100644
index 000000000..c50e2dd52
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widget_verified.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widgets_dark_badgebg.9.png b/TMessagesProj/src/main/res/drawable-hdpi/widgets_dark_badgebg.9.png
new file mode 100644
index 000000000..09d1dd106
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widgets_dark_badgebg.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widgets_dark_plus.png b/TMessagesProj/src/main/res/drawable-hdpi/widgets_dark_plus.png
new file mode 100644
index 000000000..9ace8d361
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widgets_dark_plus.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widgets_light_badgebg.9.png b/TMessagesProj/src/main/res/drawable-hdpi/widgets_light_badgebg.9.png
new file mode 100644
index 000000000..22968bec2
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widgets_light_badgebg.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-hdpi/widgets_light_plus.png b/TMessagesProj/src/main/res/drawable-hdpi/widgets_light_plus.png
new file mode 100644
index 000000000..c5608819b
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-hdpi/widgets_light_plus.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/channelintro.png b/TMessagesProj/src/main/res/drawable-mdpi/channelintro.png
deleted file mode 100644
index 51d0161b1..000000000
Binary files a/TMessagesProj/src/main/res/drawable-mdpi/channelintro.png and /dev/null differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/msg_delete_auto.png b/TMessagesProj/src/main/res/drawable-mdpi/msg_delete_auto.png
new file mode 100644
index 000000000..aa789fd4e
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/msg_delete_auto.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/msg_report_abuse.png b/TMessagesProj/src/main/res/drawable-mdpi/msg_report_abuse.png
new file mode 100644
index 000000000..b451179e4
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/msg_report_abuse.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/msg_report_fake.png b/TMessagesProj/src/main/res/drawable-mdpi/msg_report_fake.png
new file mode 100644
index 000000000..f604c02fa
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/msg_report_fake.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/msg_report_other.png b/TMessagesProj/src/main/res/drawable-mdpi/msg_report_other.png
new file mode 100644
index 000000000..4b62a7c9d
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/msg_report_other.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/msg_report_spam.png b/TMessagesProj/src/main/res/drawable-mdpi/msg_report_spam.png
new file mode 100644
index 000000000..8cd48c4a5
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/msg_report_spam.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/msg_report_violence.png b/TMessagesProj/src/main/res/drawable-mdpi/msg_report_violence.png
new file mode 100644
index 000000000..ce4342756
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/msg_report_violence.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/msg_report_xxx.png b/TMessagesProj/src/main/res/drawable-mdpi/msg_report_xxx.png
new file mode 100644
index 000000000..5f6a52245
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/msg_report_xxx.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widget_bg.9.png b/TMessagesProj/src/main/res/drawable-mdpi/widget_bg.9.png
new file mode 100644
index 000000000..68dada846
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widget_bg.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widget_check.png b/TMessagesProj/src/main/res/drawable-mdpi/widget_check.png
new file mode 100644
index 000000000..5dfcc142b
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widget_check.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widget_clock.png b/TMessagesProj/src/main/res/drawable-mdpi/widget_clock.png
new file mode 100644
index 000000000..bf373fef5
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widget_clock.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widget_counter.9.png b/TMessagesProj/src/main/res/drawable-mdpi/widget_counter.9.png
new file mode 100644
index 000000000..aca8fb36b
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widget_counter.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widget_counter_muted.9.png b/TMessagesProj/src/main/res/drawable-mdpi/widget_counter_muted.9.png
new file mode 100644
index 000000000..249feebe6
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widget_counter_muted.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widget_edit.9.png b/TMessagesProj/src/main/res/drawable-mdpi/widget_edit.9.png
new file mode 100644
index 000000000..458eb2e2a
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widget_edit.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widget_halfcheck.png b/TMessagesProj/src/main/res/drawable-mdpi/widget_halfcheck.png
new file mode 100644
index 000000000..8a00e0d15
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widget_halfcheck.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widget_muted.png b/TMessagesProj/src/main/res/drawable-mdpi/widget_muted.png
new file mode 100644
index 000000000..ccc32c198
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widget_muted.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widget_online.png b/TMessagesProj/src/main/res/drawable-mdpi/widget_online.png
new file mode 100644
index 000000000..6c02baa91
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widget_online.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widget_pin.png b/TMessagesProj/src/main/res/drawable-mdpi/widget_pin.png
new file mode 100644
index 000000000..5bb76cf37
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widget_pin.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widget_verified.png b/TMessagesProj/src/main/res/drawable-mdpi/widget_verified.png
new file mode 100644
index 000000000..f7a036dc2
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widget_verified.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widgets_dark_badgebg.9.png b/TMessagesProj/src/main/res/drawable-mdpi/widgets_dark_badgebg.9.png
new file mode 100644
index 000000000..363123ff9
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widgets_dark_badgebg.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widgets_dark_plus.png b/TMessagesProj/src/main/res/drawable-mdpi/widgets_dark_plus.png
new file mode 100644
index 000000000..5dd337cb0
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widgets_dark_plus.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widgets_light_badgebg.9.png b/TMessagesProj/src/main/res/drawable-mdpi/widgets_light_badgebg.9.png
new file mode 100644
index 000000000..3ebc2a09a
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widgets_light_badgebg.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-mdpi/widgets_light_plus.png b/TMessagesProj/src/main/res/drawable-mdpi/widgets_light_plus.png
new file mode 100644
index 000000000..3ae8a8568
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-mdpi/widgets_light_plus.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-hdpi/widget_bg.9.png b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_bg.9.png
new file mode 100644
index 000000000..b880efd54
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_bg.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-hdpi/widget_check.png b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_check.png
new file mode 100644
index 000000000..b69327592
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_check.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-hdpi/widget_clock.png b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_clock.png
new file mode 100644
index 000000000..544e6bb33
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_clock.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-hdpi/widget_counter.9.png b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_counter.9.png
new file mode 100644
index 000000000..c7314cad6
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_counter.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-hdpi/widget_counter_muted.9.png b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_counter_muted.9.png
new file mode 100644
index 000000000..0392fc8b4
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_counter_muted.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-hdpi/widget_edit.9.png b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_edit.9.png
new file mode 100644
index 000000000..1b4dc0626
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_edit.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-hdpi/widget_halfcheck.png b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_halfcheck.png
new file mode 100644
index 000000000..311e405d6
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_halfcheck.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-hdpi/widget_muted.png b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_muted.png
new file mode 100644
index 000000000..ecf6d32b7
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_muted.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-hdpi/widget_online.png b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_online.png
new file mode 100644
index 000000000..2dc6af43c
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_online.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-hdpi/widget_pin.png b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_pin.png
new file mode 100644
index 000000000..d45b49f49
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_pin.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-hdpi/widget_verified.png b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_verified.png
new file mode 100644
index 000000000..6d56e37ac
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-hdpi/widget_verified.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-mdpi/widget_bg.9.png b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_bg.9.png
new file mode 100644
index 000000000..a4d186927
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_bg.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-mdpi/widget_check.png b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_check.png
new file mode 100644
index 000000000..d60d849d1
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_check.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-mdpi/widget_clock.png b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_clock.png
new file mode 100644
index 000000000..4a0d1f3e0
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_clock.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-mdpi/widget_counter.9.png b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_counter.9.png
new file mode 100644
index 000000000..06c38a852
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_counter.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-mdpi/widget_counter_muted.9.png b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_counter_muted.9.png
new file mode 100644
index 000000000..9de7d03af
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_counter_muted.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-mdpi/widget_edit.9.png b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_edit.9.png
new file mode 100644
index 000000000..b7d0a170c
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_edit.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-mdpi/widget_halfcheck.png b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_halfcheck.png
new file mode 100644
index 000000000..ff86161b0
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_halfcheck.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-mdpi/widget_muted.png b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_muted.png
new file mode 100644
index 000000000..c8e3cb6ab
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_muted.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-mdpi/widget_online.png b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_online.png
new file mode 100644
index 000000000..cf29da17d
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_online.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-mdpi/widget_pin.png b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_pin.png
new file mode 100644
index 000000000..8de91645c
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_pin.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-mdpi/widget_verified.png b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_verified.png
new file mode 100644
index 000000000..4b238274d
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-mdpi/widget_verified.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_bg.9.png b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_bg.9.png
new file mode 100644
index 000000000..880247fc2
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_bg.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_check.png b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_check.png
new file mode 100644
index 000000000..5d7e71268
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_check.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_clock.png b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_clock.png
new file mode 100644
index 000000000..48370ad73
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_clock.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_counter.9.png b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_counter.9.png
new file mode 100644
index 000000000..94b6e2833
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_counter.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_counter_muted.9.png b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_counter_muted.9.png
new file mode 100644
index 000000000..cf66f723c
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_counter_muted.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_edit.9.png b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_edit.9.png
new file mode 100644
index 000000000..eda7fa656
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_edit.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_halfcheck.png b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_halfcheck.png
new file mode 100644
index 000000000..769e383b9
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_halfcheck.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_muted.png b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_muted.png
new file mode 100644
index 000000000..c2a970eba
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_muted.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_online.png b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_online.png
new file mode 100644
index 000000000..c0659a70b
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_online.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_pin.png b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_pin.png
new file mode 100644
index 000000000..26428a044
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_pin.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_verified.png b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_verified.png
new file mode 100644
index 000000000..46433d996
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xhdpi/widget_verified.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_bg.9.png b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_bg.9.png
new file mode 100644
index 000000000..2b963818d
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_bg.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_check.png b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_check.png
new file mode 100644
index 000000000..ac5fa2a35
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_check.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_clock.png b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_clock.png
new file mode 100644
index 000000000..3591a535a
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_clock.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_counter.9.png b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_counter.9.png
new file mode 100644
index 000000000..6d63b4d7c
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_counter.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_counter_muted.9.png b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_counter_muted.9.png
new file mode 100644
index 000000000..ac06bb65e
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_counter_muted.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_edit.9.png b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_edit.9.png
new file mode 100644
index 000000000..cac9dee9a
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_edit.9.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_halfcheck.png b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_halfcheck.png
new file mode 100644
index 000000000..9142a25fe
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_halfcheck.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_muted.png b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_muted.png
new file mode 100644
index 000000000..4d75e0102
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_muted.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_online.png b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_online.png
new file mode 100644
index 000000000..ae13a511b
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_online.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_pin.png b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_pin.png
new file mode 100644
index 000000000..f005bfbfe
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_pin.png differ
diff --git a/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_verified.png b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_verified.png
new file mode 100644
index 000000000..397fa1f06
Binary files /dev/null and b/TMessagesProj/src/main/res/drawable-night-xxhdpi/widget_verified.png differ
diff --git a/TMessagesProj/src/main/res/drawable-v21/list_selector_ex.xml b/TMessagesProj/src/main/res/drawable-v21/list_selector_ex.xml
index 0ba2177bc..52e0f3b84 100644
--- a/TMessagesProj/src/main/res/drawable-v21/list_selector_ex.xml
+++ b/TMessagesProj/src/main/res/drawable-v21/list_selector_ex.xml
@@ -1,5 +1,7 @@
- | | |