diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java
index 28dbcf609..f7ac7250e 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java
@@ -782,7 +782,7 @@ public class MessageObject {
maxWidth = Math.min(AndroidUtilities.displaySize.x, AndroidUtilities.displaySize.y) - AndroidUtilities.dp(80);
}
}
- if (fromUser != null && fromUser.bot || (messageOwner.fwd_from != null && messageOwner.fwd_from.channel_id != 0) && !isOut()) {
+ if ( (messageOwner.fwd_from != null && messageOwner.fwd_from.channel_id != 0) && !isOut()) {
maxWidth -= AndroidUtilities.dp(20);
}
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java
index a539b5ff5..a3ed8b043 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java
@@ -209,9 +209,6 @@ public class TLRPC {
public Document document;
}
- public static class TL_webPageEmpty extends WebPage {
- }
-
public static class TL_webPage extends WebPage {
}
@@ -241,8 +238,6 @@ public class TLRPC {
public boolean self;
public boolean contact;
public final boolean mutual_contact = false;
- public final boolean bot = false;
- public boolean verified;
public boolean min;
}
@@ -453,7 +448,6 @@ public class TLRPC {
public int date;
public int version;
public boolean editor;
- public boolean verified;
public String username;
public boolean signatures;
public boolean min;
diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java
index eab198275..a89c96dab 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java
@@ -3553,16 +3553,7 @@ public class ChatMessageCell extends BaseCell implements SeekBar.SeekBarDelegate
if (hasSign && signUser == null) {
hasSign = false;
}
- String timeString;
- TLRPC.User author = null;
- if (currentMessageObject.isFromUser()) {
- author = MessagesController.getInstance().getUser(messageObject.messageOwner.from_id);
- }
- if (messageObject.messageOwner.via_bot_id == 0 && messageObject.messageOwner.via_bot_name == null && (author == null || !author.bot) && (messageObject.messageOwner.flags & TLRPC.MESSAGE_FLAG_EDITED) != 0) {
- timeString = LocaleController.getString("EditedMessage", R.string.EditedMessage) + " " + LocaleController.getInstance().formatterDay.format((long) (messageObject.messageOwner.date) * 1000);
- } else {
- timeString = LocaleController.getInstance().formatterDay.format((long) (messageObject.messageOwner.date) * 1000);
- }
+ String timeString = LocaleController.getInstance().formatterDay.format((long) (messageObject.messageOwner.date) * 1000);
if (hasSign) {
currentTimeString = ", " + timeString;
} else {
diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/ProfileSearchCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/ProfileSearchCell.java
index 2b6274f6f..be384105b 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ProfileSearchCell.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ProfileSearchCell.java
@@ -41,7 +41,6 @@ public class ProfileSearchCell extends BaseCell {
private static Drawable groupDrawable;
private static Drawable countDrawable;
private static Drawable countDrawableGrey;
- private static Drawable checkDrawable;
private static Paint linePaint;
private CharSequence currentName;
@@ -75,8 +74,6 @@ public class ProfileSearchCell extends BaseCell {
private int countWidth;
private StaticLayout countLayout;
- private boolean drawCheck;
-
private int onlineLeft;
private StaticLayout onlineLayout;
@@ -108,7 +105,6 @@ public class ProfileSearchCell extends BaseCell {
groupDrawable = getResources().getDrawable(R.drawable.list_group);
countDrawable = getResources().getDrawable(R.drawable.dialogs_badge);
countDrawableGrey = getResources().getDrawable(R.drawable.dialogs_badge2);
- checkDrawable = getResources().getDrawable(R.drawable.check_list);
}
avatarImage = new ImageReceiver(this);
@@ -173,7 +169,6 @@ public class ProfileSearchCell extends BaseCell {
TextPaint currentNamePaint;
drawNameGroup = false;
- drawCheck = false;
{
if (chat != null) {
@@ -191,7 +186,6 @@ public class ProfileSearchCell extends BaseCell {
nameLockTop = AndroidUtilities.dp(30);
}
}
- drawCheck = chat.verified;
if (!LocaleController.isRTL) {
nameLockLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline);
nameLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline + 4) + (groupDrawable.getIntrinsicWidth());
@@ -207,7 +201,6 @@ public class ProfileSearchCell extends BaseCell {
nameLeft = AndroidUtilities.dp(11);
}
nameLockTop = AndroidUtilities.dp(17);
- drawCheck = user.verified;
}
}
@@ -461,14 +454,6 @@ public class ProfileSearchCell extends BaseCell {
canvas.translate(nameLeft, nameTop);
nameLayout.draw(canvas);
canvas.restore();
- if (drawCheck) {
- if (LocaleController.isRTL) {
- setDrawableBounds(checkDrawable, nameLeft - AndroidUtilities.dp(4) - checkDrawable.getIntrinsicWidth(), nameLockTop);
- } else {
- setDrawableBounds(checkDrawable, nameLeft + (int) nameLayout.getLineWidth(0) + AndroidUtilities.dp(4), nameLockTop);
- }
- checkDrawable.draw(canvas);
- }
}
if (onlineLayout != null) {
diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
index 62b4b2cd3..0b560a081 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java
@@ -1234,8 +1234,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
int rightIcon = 0;
if (a == 0) {
rightIcon = MessagesController.getInstance().isDialogMuted(dialog_id != 0 ? dialog_id : (long) user_id) ? R.drawable.mute_fixed : 0;
- } else if (user.verified) {
- rightIcon = R.drawable.check_profile_fixed;
}
nameTextView[a].setLeftDrawable(leftIcon);
nameTextView[a].setRightDrawable(rightIcon);
diff --git a/MessengerProj/src/main/res/drawable-hdpi/check_profile.png b/MessengerProj/src/main/res/drawable-hdpi/check_profile.png
deleted file mode 100644
index 380a8ebff..000000000
Binary files a/MessengerProj/src/main/res/drawable-hdpi/check_profile.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-mdpi/check_profile.png b/MessengerProj/src/main/res/drawable-mdpi/check_profile.png
deleted file mode 100644
index ada9e496d..000000000
Binary files a/MessengerProj/src/main/res/drawable-mdpi/check_profile.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/check_profile.png b/MessengerProj/src/main/res/drawable-xhdpi/check_profile.png
deleted file mode 100644
index 36efe5482..000000000
Binary files a/MessengerProj/src/main/res/drawable-xhdpi/check_profile.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/check_profile.png b/MessengerProj/src/main/res/drawable-xxhdpi/check_profile.png
deleted file mode 100644
index 30bfdb482..000000000
Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/check_profile.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable/check_profile_fixed.xml b/MessengerProj/src/main/res/drawable/check_profile_fixed.xml
deleted file mode 100644
index 591ea9d5d..000000000
--- a/MessengerProj/src/main/res/drawable/check_profile_fixed.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml
index f0544f5a2..505a22cf6 100644
--- a/MessengerProj/src/main/res/values-de/strings.xml
+++ b/MessengerProj/src/main/res/values-de/strings.xml
@@ -23,7 +23,6 @@
Aktualisiere…
Chat löschen
Chat auswählen
- Tippen und Halten
NACHRICHTEN
Suche
Stummschalten
@@ -35,12 +34,10 @@
CHATS
Lösche %1$s aus Vorschlägen?
Entwurf
- Verlauf wurde gelöscht
Mitglieder werden benachrichtigt
Mitglieder werden nicht benachrichtigt
- Listenname
Bitte füge Musikdateien einfach deiner Android Musikbibliothek hinzu, um sie hier zu sehen.
Musik
@@ -90,15 +87,11 @@
URL kopieren
%1$s senden
URL %1$s öffnen?
- Derzeit kannst du nur Kontakten schreiben, die auch deine Nummer haben.
- Derzeit kannst du nur Kontakte hinzufügen, die auch deine Nummer haben.
Mehr Infos
Sende an...
Hier tippen um gespeicherte GIFs zu sehen
Zuletzt benutzte Emoji leeren?
- Angeheftete Nachricht
bearbeitet
- Runterscrollen für Bots
Widget hinzufügen
Widget zum Startbildschirm hinzugefügt
diff --git a/MessengerProj/src/main/res/values-es/strings.xml b/MessengerProj/src/main/res/values-es/strings.xml
index 166ec22db..6010e500a 100644
--- a/MessengerProj/src/main/res/values-es/strings.xml
+++ b/MessengerProj/src/main/res/values-es/strings.xml
@@ -23,7 +23,6 @@
Actualizando...
Eliminar chat
Elige el chat
- Mantén pulsado para ver
MENSAJES
Buscar
Silenciar notificaciones
@@ -35,12 +34,10 @@
CHATS
¿Eliminar a %1$s de las sugerencias?
Borrador
- Historial borrado
Tu publicación será notificada
Tu publicación no será notificada
- Nombre de la lista
Por favor, añade archivos a la carpeta de música en tu dispositivo para verlos aquí.
Música
@@ -90,15 +87,11 @@
Copiar URL
Enviar %1$s
¿Abrir %1$s?
- Lo sentimos, por ahora puedes enviar mensajes sólo a contactos mutuos.
- Lo sentimos, por ahora sólo puedes añadir contactos mutuos a un grupo.
Más información
Enviar a...
Toca y ve los GIF guardados
¿Borrar los emojis recientes?
- Mensaje anclado
editado
- Ve abajo para los bots
Añadir acceso directo
Acceso directo añadido al escritorio
diff --git a/MessengerProj/src/main/res/values-it/strings.xml b/MessengerProj/src/main/res/values-it/strings.xml
index 8e5ebabc0..a05036c18 100644
--- a/MessengerProj/src/main/res/values-it/strings.xml
+++ b/MessengerProj/src/main/res/values-it/strings.xml
@@ -23,7 +23,6 @@
Aggiorno…
Elimina chat
Seleziona chat
- Tieni premuto per vedere
MESSAGGI
Cerca
Silenzia notifiche
@@ -35,12 +34,10 @@
CHAT
Eliminare %1$s dai suggerimenti?
Bozza
- Cronologia eliminata
I post saranno notificati ai membri
I post non saranno notificati ai membri
- Inserisci il nome della lista
Aggiungi file nella libreria musicale del tuo dispositivo per vederli qui.
Musica
@@ -90,15 +87,11 @@
Copia URL
Invia %1$s
Aprire url %1$s?
- Spiacenti, ma al momento puoi scrivere solo ai contatti reciproci.
- Spiacenti, ma al momento puoi aggiungere ai gruppi solo contatti reciproci.
Maggiori info
Invia a...
Premi qui per accedere alle GIF salvate
Cancellare le emoji recenti?
- Messaggio fissato
modificato
- Scorri verso il basso per i bot
Aggiungi scorciatoia
Scorciatoia aggiunta alla schermata home
diff --git a/MessengerProj/src/main/res/values-nl/strings.xml b/MessengerProj/src/main/res/values-nl/strings.xml
index dc04a84bc..81aaf08a0 100644
--- a/MessengerProj/src/main/res/values-nl/strings.xml
+++ b/MessengerProj/src/main/res/values-nl/strings.xml
@@ -23,7 +23,6 @@
Bijwerken
Chat verwijderen
Kies een chat
- Druk en houd ingedrukt
BERICHTEN
Zoeken
Meldingen stil
@@ -35,12 +34,10 @@
CHATS
%1$s uit suggesties verwijderen?
Concept
- Geschiedenis gewist
Berichtgeving voor leden
Geen berichtgeving voor leden
- Naam van lijst
Voeg bestanden toe aan de muziekbibliotheek op je apparaat om ze hier te zien.
Muziek
@@ -90,15 +87,11 @@
Link kopiëren
%1$s versturen
URL %1$s openen?
- Je kunt momenteel alleen berichten sturen aan onderlingen contacten.
- Je kunt momenteel alleen onderlinge contacten aan groepen toevoegen
Meer informatie
Versturen naar...
Tik hier om opgeslagen GIF\'s te bekijken
Recente emoji\'s wissen?
- Vastgezet bericht
bewerkt
- Scrollen voor bots
Snelkoppeling toevoegen
Snelkoppeling aan startscherm toegevoegd
diff --git a/MessengerProj/src/main/res/values-pt/strings.xml b/MessengerProj/src/main/res/values-pt/strings.xml
index 09b150583..fe1807f39 100644
--- a/MessengerProj/src/main/res/values-pt/strings.xml
+++ b/MessengerProj/src/main/res/values-pt/strings.xml
@@ -23,7 +23,6 @@
Atualizando...
Apagar conversa
Selecione um Chat
- Toque e segure para ver
MENSAGENS
Busca
Silenciar notificações
@@ -35,12 +34,10 @@
CONVERSAS
Apagar %1$s das sugestões?
Rascunho
- O histórico foi apagado
Os membros serão notificados quando você postar
Os membros não serão notificados quando você postar
- Digite o nome da lista
Por favor, adicione arquivos à biblioteca de música de seu dispositivo para vê-los aqui.
Música
@@ -90,15 +87,11 @@
Copiar URL
Enviar %1$s
Abrir URL em %1$s?
- Desculpe, você pode enviar mensagens somente para contatos mútuos no momento.
- Desculpe, você só pode adicionar contatos mútuos à grupos no momento.
Mais informações
Enviar para...
Toque aqui para acessar os GIFs salvos
Limpar emojis recentes?
- Mensagem Fixada
editado
- Desça para ver os bots
Adicionar atalho
Atalho adicionado à tela de início
diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml
index ae47f3f3a..6ffe87deb 100644
--- a/MessengerProj/src/main/res/values/strings.xml
+++ b/MessengerProj/src/main/res/values/strings.xml
@@ -23,7 +23,6 @@
Updating...
Delete chat
Select chat
- Tap and hold to view
MESSAGES
Search
Mute notifications
@@ -35,12 +34,10 @@
CHATS
Delete %1$s from suggestions?
Draft
- History was cleared
Members will be notified when you post
Members will not be notified when you post
- Enter list name
Please add files to the music library on your device to see them here.
Music
@@ -90,15 +87,11 @@
Copy URL
Send %1$s
Open url %1$s?
- Sorry, you can only send messages to mutual contacts at the moment.
- Sorry, you can only add mutual contacts to groups at the moment.
More info
Send to...
Tap here to access saved GIFs
Clear recent emoji?
- Pinned Message
edited
- Scroll down for bots
Add widget
Widget added to home screen