From 16cc42e0dbcddbfbd9e27223632f79ba23ca1b40 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Tue, 22 Nov 2016 00:10:45 +0100 Subject: [PATCH] Remove tgnet. --- .../com/b44t/messenger/AndroidUtilities.java | 2 - .../com/b44t/messenger/ApplicationLoader.java | 1 - .../java/com/b44t/messenger/ChatObject.java | 2 - .../ConnectionsManager.java | 6 +- .../com/b44t/messenger/DownloadObject.java | 2 - .../com/b44t/messenger/FileLoadOperation.java | 3 - .../java/com/b44t/messenger/FileLoader.java | 3 - .../b44t/messenger/FileUploadOperation.java | 3 - .../java/com/b44t/messenger/ImageLoader.java | 3 - .../com/b44t/messenger/ImageReceiver.java | 2 - .../com/b44t/messenger/LocaleController.java | 3 +- .../com/b44t/messenger/MediaController.java | 2 - .../com/b44t/messenger/MessageObject.java | 2 - .../b44t/messenger/MessagesController.java | 23 ++++--- .../java/com/b44t/messenger/MrMailbox.java | 2 - .../b44t/messenger/MusicBrowserService.java | 1 - .../messenger/NotificationsController.java | 2 - .../com/b44t/messenger/ScreenReceiver.java | 2 - .../b44t/messenger/SendMessagesHelper.java | 3 - .../b44t/{tgnet => messenger}/TLObject.java | 2 +- .../com/b44t/{tgnet => messenger}/TLRPC.java | 62 +------------------ .../java/com/b44t/messenger/UserConfig.java | 2 - .../java/com/b44t/messenger/UserObject.java | 2 - .../com/b44t/messenger/query/DraftQuery.java | 2 +- .../b44t/messenger/query/MessagesQuery.java | 2 +- .../messenger/query/MessagesSearchQuery.java | 4 +- .../com/b44t/messenger/query/SearchQuery.java | 2 +- .../messenger/query/SharedMediaQuery.java | 2 +- .../b44t/messenger/query/StickersQuery.java | 2 +- .../com/b44t/ui/ActionBar/BaseFragment.java | 2 +- .../b44t/ui/Adapters/BaseSearchAdapter.java | 4 +- .../Adapters/BaseSearchAdapterRecycler.java | 4 +- .../com/b44t/ui/Adapters/ContactsAdapter.java | 2 +- .../com/b44t/ui/Adapters/DialogsAdapter.java | 2 +- .../ui/Adapters/DialogsSearchAdapter.java | 6 +- .../com/b44t/ui/Adapters/MentionsAdapter.java | 4 +- .../com/b44t/ui/Adapters/SearchAdapter.java | 4 +- .../com/b44t/ui/Adapters/StickersAdapter.java | 2 +- .../java/com/b44t/ui/AudioPlayerActivity.java | 2 +- .../java/com/b44t/ui/AudioSelectActivity.java | 2 +- .../com/b44t/ui/BlockedUsersActivity.java | 2 +- .../com/b44t/ui/Cells/ChatActionCell.java | 2 +- .../com/b44t/ui/Cells/ChatMessageCell.java | 2 +- .../com/b44t/ui/Cells/ContextLinkCell.java | 2 +- .../java/com/b44t/ui/Cells/DialogCell.java | 2 +- .../com/b44t/ui/Cells/DrawerProfileCell.java | 2 +- .../com/b44t/ui/Cells/HintDialogCell.java | 2 +- .../java/com/b44t/ui/Cells/MentionCell.java | 2 +- .../com/b44t/ui/Cells/ProfileSearchCell.java | 6 +- .../java/com/b44t/ui/Cells/StickerCell.java | 2 +- .../com/b44t/ui/Cells/StickerEmojiCell.java | 2 +- .../com/b44t/ui/Cells/StickerSetCell.java | 2 +- .../main/java/com/b44t/ui/Cells/UserCell.java | 2 +- .../java/com/b44t/ui/Cells/WallpaperCell.java | 2 +- .../main/java/com/b44t/ui/ChatActivity.java | 4 +- .../b44t/ui/Components/AvatarDrawable.java | 2 +- .../com/b44t/ui/Components/AvatarUpdater.java | 2 +- .../b44t/ui/Components/BackupImageView.java | 4 +- .../ui/Components/ChatActivityEnterView.java | 4 +- .../b44t/ui/Components/ChatAttachAlert.java | 2 +- .../ui/Components/ChatAvatarContainer.java | 2 +- .../com/b44t/ui/Components/EmojiView.java | 2 +- .../b44t/ui/Components/IdenticonDrawable.java | 2 +- .../b44t/ui/Components/PopupAudioView.java | 2 +- .../ui/Components/ScrollSlidingTabStrip.java | 2 +- .../com/b44t/ui/Components/StickersAlert.java | 4 +- .../java/com/b44t/ui/ContactAddActivity.java | 2 +- .../java/com/b44t/ui/ContactsActivity.java | 2 +- .../java/com/b44t/ui/DialogsActivity.java | 4 +- .../com/b44t/ui/GroupCreateFinalActivity.java | 2 +- .../main/java/com/b44t/ui/LaunchActivity.java | 13 ++-- .../java/com/b44t/ui/ManageSpaceActivity.java | 2 +- .../ui/NotificationsSettingsActivity.java | 2 +- .../java/com/b44t/ui/PhotoPickerActivity.java | 2 +- .../main/java/com/b44t/ui/PhotoViewer.java | 4 +- .../b44t/ui/PopupNotificationActivity.java | 4 +- .../java/com/b44t/ui/ProfileActivity.java | 4 +- .../b44t/ui/ProfileNotificationsActivity.java | 4 +- .../com/b44t/ui/StickerPreviewViewer.java | 2 +- .../java/com/b44t/ui/WallpapersActivity.java | 2 +- 80 files changed, 99 insertions(+), 197 deletions(-) rename MessengerProj/src/main/java/com/b44t/{tgnet => messenger}/ConnectionsManager.java (97%) rename MessengerProj/src/main/java/com/b44t/{tgnet => messenger}/TLObject.java (90%) rename MessengerProj/src/main/java/com/b44t/{tgnet => messenger}/TLRPC.java (93%) diff --git a/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java b/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java index 6ca36dcd5..a81d2c4d3 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java @@ -59,8 +59,6 @@ import android.widget.ListView; import android.widget.ProgressBar; import android.widget.TextView; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; import com.b44t.ui.ActionBar.BaseFragment; import com.b44t.ui.Components.ForegroundDetector; import com.b44t.ui.Components.TypefaceSpan; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java b/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java index 9583f4aab..6c7fcd581 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java @@ -26,7 +26,6 @@ import android.os.Build; import android.os.Handler; import android.os.PowerManager; -import com.b44t.tgnet.ConnectionsManager; import com.b44t.ui.Components.ForegroundDetector; import java.io.File; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ChatObject.java b/MessengerProj/src/main/java/com/b44t/messenger/ChatObject.java index 61058e2b3..b05567092 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ChatObject.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ChatObject.java @@ -8,8 +8,6 @@ package com.b44t.messenger; -import com.b44t.tgnet.TLRPC; - public class ChatObject { public static final int CHAT_TYPE_CHAT = 0; diff --git a/MessengerProj/src/main/java/com/b44t/tgnet/ConnectionsManager.java b/MessengerProj/src/main/java/com/b44t/messenger/ConnectionsManager.java similarity index 97% rename from MessengerProj/src/main/java/com/b44t/tgnet/ConnectionsManager.java rename to MessengerProj/src/main/java/com/b44t/messenger/ConnectionsManager.java index 1f2d9011f..c785f8184 100644 --- a/MessengerProj/src/main/java/com/b44t/tgnet/ConnectionsManager.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ConnectionsManager.java @@ -1,4 +1,4 @@ -package com.b44t.tgnet; +package com.b44t.messenger; import android.content.BroadcastReceiver; import android.content.Context; @@ -8,10 +8,6 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.PowerManager; -import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.FileLog; -import com.b44t.messenger.MrMailbox; - public class ConnectionsManager { public final static int RequestFlagFailOnServerErrors = 2; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/DownloadObject.java b/MessengerProj/src/main/java/com/b44t/messenger/DownloadObject.java index 7d3cce90d..ebf477de1 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/DownloadObject.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/DownloadObject.java @@ -8,8 +8,6 @@ package com.b44t.messenger; -import com.b44t.tgnet.TLObject; - public class DownloadObject { public TLObject object; public int type; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/FileLoadOperation.java b/MessengerProj/src/main/java/com/b44t/messenger/FileLoadOperation.java index bd187e5e6..990601235 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/FileLoadOperation.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/FileLoadOperation.java @@ -8,9 +8,6 @@ package com.b44t.messenger; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; - import java.io.RandomAccessFile; import java.io.File; import java.util.ArrayList; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/FileLoader.java b/MessengerProj/src/main/java/com/b44t/messenger/FileLoader.java index 8d46e0628..a26cde65b 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/FileLoader.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/FileLoader.java @@ -8,9 +8,6 @@ package com.b44t.messenger; -import com.b44t.tgnet.TLObject; -import com.b44t.tgnet.TLRPC; - import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/FileUploadOperation.java b/MessengerProj/src/main/java/com/b44t/messenger/FileUploadOperation.java index 497035a5b..c3a49ff21 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/FileUploadOperation.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/FileUploadOperation.java @@ -8,9 +8,6 @@ package com.b44t.messenger; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; - import java.io.FileInputStream; public class FileUploadOperation { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ImageLoader.java b/MessengerProj/src/main/java/com/b44t/messenger/ImageLoader.java index 7c8c0fd42..93fe4bef5 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ImageLoader.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ImageLoader.java @@ -25,9 +25,6 @@ import android.os.Build; import android.os.Environment; import android.provider.MediaStore; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLObject; -import com.b44t.tgnet.TLRPC; import com.b44t.ui.Components.AnimatedFileDrawable; import java.io.ByteArrayOutputStream; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ImageReceiver.java b/MessengerProj/src/main/java/com/b44t/messenger/ImageReceiver.java index d026c16d2..2156680df 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ImageReceiver.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ImageReceiver.java @@ -23,8 +23,6 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.view.View; -import com.b44t.tgnet.TLObject; -import com.b44t.tgnet.TLRPC; import com.b44t.ui.Components.AnimatedFileDrawable; public class ImageReceiver implements NotificationCenter.NotificationCenterDelegate { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java b/MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java index 2cfee5ab1..aa5ec5ee0 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java @@ -19,8 +19,7 @@ import android.text.format.DateFormat; import android.util.Xml; import com.b44t.messenger.time.FastDateFormat; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; + import org.xmlpull.v1.XmlPullParser; import java.io.File; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MediaController.java b/MessengerProj/src/main/java/com/b44t/messenger/MediaController.java index e2b28da20..98527ac4f 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MediaController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MediaController.java @@ -56,8 +56,6 @@ import com.b44t.messenger.video.InputSurface; import com.b44t.messenger.video.MP4Builder; import com.b44t.messenger.video.Mp4Movie; import com.b44t.messenger.video.OutputSurface; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; import com.b44t.ui.ChatActivity; import com.b44t.ui.PhotoViewer; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java index a1e3456e0..9eabb4fb3 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MessageObject.java @@ -20,8 +20,6 @@ import android.text.TextUtils; import android.text.style.URLSpan; import android.text.util.Linkify; -import com.b44t.tgnet.TLObject; -import com.b44t.tgnet.TLRPC; import com.b44t.ui.ActionBar.Theme; import com.b44t.ui.Components.TypefaceSpan; import com.b44t.ui.Components.URLSpanNoUnderline; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MessagesController.java b/MessengerProj/src/main/java/com/b44t/messenger/MessagesController.java index f0f4e65dd..6be95da2e 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MessagesController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MessagesController.java @@ -18,9 +18,6 @@ import android.os.Bundle; import com.b44t.messenger.query.DraftQuery; import com.b44t.messenger.query.MessagesQuery; import com.b44t.messenger.query.SearchQuery; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLObject; -import com.b44t.tgnet.TLRPC; import com.b44t.ui.ActionBar.BaseFragment; import com.b44t.ui.ChatActivity; import com.b44t.ui.ProfileActivity; @@ -193,11 +190,11 @@ public class MessagesController implements NotificationCenter.NotificationCenter final TLRPC.InputFile file = (TLRPC.InputFile) args[1]; if (uploadingAvatar != null && uploadingAvatar.equals(location)) { - TLRPC.TL_photos_uploadProfilePhoto req = new TLRPC.TL_photos_uploadProfilePhoto(); + /*TLRPC.TL_photos_uploadProfilePhoto req = new TLRPC.TL_photos_uploadProfilePhoto(); req.caption = ""; req.crop = new TLRPC.TL_inputPhotoCropAuto(); req.file = file; - req.geo_point = new TLRPC.TL_inputGeoPointEmpty(); + req.geo_point = new TLRPC.TL_inputGeoPointEmpty();*/ /*ConnectionsManager.getInstance().sendRequest(req, new RequestDelegate() { @Override public void run(TLObject response, TLRPC.TL_error error) { @@ -485,6 +482,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter } } + /* public void putChat(TLRPC.Chat chat, boolean fromCache) { if (chat == null) { return; @@ -538,7 +536,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter } } } + */ + /* public void putChats(ArrayList chats, boolean fromCache) { if (chats == null || chats.isEmpty()) { return; @@ -549,11 +549,14 @@ public class MessagesController implements NotificationCenter.NotificationCenter putChat(chat, fromCache); } } + */ + /* protected void clearFullUsers() { loadedFullUsers.clear(); loadedFullChats.clear(); } + */ /* public void loadDialogPhotos(final int did, final int offset, final int count, final long max_id, final boolean fromCache, final int classGuid) { @@ -730,6 +733,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter if (fromCache) { //MessagesStorage.getInstance().getDialogs(offset == 0 ? 0 : nextDialogsCacheOffset, count); } else { + /* TLRPC.TL_messages_getDialogs req = new TLRPC.TL_messages_getDialogs(); req.limit = count; boolean found = false; @@ -759,6 +763,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter if (!found) { req.offset_peer = new TLRPC.TL_inputPeerEmpty(); } + */ /*ConnectionsManager.getInstance().sendRequest(req, new RequestDelegate() { @Override public void run(TLObject response, TLRPC.TL_error error) { @@ -787,7 +792,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter } public void changeChatAvatar(int chat_id, TLRPC.InputFile uploadedAvatar) { - TLObject request; + /*TLObject request; { TLRPC.TL_messages_editChatPhoto req = new TLRPC.TL_messages_editChatPhoto(); req.chat_id = chat_id; @@ -799,7 +804,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter req.photo = new TLRPC.TL_inputChatPhotoEmpty(); } request = req; - } + }*/ /*ConnectionsManager.getInstance().sendRequest(request, new RequestDelegate() { @Override public void run(TLObject response, TLRPC.TL_error error) { @@ -1033,8 +1038,8 @@ public class MessagesController implements NotificationCenter.NotificationCenter progressDialog.setCanceledOnTouchOutside(false); progressDialog.setCancelable(false); - TLRPC.TL_contacts_resolveUsername req = new TLRPC.TL_contacts_resolveUsername(); - req.username = username; + /*TLRPC.TL_contacts_resolveUsername req = new TLRPC.TL_contacts_resolveUsername(); + req.username = username;*/ final int reqId = 0; /*ConnectionsManager.getInstance().sendRequest(req, new RequestDelegate() { @Override public void run(final TLObject response, final TLRPC.TL_error error) { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java index 3f0b97714..c55060962 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java @@ -29,8 +29,6 @@ package com.b44t.messenger; -import com.b44t.tgnet.TLRPC; - public class MrMailbox { public static long hMailbox = 0; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MusicBrowserService.java b/MessengerProj/src/main/java/com/b44t/messenger/MusicBrowserService.java index 0bbd6265d..65f0b2e80 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MusicBrowserService.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MusicBrowserService.java @@ -36,7 +36,6 @@ import android.os.SystemClock; import android.service.media.MediaBrowserService; import com.b44t.messenger.audioinfo.AudioInfo; -import com.b44t.tgnet.TLRPC; import com.b44t.ui.LaunchActivity; import java.io.File; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java b/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java index 21229f639..aa08acf69 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java @@ -34,8 +34,6 @@ import android.support.v4.app.NotificationManagerCompat; import android.support.v4.app.RemoteInput; import android.util.SparseArray; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; import com.b44t.ui.LaunchActivity; import com.b44t.ui.PopupNotificationActivity; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ScreenReceiver.java b/MessengerProj/src/main/java/com/b44t/messenger/ScreenReceiver.java index ee84d68df..7d95eed13 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/ScreenReceiver.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/ScreenReceiver.java @@ -12,8 +12,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.b44t.tgnet.ConnectionsManager; - public class ScreenReceiver extends BroadcastReceiver { @Override diff --git a/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java b/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java index 75eaeb3bd..3f5a989bf 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/SendMessagesHelper.java @@ -20,9 +20,6 @@ import android.widget.Toast; import com.b44t.messenger.audioinfo.AudioInfo; import com.b44t.messenger.query.DraftQuery; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLObject; -import com.b44t.tgnet.TLRPC; import java.io.File; import java.io.RandomAccessFile; diff --git a/MessengerProj/src/main/java/com/b44t/tgnet/TLObject.java b/MessengerProj/src/main/java/com/b44t/messenger/TLObject.java similarity index 90% rename from MessengerProj/src/main/java/com/b44t/tgnet/TLObject.java rename to MessengerProj/src/main/java/com/b44t/messenger/TLObject.java index cbc9b1544..091ef2fdf 100644 --- a/MessengerProj/src/main/java/com/b44t/tgnet/TLObject.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/TLObject.java @@ -6,7 +6,7 @@ * Copyright Nikolai Kudashov, 2013-2016. */ -package com.b44t.tgnet; +package com.b44t.messenger; public class TLObject { } diff --git a/MessengerProj/src/main/java/com/b44t/tgnet/TLRPC.java b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java similarity index 93% rename from MessengerProj/src/main/java/com/b44t/tgnet/TLRPC.java rename to MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java index 13aacbd71..4abd07e81 100644 --- a/MessengerProj/src/main/java/com/b44t/tgnet/TLRPC.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/TLRPC.java @@ -6,7 +6,7 @@ * Copyright Nikolai Kudashov, 2013-2016. */ -package com.b44t.tgnet; +package com.b44t.messenger; import java.util.ArrayList; import java.util.HashMap; @@ -33,9 +33,6 @@ public class TLRPC { public FileLocation photo_big; } - public static class TL_chatPhotoEmpty extends ChatPhoto { - } - public static class DocumentAttribute extends TLObject { public int w; public int h; @@ -172,9 +169,6 @@ public class TLRPC { public static class TL_inputGeoPoint extends InputGeoPoint { } - public static class TL_inputGeoPointEmpty extends InputGeoPoint { - } - public static class Audio extends TLObject { public long id; public int date; @@ -560,7 +554,7 @@ public class TLRPC { public boolean deactivated; public int id; public String title; - public ChatPhoto photo; + public final ChatPhoto photo = null; public int date; public int version; public boolean editor; @@ -570,7 +564,6 @@ public class TLRPC { public boolean left; public String username; public boolean restricted; - public boolean democracy; public boolean signatures; public String restriction_reason; public boolean min; @@ -696,18 +689,6 @@ public class TLRPC { public ArrayList documents = new ArrayList<>(); } - public static class InputChatPhoto extends TLObject { - public InputPhoto id; - public InputPhotoCrop crop; - public InputFile file; - } - - public static class TL_inputChatPhotoEmpty extends InputChatPhoto { - } - - public static class TL_inputChatUploadedPhoto extends InputChatPhoto { - } - public static class InputPhoto extends TLObject { public long id; public long access_hash; @@ -733,21 +714,6 @@ public class TLRPC { public Peer peer; } - public static class InputPhotoCrop extends TLObject { - public double crop_left; - public double crop_top; - } - - public static class TL_inputPhotoCropAuto extends InputPhotoCrop { - } - - public static class TL_messages_getDialogs extends TLObject { - public int offset_date; - public int offset_id; - public InputPeer offset_peer; - public int limit; - } - public static class TL_messages_search extends TLObject { public int flags; public InputPeer peer; @@ -766,30 +732,6 @@ public class TLRPC { public int limit; } - public static class TL_messages_editChatPhoto extends TLObject { - public int chat_id; - public InputChatPhoto photo; - } - - public static class TL_photos_uploadProfilePhoto extends TLObject { - public InputFile file; - public String caption; - public InputGeoPoint geo_point; - public InputPhotoCrop crop; - } - - public static class TL_contacts_resolveUsername extends TLObject { - public String username; - } - - public static class TL_messages_checkChatInvite extends TLObject { - public String hash; - } - - public static class TL_messages_importChatInvite extends TLObject { - public String hash; - } - public static class MessageMedia extends TLObject { public byte[] bytes; public Photo photo; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/UserConfig.java b/MessengerProj/src/main/java/com/b44t/messenger/UserConfig.java index 5889390d6..69388aabb 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/UserConfig.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/UserConfig.java @@ -12,8 +12,6 @@ import android.content.Context; import android.content.SharedPreferences; import android.util.Base64; -import com.b44t.tgnet.TLRPC; - import java.io.File; public class UserConfig { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/UserObject.java b/MessengerProj/src/main/java/com/b44t/messenger/UserObject.java index 0f99e588f..5f7b732c2 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/UserObject.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/UserObject.java @@ -8,8 +8,6 @@ package com.b44t.messenger; -import com.b44t.tgnet.TLRPC; - public class UserObject { public static boolean isDeleted(TLRPC.User user) { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/query/DraftQuery.java b/MessengerProj/src/main/java/com/b44t/messenger/query/DraftQuery.java index 210429c95..d9bb802ff 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/query/DraftQuery.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/query/DraftQuery.java @@ -10,7 +10,7 @@ package com.b44t.messenger.query; import android.text.TextUtils; import com.b44t.messenger.MrMailbox; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import java.util.ArrayList; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/query/MessagesQuery.java b/MessengerProj/src/main/java/com/b44t/messenger/query/MessagesQuery.java index 4395baa19..53d6c462f 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/query/MessagesQuery.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/query/MessagesQuery.java @@ -12,7 +12,7 @@ import android.text.Spannable; import com.b44t.messenger.MessageObject; import com.b44t.messenger.MessagesController; import com.b44t.messenger.Utilities; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Components.URLSpanUserMention; import java.util.ArrayList; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/query/MessagesSearchQuery.java b/MessengerProj/src/main/java/com/b44t/messenger/query/MessagesSearchQuery.java index 9e22b605a..e2fa66b81 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/query/MessagesSearchQuery.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/query/MessagesSearchQuery.java @@ -11,8 +11,8 @@ package com.b44t.messenger.query; import com.b44t.messenger.MessageObject; import com.b44t.messenger.MessagesController; import com.b44t.messenger.NotificationCenter; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.ConnectionsManager; +import com.b44t.messenger.TLRPC; import java.util.ArrayList; diff --git a/MessengerProj/src/main/java/com/b44t/messenger/query/SearchQuery.java b/MessengerProj/src/main/java/com/b44t/messenger/query/SearchQuery.java index aa764d5cd..cc06c6e43 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/query/SearchQuery.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/query/SearchQuery.java @@ -10,7 +10,7 @@ package com.b44t.messenger.query; import com.b44t.messenger.MessagesController; import com.b44t.messenger.NotificationCenter; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import java.util.ArrayList; import java.util.HashMap; 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 bade0f16b..2b37b7f3c 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/query/SharedMediaQuery.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/query/SharedMediaQuery.java @@ -13,7 +13,7 @@ import com.b44t.messenger.MessagesController; import com.b44t.messenger.MrMailbox; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.Utilities; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; public class SharedMediaQuery { diff --git a/MessengerProj/src/main/java/com/b44t/messenger/query/StickersQuery.java b/MessengerProj/src/main/java/com/b44t/messenger/query/StickersQuery.java index cdc42c8dc..dd4b095a5 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/query/StickersQuery.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/query/StickersQuery.java @@ -11,7 +11,7 @@ package com.b44t.messenger.query; import android.content.Context; import com.b44t.messenger.NotificationCenter; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import java.util.ArrayList; import java.util.HashMap; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/BaseFragment.java b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/BaseFragment.java index 523ab2b9b..eb1a2e677 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/BaseFragment.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/BaseFragment.java @@ -19,7 +19,7 @@ import android.view.View; import android.view.ViewGroup; import com.b44t.messenger.FileLog; -import com.b44t.tgnet.ConnectionsManager; +import com.b44t.messenger.ConnectionsManager; public class BaseFragment { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Adapters/BaseSearchAdapter.java b/MessengerProj/src/main/java/com/b44t/ui/Adapters/BaseSearchAdapter.java index 96c8a2b41..38e72c972 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Adapters/BaseSearchAdapter.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Adapters/BaseSearchAdapter.java @@ -8,8 +8,8 @@ package com.b44t.ui.Adapters; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLObject; +import com.b44t.messenger.ConnectionsManager; +import com.b44t.messenger.TLObject; import java.util.ArrayList; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Adapters/BaseSearchAdapterRecycler.java b/MessengerProj/src/main/java/com/b44t/ui/Adapters/BaseSearchAdapterRecycler.java index 731908257..f31d3a847 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Adapters/BaseSearchAdapterRecycler.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Adapters/BaseSearchAdapterRecycler.java @@ -9,8 +9,8 @@ package com.b44t.ui.Adapters; import com.b44t.messenger.support.widget.RecyclerView; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLObject; +import com.b44t.messenger.ConnectionsManager; +import com.b44t.messenger.TLObject; import java.util.ArrayList; import java.util.HashMap; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Adapters/ContactsAdapter.java b/MessengerProj/src/main/java/com/b44t/ui/Adapters/ContactsAdapter.java index 818f37731..edc9d9080 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Adapters/ContactsAdapter.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Adapters/ContactsAdapter.java @@ -15,7 +15,7 @@ import android.view.View; import android.view.ViewGroup; import com.b44t.messenger.MrMailbox; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Cells.UserCell; import java.util.HashMap; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Adapters/DialogsAdapter.java b/MessengerProj/src/main/java/com/b44t/ui/Adapters/DialogsAdapter.java index f61c412f5..564823fd9 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Adapters/DialogsAdapter.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Adapters/DialogsAdapter.java @@ -17,7 +17,7 @@ import android.view.ViewGroup; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.support.widget.RecyclerView; import com.b44t.messenger.MrMailbox; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Cells.DialogCell; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Adapters/DialogsSearchAdapter.java b/MessengerProj/src/main/java/com/b44t/ui/Adapters/DialogsSearchAdapter.java index 3cfe370ae..4238af5d3 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Adapters/DialogsSearchAdapter.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Adapters/DialogsSearchAdapter.java @@ -23,9 +23,9 @@ import com.b44t.messenger.support.widget.LinearLayoutManager; import com.b44t.messenger.support.widget.RecyclerView; import com.b44t.messenger.FileLog; import com.b44t.messenger.R; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLObject; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.ConnectionsManager; +import com.b44t.messenger.TLObject; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Cells.DialogCell; import com.b44t.ui.Cells.GreySectionCell; import com.b44t.ui.Cells.HashtagSearchCell; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Adapters/MentionsAdapter.java b/MessengerProj/src/main/java/com/b44t/ui/Adapters/MentionsAdapter.java index f881a7be7..b8c7203dc 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Adapters/MentionsAdapter.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Adapters/MentionsAdapter.java @@ -18,8 +18,8 @@ import com.b44t.messenger.MessagesController; import com.b44t.messenger.UserObject; import com.b44t.messenger.query.SearchQuery; import com.b44t.messenger.support.widget.RecyclerView; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.ConnectionsManager; +import com.b44t.messenger.TLRPC; import com.b44t.ui.ActionBar.BaseFragment; import com.b44t.ui.Cells.ContextLinkCell; import com.b44t.ui.Cells.MentionCell; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Adapters/SearchAdapter.java b/MessengerProj/src/main/java/com/b44t/ui/Adapters/SearchAdapter.java index b80443693..5bafd64e4 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Adapters/SearchAdapter.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Adapters/SearchAdapter.java @@ -15,8 +15,8 @@ import android.view.ViewGroup; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.LocaleController; import com.b44t.messenger.R; -import com.b44t.tgnet.TLObject; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLObject; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.ContactsController; import com.b44t.messenger.FileLog; import com.b44t.messenger.MessagesController; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Adapters/StickersAdapter.java b/MessengerProj/src/main/java/com/b44t/ui/Adapters/StickersAdapter.java index bfc850bac..36ab193ef 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Adapters/StickersAdapter.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Adapters/StickersAdapter.java @@ -20,7 +20,7 @@ import com.b44t.messenger.Utilities; import com.b44t.messenger.query.StickersQuery; import com.b44t.messenger.support.widget.RecyclerView; import com.b44t.messenger.FileLoader; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Cells.StickerCell; import java.io.File; diff --git a/MessengerProj/src/main/java/com/b44t/ui/AudioPlayerActivity.java b/MessengerProj/src/main/java/com/b44t/ui/AudioPlayerActivity.java index 6dc2528ab..8c8851109 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/AudioPlayerActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/AudioPlayerActivity.java @@ -27,7 +27,7 @@ import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.audioinfo.AudioInfo; import com.b44t.messenger.FileLoader; import com.b44t.messenger.R; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.ActionBar.ActionBar; import com.b44t.ui.ActionBar.BaseFragment; import com.b44t.ui.ActionBar.Theme; diff --git a/MessengerProj/src/main/java/com/b44t/ui/AudioSelectActivity.java b/MessengerProj/src/main/java/com/b44t/ui/AudioSelectActivity.java index 795bcf1da..1fa002f14 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/AudioSelectActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/AudioSelectActivity.java @@ -27,7 +27,7 @@ import com.b44t.messenger.ApplicationLoader; import com.b44t.messenger.FileLoader; import com.b44t.messenger.FileLog; import com.b44t.messenger.R; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.UserConfig; import com.b44t.messenger.Utilities; import com.b44t.ui.ActionBar.ActionBar; diff --git a/MessengerProj/src/main/java/com/b44t/ui/BlockedUsersActivity.java b/MessengerProj/src/main/java/com/b44t/ui/BlockedUsersActivity.java index 45416a346..230203ef9 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/BlockedUsersActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/BlockedUsersActivity.java @@ -25,7 +25,7 @@ import android.widget.TextView; import com.b44t.messenger.LocaleController; import com.b44t.messenger.MrMailbox; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.MessagesController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatActionCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatActionCell.java index 8a712fdd3..ed4c71ecd 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatActionCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatActionCell.java @@ -27,7 +27,7 @@ import com.b44t.messenger.MessageObject; import com.b44t.messenger.MessagesController; import com.b44t.messenger.FileLoader; import com.b44t.messenger.FileLog; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.UserConfig; import com.b44t.ui.ActionBar.Theme; import com.b44t.ui.PhotoViewer; 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 118fc85fa..666154b41 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ChatMessageCell.java @@ -44,7 +44,7 @@ import com.b44t.messenger.MrMailbox; import com.b44t.messenger.R; import com.b44t.messenger.UserObject; import com.b44t.messenger.browser.Browser; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Components.AvatarDrawable; import com.b44t.ui.Components.LinkPath; import com.b44t.ui.Components.RadialProgress; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/ContextLinkCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/ContextLinkCell.java index 5c7310853..0b68c79b0 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ContextLinkCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ContextLinkCell.java @@ -33,7 +33,7 @@ import com.b44t.messenger.MediaController; import com.b44t.messenger.MessageObject; import com.b44t.messenger.R; import com.b44t.messenger.Utilities; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Components.LetterDrawable; import com.b44t.ui.Components.RadialProgress; import com.b44t.ui.ActionBar.Theme; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java index fdfbf8525..2676e3118 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java @@ -30,7 +30,7 @@ import com.b44t.messenger.MessageObject; import com.b44t.messenger.MrMailbox; // EDIT BY MR import com.b44t.messenger.FileLog; import com.b44t.messenger.query.DraftQuery; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.Emoji; import com.b44t.messenger.MessagesController; import com.b44t.messenger.R; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerProfileCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerProfileCell.java index fae3949dc..ce7e55749 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerProfileCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/DrawerProfileCell.java @@ -34,7 +34,7 @@ import com.b44t.messenger.MrMailbox; import com.b44t.messenger.ApplicationLoader; import com.b44t.messenger.FileLog; import com.b44t.messenger.R; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Components.LayoutHelper; import com.b44t.ui.ActionBar.Theme; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/HintDialogCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/HintDialogCell.java index 540ecfcc2..e58cc290e 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/HintDialogCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/HintDialogCell.java @@ -27,7 +27,7 @@ import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.ContactsController; import com.b44t.messenger.MessagesController; import com.b44t.messenger.R; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Components.AvatarDrawable; import com.b44t.ui.Components.BackupImageView; import com.b44t.ui.Components.LayoutHelper; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/MentionCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/MentionCell.java index 42c6b49c8..b0ed70ea5 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/MentionCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/MentionCell.java @@ -21,7 +21,7 @@ import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.Emoji; import com.b44t.messenger.R; import com.b44t.messenger.UserObject; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Components.AvatarDrawable; import com.b44t.ui.Components.BackupImageView; import com.b44t.ui.Components.LayoutHelper; 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 9393c9d2e..089e6c4e8 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/ProfileSearchCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/ProfileSearchCell.java @@ -25,9 +25,9 @@ import com.b44t.messenger.LocaleController; import com.b44t.messenger.MessagesController; import com.b44t.messenger.UserObject; import com.b44t.messenger.R; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLObject; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.ConnectionsManager; +import com.b44t.messenger.TLObject; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.UserConfig; import com.b44t.ui.Components.AvatarDrawable; import com.b44t.ui.ActionBar.Theme; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/StickerCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/StickerCell.java index f1bee3f1d..c6d01d454 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/StickerCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/StickerCell.java @@ -16,7 +16,7 @@ import android.widget.FrameLayout; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.R; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Components.BackupImageView; import com.b44t.ui.Components.LayoutHelper; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/StickerEmojiCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/StickerEmojiCell.java index 0fd28e89c..eab1d0e0a 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/StickerEmojiCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/StickerEmojiCell.java @@ -20,7 +20,7 @@ import android.widget.TextView; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.Emoji; import com.b44t.messenger.query.StickersQuery; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Components.BackupImageView; import com.b44t.ui.Components.LayoutHelper; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/StickerSetCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/StickerSetCell.java index 48377831a..aeb86086b 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/StickerSetCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/StickerSetCell.java @@ -24,7 +24,7 @@ import android.widget.TextView; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.LocaleController; import com.b44t.messenger.R; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.ActionBar.Theme; import com.b44t.ui.Components.BackupImageView; import com.b44t.ui.Components.LayoutHelper; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/UserCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/UserCell.java index 7009392fe..fccbea434 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/UserCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/UserCell.java @@ -18,7 +18,7 @@ import android.widget.ImageView; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.LocaleController; import com.b44t.messenger.R; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Components.AvatarDrawable; import com.b44t.ui.Components.BackupImageView; import com.b44t.ui.Components.CheckBox; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/WallpaperCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/WallpaperCell.java index 0a010ad92..aa1386711 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/WallpaperCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/WallpaperCell.java @@ -17,7 +17,7 @@ import android.widget.ImageView; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.R; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Components.BackupImageView; import com.b44t.ui.Components.LayoutHelper; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java index 965db8ec6..a7ef1b8ba 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java @@ -79,8 +79,8 @@ import com.b44t.messenger.support.widget.LinearLayoutManager; import com.b44t.messenger.support.widget.RecyclerView; import com.b44t.messenger.ApplicationLoader; import com.b44t.messenger.FileLoader; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.ConnectionsManager; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.FileLog; import com.b44t.messenger.MessageObject; import com.b44t.messenger.MessagesController; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarDrawable.java b/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarDrawable.java index 98f68b7b7..2a7528599 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarDrawable.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarDrawable.java @@ -22,7 +22,7 @@ import android.text.TextPaint; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.FileLog; import com.b44t.messenger.R; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.ApplicationLoader; public class AvatarDrawable extends Drawable { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarUpdater.java b/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarUpdater.java index 22e50dde0..5fe46da84 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarUpdater.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/AvatarUpdater.java @@ -22,7 +22,7 @@ import android.provider.MediaStore; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.ImageLoader; import com.b44t.messenger.MediaController; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.FileLoader; import com.b44t.messenger.FileLog; import com.b44t.messenger.NotificationCenter; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/BackupImageView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/BackupImageView.java index eca26ea0e..72f5b2190 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/BackupImageView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/BackupImageView.java @@ -17,8 +17,8 @@ import android.util.AttributeSet; import android.view.View; import com.b44t.messenger.ImageReceiver; -import com.b44t.tgnet.TLObject; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLObject; +import com.b44t.messenger.TLRPC; public class BackupImageView extends View { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java index b35a09389..0252cc98a 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java @@ -62,8 +62,8 @@ import com.b44t.messenger.FileLog; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; import com.b44t.messenger.query.MessagesQuery; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.ConnectionsManager; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.UserConfig; import com.b44t.ui.ActionBar.ActionBar; import com.b44t.messenger.AnimatorListenerAdapterProxy; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAttachAlert.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAttachAlert.java index 0dd96dd23..69d6c3dda 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAttachAlert.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAttachAlert.java @@ -53,7 +53,7 @@ import com.b44t.messenger.query.SearchQuery; import com.b44t.messenger.support.widget.LinearLayoutManager; import com.b44t.messenger.R; import com.b44t.messenger.support.widget.RecyclerView; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.ActionBar.BottomSheet; import com.b44t.ui.ActionBar.Theme; import com.b44t.ui.Cells.PhotoAttachCameraCell; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAvatarContainer.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAvatarContainer.java index 7ac9e9480..07856d8e5 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAvatarContainer.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ChatAvatarContainer.java @@ -17,7 +17,7 @@ import android.widget.FrameLayout; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.MrMailbox; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.ActionBar.ActionBar; import com.b44t.ui.ActionBar.SimpleTextView; import com.b44t.ui.ActionBar.Theme; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java index a7b163366..6740ba45e 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java @@ -52,7 +52,7 @@ import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import com.b44t.messenger.support.widget.GridLayoutManager; import com.b44t.messenger.support.widget.RecyclerView; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Cells.ContextLinkCell; import com.b44t.ui.Cells.EmptyCell; import com.b44t.ui.Cells.StickerEmojiCell; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/IdenticonDrawable.java b/MessengerProj/src/main/java/com/b44t/ui/Components/IdenticonDrawable.java index d78f93099..5bdc8904d 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/IdenticonDrawable.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/IdenticonDrawable.java @@ -14,7 +14,7 @@ import android.graphics.Paint; import android.graphics.drawable.Drawable; import com.b44t.messenger.AndroidUtilities; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; public class IdenticonDrawable extends Drawable { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/PopupAudioView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/PopupAudioView.java index 25d2caf46..f32e6f8aa 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/PopupAudioView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/PopupAudioView.java @@ -24,7 +24,7 @@ import com.b44t.messenger.MessagesController; import com.b44t.messenger.FileLoader; import com.b44t.messenger.R; import com.b44t.messenger.MessageObject; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.ActionBar.Theme; import com.b44t.ui.Cells.BaseCell; diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/ScrollSlidingTabStrip.java b/MessengerProj/src/main/java/com/b44t/ui/Components/ScrollSlidingTabStrip.java index 77d9b068a..c8a79d598 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/ScrollSlidingTabStrip.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/ScrollSlidingTabStrip.java @@ -21,7 +21,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import com.b44t.messenger.AndroidUtilities; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; public class ScrollSlidingTabStrip extends HorizontalScrollView { diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/StickersAlert.java b/MessengerProj/src/main/java/com/b44t/ui/Components/StickersAlert.java index 41faa25c0..08112a21b 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/StickersAlert.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/StickersAlert.java @@ -37,8 +37,8 @@ import com.b44t.messenger.R; import com.b44t.messenger.query.StickersQuery; import com.b44t.messenger.support.widget.GridLayoutManager; import com.b44t.messenger.support.widget.RecyclerView; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.ConnectionsManager; +import com.b44t.messenger.TLRPC; import com.b44t.ui.ActionBar.BottomSheet; import com.b44t.ui.ActionBar.Theme; import com.b44t.ui.Cells.StickerEmojiCell; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ContactAddActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ContactAddActivity.java index c44f19912..30fd97458 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ContactAddActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ContactAddActivity.java @@ -31,7 +31,7 @@ import android.widget.Toast; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.LocaleController; import com.b44t.messenger.MrMailbox; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.MessagesController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java index 1fcabfd0d..67626d8a4 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java @@ -48,7 +48,7 @@ import com.b44t.messenger.ContactsController; import com.b44t.messenger.LocaleController; import com.b44t.messenger.MrMailbox; import com.b44t.messenger.Utilities; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.FileLog; import com.b44t.messenger.MessagesController; import com.b44t.messenger.NotificationCenter; diff --git a/MessengerProj/src/main/java/com/b44t/ui/DialogsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/DialogsActivity.java index 61185fe4f..a1eef03f3 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/DialogsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/DialogsActivity.java @@ -51,7 +51,7 @@ import com.b44t.messenger.query.SearchQuery; import com.b44t.messenger.support.widget.LinearLayoutManager; import com.b44t.messenger.support.widget.RecyclerView; import com.b44t.messenger.FileLog; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.ContactsController; import com.b44t.messenger.MessagesController; import com.b44t.messenger.NotificationCenter; @@ -355,7 +355,7 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter. if (dialogsSearchAdapter.isGlobalSearch(position)) { ArrayList chats = new ArrayList<>(); chats.add((TLRPC.Chat) obj); - MessagesController.getInstance().putChats(chats, false); + //MessagesController.getInstance().putChats(chats, false); //MessagesStorage.getInstance().putUsersAndChats(null, chats, false, true); } if (((TLRPC.Chat) obj).id > 0) { diff --git a/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java b/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java index 2f5fe778b..b51d54020 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java @@ -32,7 +32,7 @@ import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.ChatObject; import com.b44t.messenger.LocaleController; import com.b44t.messenger.MrMailbox; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.MessagesController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; diff --git a/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java b/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java index a1d4b8354..e35c574f6 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java @@ -57,8 +57,8 @@ import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; import com.b44t.messenger.browser.Browser; import com.b44t.messenger.query.DraftQuery; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.ConnectionsManager; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.UserConfig; import com.b44t.ui.Adapters.DrawerLayoutAdapter; import com.b44t.ui.ActionBar.ActionBarLayout; @@ -74,7 +74,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -1149,8 +1148,8 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa }); */ } else if (group != null) { if (state == 0) { - final TLRPC.TL_messages_checkChatInvite req = new TLRPC.TL_messages_checkChatInvite(); - req.hash = group; + /*final TLRPC.TL_messages_checkChatInvite req = new TLRPC.TL_messages_checkChatInvite(); + req.hash = group;*/ requestId = 0; /* ConnectionsManager.getInstance().sendRequest(req, new RequestDelegate() { @Override public void run(final TLObject response, final TLRPC.TL_error error) { @@ -1209,8 +1208,8 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa } }, ConnectionsManager.RequestFlagFailOnServerErrors); */ } else if (state == 1) { - TLRPC.TL_messages_importChatInvite req = new TLRPC.TL_messages_importChatInvite(); - req.hash = group; + /*TLRPC.TL_messages_importChatInvite req = new TLRPC.TL_messages_importChatInvite(); + req.hash = group;*/ /* ConnectionsManager.getInstance().sendRequest(req, new RequestDelegate() { @Override diff --git a/MessengerProj/src/main/java/com/b44t/ui/ManageSpaceActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ManageSpaceActivity.java index 4ed5329dd..8cb68da3b 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ManageSpaceActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ManageSpaceActivity.java @@ -28,7 +28,7 @@ import com.b44t.messenger.ApplicationLoader; import com.b44t.messenger.LocaleController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; -import com.b44t.tgnet.ConnectionsManager; +import com.b44t.messenger.ConnectionsManager; import com.b44t.ui.ActionBar.ActionBarLayout; import com.b44t.ui.ActionBar.BaseFragment; import com.b44t.ui.ActionBar.DrawerLayoutContainer; diff --git a/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java index 87f9a311d..fee858f05 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java @@ -31,7 +31,7 @@ import com.b44t.messenger.LocaleController; import com.b44t.messenger.NotificationsController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.ApplicationLoader; -import com.b44t.tgnet.ConnectionsManager; +import com.b44t.messenger.ConnectionsManager; import com.b44t.messenger.FileLog; import com.b44t.messenger.R; import com.b44t.ui.Adapters.BaseFragmentAdapter; diff --git a/MessengerProj/src/main/java/com/b44t/ui/PhotoPickerActivity.java b/MessengerProj/src/main/java/com/b44t/ui/PhotoPickerActivity.java index c5895f51f..9ad476e15 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/PhotoPickerActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/PhotoPickerActivity.java @@ -36,7 +36,7 @@ import com.b44t.messenger.volley.RequestQueue; import com.b44t.messenger.volley.toolbox.Volley; import com.b44t.messenger.ApplicationLoader; import com.b44t.messenger.R; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.MessageObject; import com.b44t.ui.ActionBar.ActionBarMenu; import com.b44t.ui.ActionBar.ActionBarMenuItem; diff --git a/MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java b/MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java index 9fb3c9171..bae2de0c5 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java +++ b/MessengerProj/src/main/java/com/b44t/ui/PhotoViewer.java @@ -68,8 +68,8 @@ import com.b44t.messenger.MediaController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; import com.b44t.messenger.support.widget.LinearLayoutManager; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.ConnectionsManager; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.MessageObject; import com.b44t.messenger.Utilities; import com.b44t.ui.ActionBar.Theme; diff --git a/MessengerProj/src/main/java/com/b44t/ui/PopupNotificationActivity.java b/MessengerProj/src/main/java/com/b44t/ui/PopupNotificationActivity.java index 84ef99891..6c5315794 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/PopupNotificationActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/PopupNotificationActivity.java @@ -48,8 +48,8 @@ import com.b44t.messenger.FileLoader; import com.b44t.messenger.FileLog; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.ConnectionsManager; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.MessageObject; import com.b44t.ui.ActionBar.ActionBar; import com.b44t.ui.ActionBar.ActionBarMenu; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java index 14ea75e65..9c3af6b75 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java @@ -52,7 +52,7 @@ import com.b44t.messenger.query.SharedMediaQuery; import com.b44t.messenger.ApplicationLoader; import com.b44t.messenger.support.widget.LinearLayoutManager; import com.b44t.messenger.support.widget.RecyclerView; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.FileLog; import com.b44t.messenger.MessagesController; @@ -602,7 +602,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); CharSequence[] items; TLRPC.Chat chat = MrMailbox.chatId2chat(chat_id); - if (chat.photo == null || chat.photo.photo_big == null || chat.photo instanceof TLRPC.TL_chatPhotoEmpty) { + if (chat.photo == null || chat.photo.photo_big == null /*|| chat.photo instanceof TLRPC.TL_chatPhotoEmpty*/) { items = new CharSequence[]{LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley)}; } else { items = new CharSequence[]{LocaleController.getString("FromCamera", R.string.FromCamera), LocaleController.getString("FromGalley", R.string.FromGalley), LocaleController.getString("DeletePhoto", R.string.DeletePhoto)}; diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java index e37a32726..c2ae263d0 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java @@ -38,8 +38,8 @@ import com.b44t.messenger.FileLog; import com.b44t.messenger.LocaleController; import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; -import com.b44t.tgnet.ConnectionsManager; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.ConnectionsManager; +import com.b44t.messenger.TLRPC; import com.b44t.ui.ActionBar.Theme; import com.b44t.ui.Adapters.BaseFragmentAdapter; import com.b44t.ui.Cells.TextColorCell; diff --git a/MessengerProj/src/main/java/com/b44t/ui/StickerPreviewViewer.java b/MessengerProj/src/main/java/com/b44t/ui/StickerPreviewViewer.java index 4db4e5010..39031b788 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/StickerPreviewViewer.java +++ b/MessengerProj/src/main/java/com/b44t/ui/StickerPreviewViewer.java @@ -26,7 +26,7 @@ import android.widget.FrameLayout; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.ImageReceiver; import com.b44t.messenger.FileLog; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.ui.Cells.ContextLinkCell; import com.b44t.ui.Cells.StickerCell; import com.b44t.ui.Cells.StickerEmojiCell; diff --git a/MessengerProj/src/main/java/com/b44t/ui/WallpapersActivity.java b/MessengerProj/src/main/java/com/b44t/ui/WallpapersActivity.java index 7f0a7598e..b2e58509a 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/WallpapersActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/WallpapersActivity.java @@ -42,7 +42,7 @@ import com.b44t.messenger.LocaleController; import com.b44t.messenger.support.widget.LinearLayoutManager; import com.b44t.messenger.support.widget.RecyclerView; import com.b44t.messenger.ApplicationLoader; -import com.b44t.tgnet.TLRPC; +import com.b44t.messenger.TLRPC; import com.b44t.messenger.FileLoader; import com.b44t.messenger.FileLog; import com.b44t.messenger.NotificationCenter;