Skip to content

X
xabber-android
Commit 3ffd3912 authored by Alexander Ivanov's avatar Alexander Ivanov
Browse files
Options

Move chat viewer option menu creation to fragment.

parent 41cbecc5
Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 237 deletions
src/com/xabber/android/ui/ChatViewer.java
View file @ 3ffd3912
......@@ -25,7 +25,6 @@ import android.view.ContextMenu.ContextMenuInfo;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.SubMenu;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
......@@ -38,31 +37,21 @@ import android.widget.TextView.OnEditorActionListener;
import com.xabber.android.data.ActivityManager;
import com.xabber.android.data.Application;
import com.xabber.android.data.LogManager;
import com.xabber.android.data.NetworkException;
import com.xabber.android.data.SettingsManager;
import com.xabber.android.data.SettingsManager.ChatsHideKeyboard;
import com.xabber.android.data.SettingsManager.SecurityOtrMode;
import com.xabber.android.data.account.OnAccountChangedListener;
import com.xabber.android.data.entity.BaseEntity;
import com.xabber.android.data.extension.archive.MessageArchiveManager;
import com.xabber.android.data.extension.attention.AttentionManager;
import com.xabber.android.data.extension.cs.ChatStateManager;
import com.xabber.android.data.extension.muc.MUCManager;
import com.xabber.android.data.extension.muc.RoomChat;
import com.xabber.android.data.extension.muc.RoomState;
import com.xabber.android.data.extension.otr.OTRManager;
import com.xabber.android.data.extension.otr.SecurityLevel;
import com.xabber.android.data.intent.EntityIntentBuilder;
import com.xabber.android.data.message.AbstractChat;
import com.xabber.android.data.message.MessageItem;
import com.xabber.android.data.message.MessageManager;
import com.xabber.android.data.message.OnChatChangedListener;
import com.xabber.android.data.message.RegularChat;
import com.xabber.android.data.notification.NotificationManager;
import com.xabber.android.data.roster.OnContactChangedListener;
import com.xabber.android.ui.adapter.ChatViewerAdapter;
import com.xabber.android.ui.adapter.OnTextChangedListener;
import com.xabber.android.ui.dialog.ChatExportDialogFragment;
import com.xabber.android.ui.helper.ManagedActivity;
import com.xabber.android.ui.widget.PageSwitcher;
import com.xabber.android.ui.widget.PageSwitcher.OnSelectListener;
......@@ -87,39 +76,10 @@ public class ChatViewer extends ManagedActivity implements
*/
private static final String ACTION_ATTENTION = "com.xabber.android.data.ATTENTION";
/**
* Minimum number of new messages to be requested from the server side
* archive.
*/
private static final int MINIMUM_MESSAGES_TO_LOAD = 10;
private static final String SAVED_ACCOUNT = "com.xabber.android.ui.ChatViewer.SAVED_ACCOUNT";
private static final String SAVED_USER = "com.xabber.android.ui.ChatViewer.SAVED_USER";
private static final String SAVED_EXIT_ON_SEND = "com.xabber.android.ui.ChatViewer.EXIT_ON_SEND";
private static final int OPTION_MENU_VIEW_CONTACT_ID = 0x02;
private static final int OPTION_MENU_CHAT_LIST_ID = 0x03;
private static final int OPTION_MENU_CLOSE_CHAT_ID = 0x04;
private static final int OPTION_MENU_SHOW_HISTORY_ID = 0x05;
private static final int OPTION_MENU_SETTINGS_ID = 0x08;
private static final int OPTION_MENU_CLEAR_HISTORY_ID = 0x09;
private static final int OPTION_MENU_CLEAR_MESSAGE_ID = 0x0a;
private static final int OPTION_MENU_EXPORT_CHAT_ID = 0x0c;
private static final int OPTION_MENU_CALL_ATTENTION_ID = 0x0d;
private static final int OPTION_MENU_LEAVE_ROOM_ID = 0x10;
private static final int OPTION_MENU_JOIN_ROOM_ID = 0x11;
private static final int OPTION_MENU_MUC_INVITE_ID = 0x12;
private static final int OPTION_MENU_EDIT_ROOM_ID = 0x13;
private static final int OPTION_MENU_OCCUPANT_LIST_ID = 0x14;
private static final int OPTION_MENU_START_OTR_ID = 0x20;
private static final int OPTION_MENU_END_OTR_ID = 0x21;
private static final int OPTION_MENU_VERIFY_FINGERPRINT_ID = 0x22;
private static final int OPTION_MENU_VERIFY_QUESTION_ID = 0x23;
private static final int OPTION_MENU_VERIFY_SECRET_ID = 0x24;
private static final int OPTION_MENU_REFRESH_OTR_ID = 0x25;
private ChatViewerAdapter chatViewerAdapter;
private PageSwitcher pageSwitcher;
......@@ -250,205 +210,10 @@ public class ChatViewer extends ManagedActivity implements
public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
menu.clear();
AbstractChat abstractChat = MessageManager.getInstance().getChat(
actionWithAccount, actionWithUser);
if (abstractChat != null && abstractChat instanceof RoomChat) {
if (((RoomChat) abstractChat).getState() == RoomState.unavailable)
menu.add(0, OPTION_MENU_JOIN_ROOM_ID, 0,
getResources().getText(R.string.muc_join)).setIcon(
android.R.drawable.ic_menu_add);
else
menu.add(0, OPTION_MENU_MUC_INVITE_ID, 0,
getResources().getText(R.string.muc_invite)).setIcon(
android.R.drawable.ic_menu_add);
} else {
menu.add(0, OPTION_MENU_VIEW_CONTACT_ID, 0,
getResources().getText(R.string.contact_editor)).setIcon(
android.R.drawable.ic_menu_edit);
}
menu.add(0, OPTION_MENU_CHAT_LIST_ID, 0, getText(R.string.chat_list))
.setIcon(R.drawable.ic_menu_friendslist);
menu.add(0, OPTION_MENU_SETTINGS_ID, 0, getText(R.string.chat_settings))
.setIcon(android.R.drawable.ic_menu_preferences);
menu.add(0, OPTION_MENU_SHOW_HISTORY_ID, 0,
getText(R.string.show_history)).setIcon(
R.drawable.ic_menu_archive);
if (abstractChat != null
&& abstractChat instanceof RoomChat
&& ((RoomChat) abstractChat).getState() != RoomState.unavailable) {
if (((RoomChat) abstractChat).getState() == RoomState.error)
menu.add(0, OPTION_MENU_EDIT_ROOM_ID, 0,
getResources().getText(R.string.muc_edit)).setIcon(
android.R.drawable.ic_menu_edit);
else
menu.add(0, OPTION_MENU_LEAVE_ROOM_ID, 0,
getResources().getText(R.string.muc_leave)).setIcon(
android.R.drawable.ic_menu_close_clear_cancel);
} else {
menu.add(0, OPTION_MENU_CLOSE_CHAT_ID, 0,
getResources().getText(R.string.close_chat)).setIcon(
android.R.drawable.ic_menu_close_clear_cancel);
}
menu.add(0, OPTION_MENU_CLEAR_MESSAGE_ID, 0,
getResources().getText(R.string.clear_message)).setIcon(
R.drawable.ic_menu_stop);
menu.add(0, OPTION_MENU_CLEAR_HISTORY_ID, 0,
getText(R.string.clear_history));
menu.add(0, OPTION_MENU_EXPORT_CHAT_ID, 0,
getText(R.string.export_chat));
if (abstractChat != null && abstractChat instanceof RegularChat) {
menu.add(0, OPTION_MENU_CALL_ATTENTION_ID, 0,
getText(R.string.call_attention));
SecurityLevel securityLevel = OTRManager.getInstance()
.getSecurityLevel(abstractChat.getAccount(),
abstractChat.getUser());
SubMenu otrMenu = menu.addSubMenu(getText(R.string.otr_encryption));
otrMenu.setHeaderTitle(R.string.otr_encryption);
if (securityLevel == SecurityLevel.plain)
otrMenu.add(0, OPTION_MENU_START_OTR_ID, 0,
getText(R.string.otr_start))
.setEnabled(
SettingsManager.securityOtrMode() != SecurityOtrMode.disabled);
else
otrMenu.add(0, OPTION_MENU_REFRESH_OTR_ID, 0,
getText(R.string.otr_refresh));
otrMenu.add(0, OPTION_MENU_END_OTR_ID, 0, getText(R.string.otr_end))
.setEnabled(securityLevel != SecurityLevel.plain);
otrMenu.add(0, OPTION_MENU_VERIFY_FINGERPRINT_ID, 0,
getText(R.string.otr_verify_fingerprint)).setEnabled(
securityLevel != SecurityLevel.plain);
otrMenu.add(0, OPTION_MENU_VERIFY_QUESTION_ID, 0,
getText(R.string.otr_verify_question)).setEnabled(
securityLevel != SecurityLevel.plain);
otrMenu.add(0, OPTION_MENU_VERIFY_SECRET_ID, 0,
getText(R.string.otr_verify_secret)).setEnabled(
securityLevel != SecurityLevel.plain);
}
if (abstractChat != null && abstractChat instanceof RoomChat
&& ((RoomChat) abstractChat).getState() == RoomState.available)
menu.add(0, OPTION_MENU_OCCUPANT_LIST_ID, 0, getResources()
.getText(R.string.occupant_list));
chatViewerAdapter.onPrepareOptionsMenu(actionWithView, menu);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item);
switch (item.getItemId()) {
case OPTION_MENU_VIEW_CONTACT_ID:
startActivity(ContactEditor.createIntent(this, actionWithAccount,
actionWithUser));
return true;
case OPTION_MENU_CHAT_LIST_ID:
startActivity(ChatList.createIntent(this));
return true;
case OPTION_MENU_CLOSE_CHAT_ID:
MessageManager.getInstance().closeChat(actionWithAccount,
actionWithUser);
NotificationManager.getInstance().removeMessageNotification(
actionWithAccount, actionWithUser);
close();
return true;
case OPTION_MENU_CLEAR_HISTORY_ID:
MessageManager.getInstance().clearHistory(actionWithAccount,
actionWithUser);
chatViewerAdapter.onChatChange(actionWithView, false);
return true;
case OPTION_MENU_SHOW_HISTORY_ID:
MessageManager.getInstance().requestToLoadLocalHistory(
actionWithAccount, actionWithUser);
MessageArchiveManager.getInstance().requestHistory(
actionWithAccount, actionWithUser,
MINIMUM_MESSAGES_TO_LOAD, 0);
chatViewerAdapter.onChange();
chatViewerAdapter.onChatChange(actionWithView, false);
return true;
case OPTION_MENU_SETTINGS_ID:
startActivity(ChatEditor.createIntent(this, actionWithAccount,
actionWithUser));
return true;
case OPTION_MENU_CLEAR_MESSAGE_ID:
((EditText) actionWithView.findViewById(R.id.chat_input))
.setText("");
return true;
case OPTION_MENU_EXPORT_CHAT_ID:
ChatExportDialogFragment.newInstance(actionWithAccount,
actionWithUser).show(getSupportFragmentManager(),
"CHAT_EXPORT");
return true;
case OPTION_MENU_CALL_ATTENTION_ID:
try {
AttentionManager.getInstance().sendAttention(actionWithAccount,
actionWithUser);
} catch (NetworkException e) {
Application.getInstance().onError(e);
}
return true;
case OPTION_MENU_JOIN_ROOM_ID:
MUCManager.getInstance().joinRoom(actionWithAccount,
actionWithUser, true);
return true;
case OPTION_MENU_LEAVE_ROOM_ID:
MUCManager.getInstance().leaveRoom(actionWithAccount,
actionWithUser);
MessageManager.getInstance().closeChat(actionWithAccount,
actionWithUser);
NotificationManager.getInstance().removeMessageNotification(
actionWithAccount, actionWithUser);
close();
return true;
case OPTION_MENU_MUC_INVITE_ID:
startActivity(ContactList.createRoomInviteIntent(this,
actionWithAccount, actionWithUser));
return true;
case OPTION_MENU_EDIT_ROOM_ID:
startActivity(MUCEditor.createIntent(this, actionWithAccount,
actionWithUser));
return true;
case OPTION_MENU_OCCUPANT_LIST_ID:
startActivity(OccupantList.createIntent(this, actionWithAccount,
actionWithUser));
return true;
case OPTION_MENU_START_OTR_ID:
try {
OTRManager.getInstance().startSession(actionWithAccount,
actionWithUser);
} catch (NetworkException e) {
Application.getInstance().onError(e);
}
return true;
case OPTION_MENU_REFRESH_OTR_ID:
try {
OTRManager.getInstance().refreshSession(actionWithAccount,
actionWithUser);
} catch (NetworkException e) {
Application.getInstance().onError(e);
}
return true;
case OPTION_MENU_END_OTR_ID:
try {
OTRManager.getInstance().endSession(actionWithAccount,
actionWithUser);
} catch (NetworkException e) {
Application.getInstance().onError(e);
}
return true;
case OPTION_MENU_VERIFY_FINGERPRINT_ID:
startActivity(FingerprintViewer.createIntent(this,
actionWithAccount, actionWithUser));
return true;
case OPTION_MENU_VERIFY_QUESTION_ID:
startActivity(QuestionViewer.createIntent(this, actionWithAccount,
actionWithUser, true, false, null));
return true;
case OPTION_MENU_VERIFY_SECRET_ID:
startActivity(QuestionViewer.createIntent(this, actionWithAccount,
actionWithUser, false, false, null));
return true;
}
return false;
}
@Override
public void onCreateContextMenu(ContextMenu menu, View view,
ContextMenuInfo menuInfo) {
......@@ -568,7 +333,7 @@ public class ChatViewer extends ManagedActivity implements
return super.onKeyDown(keyCode, event);
}
private void close() {
void close() {
finish();
if (!Intent.ACTION_SEND.equals(getIntent().getAction())) {
ActivityManager.getInstance().clearStack(false);
......
src/com/xabber/android/ui/ChatViewerFragment.java
View file @ 3ffd3912
......@@ -6,6 +6,9 @@ import android.support.v4.app.FragmentActivity;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.SubMenu;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnKeyListener;
......@@ -19,17 +22,28 @@ import android.widget.ListView;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import com.xabber.android.data.Application;
import com.xabber.android.data.LogManager;
import com.xabber.android.data.NetworkException;
import com.xabber.android.data.SettingsManager;
import com.xabber.android.data.SettingsManager.SecurityOtrMode;
import com.xabber.android.data.extension.archive.MessageArchiveManager;
import com.xabber.android.data.extension.attention.AttentionManager;
import com.xabber.android.data.extension.muc.MUCManager;
import com.xabber.android.data.extension.muc.RoomChat;
import com.xabber.android.data.extension.muc.RoomState;
import com.xabber.android.data.extension.otr.OTRManager;
import com.xabber.android.data.extension.otr.SecurityLevel;
import com.xabber.android.data.message.AbstractChat;
import com.xabber.android.data.message.MessageManager;
import com.xabber.android.data.message.RegularChat;
import com.xabber.android.data.message.chat.ChatManager;
import com.xabber.android.data.notification.NotificationManager;
import com.xabber.android.data.roster.AbstractContact;
import com.xabber.android.data.roster.RosterManager;
import com.xabber.android.ui.adapter.ChatMessageAdapter;
import com.xabber.android.ui.adapter.OnTextChangedListener;
import com.xabber.android.ui.dialog.ChatExportDialogFragment;
import com.xabber.android.ui.helper.AbstractAvatarInflaterHelper;
import com.xabber.android.ui.helper.ContactTitleInflater;
import com.xabber.android.ui.widget.PageSwitcher;
......@@ -37,6 +51,12 @@ import com.xabber.androiddev.R;
public class ChatViewerFragment {
/**
* Minimum number of new messages to be requested from the server side
* archive.
*/
private static final int MINIMUM_MESSAGES_TO_LOAD = 10;
/**
* Delay before hide pages.
*/
......@@ -172,6 +192,246 @@ public class ChatViewerFragment {
return view;
}
public boolean onPrepareOptionsMenu(Menu menu) {
final String account = chatMessageAdapter.getAccount();
final String user = chatMessageAdapter.getUser();
AbstractChat abstractChat = MessageManager.getInstance().getChat(
account, user);
if (abstractChat != null && abstractChat instanceof RoomChat) {
if (((RoomChat) abstractChat).getState() == RoomState.unavailable)
menu.add(R.string.muc_join)
.setIcon(android.R.drawable.ic_menu_add)
.setOnMenuItemClickListener(
new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
MUCManager.getInstance().joinRoom(
account, user, true);
return true;
}
});
else
menu.add(R.string.muc_invite)
.setIcon(android.R.drawable.ic_menu_add)
.setIntent(
ContactList.createRoomInviteIntent(
getActivity(), account, user));
} else {
menu.add(R.string.contact_editor)
.setIcon(android.R.drawable.ic_menu_edit)
.setIntent(
ContactEditor.createIntent(getActivity(), account,
user));
}
menu.add(R.string.chat_list).setIcon(R.drawable.ic_menu_friendslist)
.setIntent(ChatList.createIntent(getActivity()));
menu.add(R.string.chat_settings)
.setIcon(android.R.drawable.ic_menu_preferences)
.setIntent(
ChatEditor.createIntent(getActivity(), account, user));
menu.add(R.string.show_history)
.setIcon(R.drawable.ic_menu_archive)
.setOnMenuItemClickListener(
new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
MessageManager.getInstance()
.requestToLoadLocalHistory(account,
user);
MessageArchiveManager.getInstance()
.requestHistory(account, user,
MINIMUM_MESSAGES_TO_LOAD, 0);
onChatChange(false);
return true;
}
});
if (abstractChat != null
&& abstractChat instanceof RoomChat
&& ((RoomChat) abstractChat).getState() != RoomState.unavailable) {
if (((RoomChat) abstractChat).getState() == RoomState.error)
menu.add(R.string.muc_edit)
.setIcon(android.R.drawable.ic_menu_edit)
.setIntent(
MUCEditor.createIntent(getActivity(), account,
user));
else
menu.add(R.string.muc_leave)
.setIcon(android.R.drawable.ic_menu_close_clear_cancel)
.setOnMenuItemClickListener(
new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
MUCManager.getInstance().leaveRoom(
account, user);
MessageManager.getInstance().closeChat(
account, user);
NotificationManager.getInstance()
.removeMessageNotification(
account, user);
((ChatViewer) getActivity()).close();
return true;
}
});
} else {
menu.add(R.string.close_chat)
.setIcon(android.R.drawable.ic_menu_close_clear_cancel)
.setOnMenuItemClickListener(
new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
MessageManager.getInstance().closeChat(
account, user);
NotificationManager.getInstance()
.removeMessageNotification(account,
user);
((ChatViewer) getActivity()).close();
return true;
}
});
}
menu.add(R.string.clear_message)
.setIcon(R.drawable.ic_menu_stop)
.setOnMenuItemClickListener(
new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
inputView.setText("");
return true;
}
});
menu.add(R.string.clear_history).setOnMenuItemClickListener(
new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
MessageManager.getInstance()
.clearHistory(account, user);
onChatChange(false);
return false;
}
});
menu.add(R.string.export_chat).setOnMenuItemClickListener(
new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
ChatExportDialogFragment
.newInstance(account, user)
.show(getActivity().getSupportFragmentManager(),
"CHAT_EXPORT");
return true;
}
});
if (abstractChat != null && abstractChat instanceof RegularChat) {
menu.add(R.string.call_attention).setOnMenuItemClickListener(
new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
try {
AttentionManager.getInstance().sendAttention(
account, user);
} catch (NetworkException e) {
Application.getInstance().onError(e);
}
return true;
}
});
SecurityLevel securityLevel = OTRManager.getInstance()
.getSecurityLevel(abstractChat.getAccount(),
abstractChat.getUser());
SubMenu otrMenu = menu.addSubMenu(R.string.otr_encryption);
otrMenu.setHeaderTitle(R.string.otr_encryption);
if (securityLevel == SecurityLevel.plain)
otrMenu.add(R.string.otr_start)
.setEnabled(
SettingsManager.securityOtrMode() != SecurityOtrMode.disabled)
.setOnMenuItemClickListener(
new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
try {
OTRManager
.getInstance()
.startSession(account, user);
} catch (NetworkException e) {
Application.getInstance()
.onError(e);
}
return true;
}
});
else
otrMenu.add(R.string.otr_refresh).setOnMenuItemClickListener(
new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
try {
OTRManager.getInstance().refreshSession(
account, user);
} catch (NetworkException e) {
Application.getInstance().onError(e);
}
return true;
}
});
otrMenu.add(R.string.otr_end)
.setEnabled(securityLevel != SecurityLevel.plain)
.setOnMenuItemClickListener(
new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
try {
OTRManager.getInstance().endSession(
account, user);
} catch (NetworkException e) {
Application.getInstance().onError(e);
}
return true;
}
});
otrMenu.add(R.string.otr_verify_fingerprint)
.setEnabled(securityLevel != SecurityLevel.plain)
.setIntent(
FingerprintViewer.createIntent(getActivity(),
account, user));
otrMenu.add(R.string.otr_verify_question)
.setEnabled(securityLevel != SecurityLevel.plain)
.setIntent(
QuestionViewer.createIntent(getActivity(), account,
user, true, false, null));
otrMenu.add(R.string.otr_verify_secret)
.setEnabled(securityLevel != SecurityLevel.plain)
.setIntent(
QuestionViewer.createIntent(getActivity(), account,
user, false, false, null));
}
if (abstractChat != null && abstractChat instanceof RoomChat
&& ((RoomChat) abstractChat).getState() == RoomState.available)
menu.add(R.string.occupant_list).setIntent(
OccupantList.createIntent(getActivity(), account, user));
return true;
}
public void setChat(AbstractChat chat) {
final String account = chat.getAccount();
final String user = chat.getUser();
......
src/com/xabber/android/ui/adapter/ChatViewerAdapter.java
View file @ 3ffd3912
......@@ -18,6 +18,7 @@ import java.util.ArrayList;
import java.util.Collection;
import android.support.v4.app.FragmentActivity;
import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
......@@ -120,6 +121,13 @@ public class ChatViewerAdapter extends BaseAdapter implements SaveStateAdapter,
((ChatViewerFragment) view.getTag()).onChatChange(incomingMessage);
}
/**
* Must be called on changes in chat (message sent, received, etc.).
*/
public void onPrepareOptionsMenu(View view, Menu menu) {
((ChatViewerFragment) view.getTag()).onPrepareOptionsMenu(menu);
}
@Override
public void onChange() {
activeChats = new ArrayList<AbstractChat>(MessageManager.getInstance()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023