diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java index 9eabb4fb3..c97738656 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java @@ -994,7 +994,7 @@ public class MessageObject { } public boolean isMegagroup() { - return isMegagroup(messageOwner); + return false; } public static boolean isMegagroup(TLRPC.Message message) { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/NotificationCenter.java b/MessengerProj/src/main/java/com/b44t/messenger/NotificationCenter.java index 89507a189..31043f374 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/NotificationCenter.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/NotificationCenter.java @@ -44,7 +44,7 @@ public class NotificationCenter { public static final int recentImagesDidLoaded = totalEvents++; public static final int replaceMessagesObjects = totalEvents++; public static final int didSetPasscode = totalEvents++; - public static final int screenStateChanged = totalEvents++; + //public static final int screenStateChanged = totalEvents++; -- currently not used, but this may get handy public static final int didLoadedReplyMessages = totalEvents++; public static final int didReceivedWebpages = totalEvents++; public static final int didReceivedWebpagesInUpdates = totalEvents++; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java b/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java index aa08acf69..db15a2d57 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java @@ -813,9 +813,9 @@ public class NotificationsController { return null; } if (from_id == u2.id) { - if (messageObject.isMegagroup()) { + /*if (messageObject.isMegagroup()) { msg = LocaleController.formatString("NotificationGroupAddSelfMega", R.string.NotificationGroupAddSelfMega, name, chat.title); - } else { + } else*/ { msg = LocaleController.formatString("NotificationGroupAddSelf", R.string.NotificationGroupAddSelf, name, chat.title); } } else { @@ -1595,7 +1595,7 @@ public class NotificationsController { NotificationCompat.Action wearReplyAction = null; - if (!ChatObject.isChannel(chat) && !AndroidUtilities.needShowPasscode(false) && !UserConfig.isWaitingForPasscodeEnter) { + if (/*!ChatObject.isChannel(chat) &&*/ !AndroidUtilities.needShowPasscode(false) && !UserConfig.isWaitingForPasscodeEnter) { Intent msgReplyIntent = new Intent(); msgReplyIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); msgReplyIntent.setAction("com.b44t.messenger.ACTION_MESSAGE_REPLY"); diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ScreenReceiver.java b/MessengerProj/src/main/java/com/b44t/messenger/ScreenReceiver.java index 7d95eed13..e8336fa4c 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ScreenReceiver.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ScreenReceiver.java @@ -25,6 +25,6 @@ public class ScreenReceiver extends BroadcastReceiver { ConnectionsManager.getInstance().setAppPaused(false, true); ApplicationLoader.isScreenOn = true; } - NotificationCenter.getInstance().postNotificationName(NotificationCenter.screenStateChanged); + //NotificationCenter.getInstance().postNotificationName(NotificationCenter.screenStateChanged); } } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/query/SharedMediaQuery.java b/MessengerProj/src/main/java/com/b44t/messenger/query/SharedMediaQuery.java index 2b37b7f3c..8ba68b1a2 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/query/SharedMediaQuery.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/query/SharedMediaQuery.java @@ -25,7 +25,7 @@ public class SharedMediaQuery { public final static int MEDIA_TYPES_COUNT = 5; public static void loadMedia(final long uid, final int offset, final int count, final int max_id, final int type, final boolean fromCache, final int classGuid) { - final boolean isChannel = (int) uid < 0 && ChatObject.isChannel(-(int) uid); + final boolean isChannel = false;//(int) uid < 0 && ChatObject.isChannel(-(int) uid); int lower_part = (int)uid; if (fromCache || lower_part == 0) { diff --git a/MessengerProj/src/main/res/drawable-hdpi/book_user.png b/MessengerProj/src/main/res/drawable-hdpi/book_user.png deleted file mode 100755 index c39c07123..000000000 Binary files a/MessengerProj/src/main/res/drawable-hdpi/book_user.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-hdpi/menu_contacts.png b/MessengerProj/src/main/res/drawable-hdpi/menu_contacts.png deleted file mode 100755 index d2ce6e645..000000000 Binary files a/MessengerProj/src/main/res/drawable-hdpi/menu_contacts.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-hdpi/menu_help.png b/MessengerProj/src/main/res/drawable-hdpi/menu_help.png deleted file mode 100755 index 3acaa23ee..000000000 Binary files a/MessengerProj/src/main/res/drawable-hdpi/menu_help.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-mdpi/book_user.png b/MessengerProj/src/main/res/drawable-mdpi/book_user.png deleted file mode 100755 index 66bf3b1d5..000000000 Binary files a/MessengerProj/src/main/res/drawable-mdpi/book_user.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-mdpi/menu_contacts.png b/MessengerProj/src/main/res/drawable-mdpi/menu_contacts.png deleted file mode 100755 index d068de483..000000000 Binary files a/MessengerProj/src/main/res/drawable-mdpi/menu_contacts.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-mdpi/menu_help.png b/MessengerProj/src/main/res/drawable-mdpi/menu_help.png deleted file mode 100755 index 73fa5a6b5..000000000 Binary files a/MessengerProj/src/main/res/drawable-mdpi/menu_help.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xhdpi/book_user.png b/MessengerProj/src/main/res/drawable-xhdpi/book_user.png deleted file mode 100755 index 64df4bf31..000000000 Binary files a/MessengerProj/src/main/res/drawable-xhdpi/book_user.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xhdpi/menu_contacts.png b/MessengerProj/src/main/res/drawable-xhdpi/menu_contacts.png deleted file mode 100755 index a7cc40dff..000000000 Binary files a/MessengerProj/src/main/res/drawable-xhdpi/menu_contacts.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xhdpi/menu_help.png b/MessengerProj/src/main/res/drawable-xhdpi/menu_help.png deleted file mode 100755 index 256a4fc15..000000000 Binary files a/MessengerProj/src/main/res/drawable-xhdpi/menu_help.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/book_user.png b/MessengerProj/src/main/res/drawable-xxhdpi/book_user.png deleted file mode 100755 index 2f54d6b5e..000000000 Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/book_user.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/menu_contacts.png b/MessengerProj/src/main/res/drawable-xxhdpi/menu_contacts.png deleted file mode 100755 index 483e8669b..000000000 Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/menu_contacts.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/menu_help.png b/MessengerProj/src/main/res/drawable-xxhdpi/menu_help.png deleted file mode 100755 index 6d46163da..000000000 Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/menu_help.png and /dev/null differ diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml index aba9be4a9..44ae3f049 100644 --- a/MessengerProj/src/main/res/values-de/strings.xml +++ b/MessengerProj/src/main/res/values-de/strings.xml @@ -37,7 +37,6 @@ Warte auf Netzwerk... Verbinde… Aktualisiere… - Alle Nachrichten löschen Chat löschen Chat auswählen Tippen und Halten @@ -91,8 +90,6 @@ Keine aktuellen Nachricht Nachricht - Meine Nummer teilen - Zu Kontakten hinzufügen Du wurdest aus der Gruppe entfernt Du hast die Gruppe verlassen Diese Gruppe löschen @@ -109,7 +106,6 @@ URL kopieren %1$s senden URL %1$s öffnen? - KONTAKT HINZUFÜGEN 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 @@ -152,12 +148,10 @@ %1$s hat das Bild der Gruppe %2$s geändert %1$s hat %3$s in die Gruppe %2$s eingeladen %1$s ist in die Gruppe %2$s zurückgekehrt - %1$s ist der Gruppe %2$s beigetreten %1$s hat %3$s aus der Gruppe %2$s entfernt %1$s hat dich aus der Gruppe %2$s entfernt %1$s hat die Gruppe %2$s verlassen %1$s hat das Profilbild geändert - %1$s ist per Einladungslink der Gruppe %2$s beigetreten Antworten %1$s antworten %1$s antworten diff --git a/MessengerProj/src/main/res/values-es/strings.xml b/MessengerProj/src/main/res/values-es/strings.xml index 8c45fa8a5..7f77a4e1b 100644 --- a/MessengerProj/src/main/res/values-es/strings.xml +++ b/MessengerProj/src/main/res/values-es/strings.xml @@ -37,7 +37,6 @@ Esperando red... Conectando... Actualizando... - Borrar historial Eliminar chat Elige el chat Mantén pulsado para ver @@ -91,8 +90,6 @@ No hay recientes Mensaje Mensaje - Compartir mi número - Añadir a contactos Te eliminaron de este grupo Dejaste este grupo Eliminar este grupo @@ -109,7 +106,6 @@ Copiar URL Enviar %1$s ¿Abrir %1$s? - AÑADIR CONTACTO 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 @@ -152,12 +148,10 @@ %1$s cambió la foto del grupo %2$s %1$s invitó a %3$s al grupo %2$s %1$s volvió al grupo %2$s - %1$s se unió al grupo %2$s %1$s eliminó a %3$s del grupo %2$s %1$s te eliminó del grupo %2$s %1$s dejó el grupo %2$s %1$s actualizó su foto de perfil - %1$s se unió al grupo %2$s con un enlace de invitación Responder Responder a %1$s Responder a %1$s diff --git a/MessengerProj/src/main/res/values-it/strings.xml b/MessengerProj/src/main/res/values-it/strings.xml index d5aeef519..078def7e2 100644 --- a/MessengerProj/src/main/res/values-it/strings.xml +++ b/MessengerProj/src/main/res/values-it/strings.xml @@ -37,7 +37,6 @@ Attendo la rete... Connetto… Aggiorno… - Cancella cronologia Elimina chat Seleziona chat Tieni premuto per vedere @@ -91,8 +90,6 @@ Nessun recente Messaggio Messaggi - Condividi il mio contatto - Aggiungi ai contatti Sei stato rimosso da questo gruppo Hai lasciato il gruppo Elimina questo gruppo @@ -109,7 +106,6 @@ Copia URL Invia %1$s Aprire url %1$s? - AGGIUNGI CONTATTO Spiacenti, ma al momento puoi scrivere solo ai contatti reciproci. Spiacenti, ma al momento puoi aggiungere ai gruppi solo contatti reciproci. Maggiori info @@ -152,12 +148,10 @@ %1$s ha modificato la foto del gruppo %2$s %1$s ha invitato %3$s nel gruppo %2$s %1$s è tornato nel gruppo %2$s - %1$s si è unito al gruppo %2$s %1$s ha rimosso %3$s dal gruppo %2$s %1$s ti ha rimosso dal gruppo %2$s %1$s ha lasciato il gruppo %2$s %1$s ha aggiornato la foto del profilo - %1$s si è unito al gruppo %2$s via link di invito Rispondi Rispondi a %1$s Rispondi a %1$s diff --git a/MessengerProj/src/main/res/values-nl/strings.xml b/MessengerProj/src/main/res/values-nl/strings.xml index 207e9089d..d1badd36f 100644 --- a/MessengerProj/src/main/res/values-nl/strings.xml +++ b/MessengerProj/src/main/res/values-nl/strings.xml @@ -37,7 +37,6 @@ Wachten op netwerk Verbinden Bijwerken - Geschiedenis wissen Chat verwijderen Kies een chat Druk en houd ingedrukt @@ -91,8 +90,6 @@ Niets recents Bericht Bericht - Mijn contactgegevens delen - Toevoegen aan contacten Je bent verwijderd uit deze groep Je hebt deze groep verlaten Deze groep verwijderen @@ -109,7 +106,6 @@ Link kopiëren %1$s versturen URL %1$s openen? - CONTACT TOEVOEGEN Je kunt momenteel alleen berichten sturen aan onderlingen contacten. Je kunt momenteel alleen onderlinge contacten aan groepen toevoegen Meer informatie @@ -152,12 +148,10 @@ %1$s heeft de afbeelding van de groep %2$s gewijzigd %1$s heeft %3$s uitgenodigd voor de groep %2$s %1$s is terug in de groep %2$s - %1$s is nu lid van de groep %2$s %1$s heeft %3$s verwijderd uit de groep %2$s %1$s heeft je verwijderd uit de groep %2$s %1$s heeft de groep %2$s verlaten %1$s heeft zijn/haar profielfoto gewijzigd - %1$s is nu lid van de groep %2$s via uitnodigingslink Antwoord Antwoord op %1$s Antwoord op %1$s diff --git a/MessengerProj/src/main/res/values-pt/strings.xml b/MessengerProj/src/main/res/values-pt/strings.xml index ec4dff187..2d9718e1e 100644 --- a/MessengerProj/src/main/res/values-pt/strings.xml +++ b/MessengerProj/src/main/res/values-pt/strings.xml @@ -37,7 +37,6 @@ Aguardando rede... Conectando... Atualizando... - Limpar histórico Apagar conversa Selecione um Chat Toque e segure para ver @@ -91,8 +90,6 @@ Nada recente Mensagem Mensagem - Compartilhar meu contato - Adicionar aos contatos Você foi removido deste grupo Você saiu deste grupo Apagar este grupo @@ -109,7 +106,6 @@ Copiar URL Enviar %1$s Abrir URL em %1$s? - ADICIONAR CONTATO 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 @@ -152,12 +148,10 @@ %1$s editou a foto do grupo %2$s %1$s convidou %3$s para o grupo %2$s %1$s retornou ao grupo %2$s - %1$s entrou no grupo %2$s %1$s removeu %3$s do grupo %2$s %1$s removeu você do grupo %2$s %1$s saiu do grupo %2$s %1$s atualizou a foto do perfil - %1$s entrou para o grupo %2$s via link de convite Responder Responder para %1$s Responder para %1$s diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml index 32bdd1ff6..c53b42202 100644 --- a/MessengerProj/src/main/res/values/strings.xml +++ b/MessengerProj/src/main/res/values/strings.xml @@ -37,7 +37,6 @@ Waiting for network... Connecting... Updating... - Delete all messages Delete chat Select chat Tap and hold to view @@ -91,8 +90,6 @@ No recent Message Message - Share my contact - Add to contacts You were removed from this group You left this group Delete this group @@ -109,7 +106,6 @@ Copy URL Send %1$s Open url %1$s? - ADD CONTACT 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 @@ -152,12 +148,10 @@ %1$s edited the group\'s %2$s photo %1$s invited %3$s to the group %2$s %1$s returned to the group %2$s - %1$s joined the group %2$s %1$s removed %3$s from the group %2$s %1$s removed you from the group %2$s %1$s has left the group %2$s %1$s updated profile photo - %1$s joined to the group %2$s via invite link Reply Reply to %1$s Reply to %1$s