Mercurial Mercurial > beem > jingle / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moving otr actions in a submenu
authorNikita Kozlov <nikita@beem-project.com>
Wed, 25 May 2011 22:23:16 +0200
changeset 948 547bb144e3a4
parent 947 5441ea00c4f1
child 949 defdbe820907
moving otr actions in a submenu
res/menu/chat.xml file | annotate | diff | comparison | revisions
res/values/strings.xml file | annotate | diff | comparison | revisions
src/com/beem/project/beem/ui/Chat.java file | annotate | diff | comparison | revisions 
--- a/res/menu/chat.xml	Wed May 25 01:31:07 2011 +0200
+++ b/res/menu/chat.xml	Wed May 25 22:23:16 2011 +0200
@@ -7,14 +7,19 @@
 	</group>
 	<item android:id="@+id/chat_menu_close_chat" android:visible="true"
 		android:title="@string/chat_menu_close_chat" android:icon="@drawable/ic_menu_end_conversation" />
-	<item android:id="@+id/chat_menu_start_otr_session" android:visible="true"
-		android:title="@string/chat_menu_start_otr_session" />
-	<item android:id="@+id/chat_menu_listen_otr_session" android:visible="true"
-		android:title="@string/chat_menu_listen_otr_session" />
-	<item android:id="@+id/chat_menu_stop_otr_session" android:visible="true"
-		android:title="@string/chat_menu_stop_otr_session" />
-	<item android:id="@+id/chat_menu_otr_local_key" android:visible="true"
-		android:title="@string/chat_menu_otr_local_key" />
-	<item android:id="@+id/chat_menu_otr_remote_key" android:visible="true"
-		android:title="@string/chat_menu_otr_remote_key" />
+	<item android:id="@+id/chat_menu_otr_submenu" android:visible="true"
+		android:title="@string/chat_menu_otr_submenu">
+		<menu>
+			<item android:id="@+id/chat_menu_start_otr_session"
+				android:visible="true" android:title="@string/chat_menu_start_otr_session" />
+			<item android:id="@+id/chat_menu_listen_otr_session"
+				android:visible="true" android:title="@string/chat_menu_listen_otr_session" />
+			<item android:id="@+id/chat_menu_stop_otr_session"
+				android:visible="true" android:title="@string/chat_menu_stop_otr_session" />
+			<item android:id="@+id/chat_menu_otr_local_key" android:visible="true"
+				android:title="@string/chat_menu_otr_local_key" />
+			<item android:id="@+id/chat_menu_otr_remote_key"
+				android:visible="true" android:title="@string/chat_menu_otr_remote_key" />
+		</menu>
+	</item>
 </menu>
--- a/res/values/strings.xml	Wed May 25 01:31:07 2011 +0200
+++ b/res/values/strings.xml	Wed May 25 22:23:16 2011 +0200
@@ -276,6 +276,7 @@
 	<string name="chat_menu_stop_otr_session">Stop OTR session</string>
 	<string name="chat_menu_otr_local_key">OTR local key</string>
 	<string name="chat_menu_otr_remote_key">OTR remote key</string>
+	<string name="chat_menu_otr_submenu">OTR actions</string>
 	<string name="chat_dialog_change_chat_title">Opened chats</string>
 	<string name="chat_menu_close_chat">Close this chat</string>
 	<string name="chat_no_more_chats">No more active chats</string>
--- a/src/com/beem/project/beem/ui/Chat.java	Wed May 25 01:31:07 2011 +0200
+++ b/src/com/beem/project/beem/ui/Chat.java	Wed May 25 22:23:16 2011 +0200
@@ -294,7 +294,6 @@
 	    case R.id.chat_menu_change_chat:
 		try {
 		    final List<Contact> openedChats = mChatManager.getOpenedChatList();
-		    Log.d(TAG, "opened chats = " + openedChats);
 		    Dialog chatList = new ChatList(Chat.this, openedChats).create();
 		    chatList.show();
 		} catch (RemoteException e) {
@@ -311,7 +310,6 @@
 		break;
 	    case R.id.chat_menu_start_otr_session:
 		try {
-		    Log.d(TAG, "opened otr chats = " + mChat + " for " + mContact);
 		    if (mChat == null) {
 			mChat = mChatManager.createChat(mContact, mMessageListener);
 			if (mChat != null) {
@@ -325,7 +323,6 @@
 		break;
 	    case R.id.chat_menu_listen_otr_session:
 		try {
-		    Log.d(TAG, "listen otr chats = " + mChat + " for " + mContact);
 		    if (mChat == null) {
 			mChat = mChatManager.createChat(mContact, mMessageListener);
 			if (mChat != null) {
@@ -339,7 +336,6 @@
 		break;
 	    case R.id.chat_menu_stop_otr_session:
 		try {
-		    Log.d(TAG, "close otr chats = " + mChat + " for " + mContact);
 		    if (mChat == null) {
 			mChat = mChatManager.createChat(mContact, mMessageListener);
 			if (mChat != null) {
@@ -360,7 +356,6 @@
 			}
 		    }
 		    String fk = mChat.getLocalOtrFingerprint();
-		    Log.d(TAG, "otr chats = " + mChat + " for " + mContact + " fk " + fk);
 		    Dialog otrDialog = new DisplayOtrFingerprint(this, fk, true).create();
 		    otrDialog.show();
 		} catch (RemoteException e) {
@@ -376,7 +371,6 @@
 			}
 		    }
 		    String fk = mChat.getRemoteOtrFingerprint();
-		    Log.d(TAG, "otr chats = " + mChat + " for " + mContact + " fk " + fk);
 		    Dialog otrDialog = new DisplayOtrFingerprint(this, fk, false).create();
 		    otrDialog.show();
 		} catch (RemoteException e) {
BEEM-Jingle