From 6f60ba113e032ccdd71f7287b50cce85b77a9916 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Mon, 5 Dec 2016 12:29:07 +0100 Subject: [PATCH] Remove ChatObject class. --- .../main/java/com/b44t/messenger/ChatObject.java | 15 --------------- .../main/java/com/b44t/ui/ContactsActivity.java | 2 -- .../com/b44t/ui/GroupCreateFinalActivity.java | 5 +---- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 MessengerProj/src/main/java/com/b44t/messenger/ChatObject.java diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ChatObject.java b/MessengerProj/src/main/java/com/b44t/messenger/ChatObject.java deleted file mode 100644 index 2209464fd..000000000 --- a/MessengerProj/src/main/java/com/b44t/messenger/ChatObject.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This is the source code of Telegram for Android v. 3.x.x. - * It is licensed under GNU GPL v. 2 or later. - * You should have received a copy of the license in this archive (see LICENSE). - * - * Copyright Nikolai Kudashov, 2013-2016. - */ - -package com.b44t.messenger; - -public class ChatObject { - - public static final int CHAT_TYPE_CHAT = 0; - -} diff --git a/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java index e9b364ce9..3add3e9a9 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java @@ -43,7 +43,6 @@ import android.widget.TextView; import com.b44t.messenger.AndroidUtilities; import com.b44t.messenger.ApplicationLoader; -import com.b44t.messenger.ChatObject; import com.b44t.messenger.ContactsController; import com.b44t.messenger.LocaleController; import com.b44t.messenger.MrContact; @@ -233,7 +232,6 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter result.addAll(selectedContacts.keySet()); Bundle args = new Bundle(); args.putIntegerArrayList("result", result); - args.putInt("chatType", ChatObject.CHAT_TYPE_CHAT); presentFragment(new GroupCreateFinalActivity(args)); } } diff --git a/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java b/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java index 37640f96f..17e838961 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java @@ -29,7 +29,6 @@ import android.widget.ListView; import android.widget.Toast; import com.b44t.messenger.AndroidUtilities; -import com.b44t.messenger.ChatObject; import com.b44t.messenger.LocaleController; import com.b44t.messenger.MrContact; import com.b44t.messenger.MrMailbox; @@ -62,13 +61,11 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati private AvatarDrawable avatarDrawable; private AvatarUpdater avatarUpdater = new AvatarUpdater(); private String nameToSet = null; - private int chatType = ChatObject.CHAT_TYPE_CHAT; private final static int done_button = 1; public GroupCreateFinalActivity(Bundle args) { super(args); - chatType = args.getInt("chatType", ChatObject.CHAT_TYPE_CHAT); avatarDrawable = new AvatarDrawable(); } @@ -232,7 +229,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati } nameTextView = new EditText(context); - nameTextView.setHint(chatType == ChatObject.CHAT_TYPE_CHAT ? LocaleController.getString("EnterGroupNamePlaceholder", R.string.EnterGroupNamePlaceholder) : LocaleController.getString("EnterListName", R.string.EnterListName)); + nameTextView.setHint(LocaleController.getString("EnterGroupNamePlaceholder", R.string.EnterGroupNamePlaceholder)); if (nameToSet != null) { nameTextView.setText(nameToSet); nameToSet = null;