Merge pull request #13 from kriztan/ActionBar_Subtitle

move typing info to ActionBar subtitle

6 files changed, 143 insertions, 122 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index e546f2149..b84995354 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -32,7 +32,7 @@ public class Contact implements ListItem, Blockable {
 	public static final String LAST_PRESENCE = "last_presence";
 	public static final String LAST_TIME = "last_time";
 	public static final String GROUPS = "groups";
-	public Lastseen lastseen = new Lastseen();
+	public static Lastseen lastseen = new Lastseen();
 	protected String accountUuid;
 	protected String systemName;
 	protected String serverName;
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index b76689ad3..2241474f4 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -274,6 +274,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 					name = user.getJid().toBareJid().toString();
 				}
 				menu.setHeaderTitle(name);
+				MenuItem showContactDetails = menu.findItem(R.id.action_contact_details);
 				MenuItem startConversation = menu.findItem(R.id.start_conversation);
 				MenuItem giveMembership = menu.findItem(R.id.give_membership);
 				MenuItem removeMembership = menu.findItem(R.id.remove_membership);
@@ -282,6 +283,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 				MenuItem removeFromRoom = menu.findItem(R.id.remove_from_room);
 				MenuItem banFromConference = menu.findItem(R.id.ban_from_conference);
 				startConversation.setVisible(true);
+				showContactDetails.setVisible(true);
 				if (self.getAffiliation().ranks(MucOptions.Affiliation.ADMIN) &&
 						self.getAffiliation().outranks(user.getAffiliation())) {
 					if (mAdvancedMode) {
@@ -309,6 +311,9 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 	@Override
 	public boolean onContextItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
+			case R.id.action_contact_details:
+				switchToContactDetails(mSelectedUser.getContact());
+				return true;
 			case R.id.start_conversation:
 				startConversation(mSelectedUser);
 				return true;
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 6b0f89b1c..ecb21bec6 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -46,7 +46,9 @@ import eu.siacs.conversations.services.XmppConnectionService.OnConversationUpdat
 import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate;
 import eu.siacs.conversations.ui.adapter.ConversationAdapter;
 import eu.siacs.conversations.utils.ExceptionHelper;
+import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
+import eu.siacs.conversations.xmpp.chatstate.ChatState;
 
 public class ConversationActivity extends XmppActivity
 	implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast {
@@ -92,7 +94,7 @@ public class ConversationActivity extends XmppActivity
 	private boolean mActivityPaused = false;
 	private boolean mRedirected = true;
 
-	public Conversation getSelectedConversation() {
+    public Conversation getSelectedConversation() {
 		return this.mSelectedConversation;
 	}
 
@@ -295,19 +297,19 @@ public class ConversationActivity extends XmppActivity
 	public void switchToConversation(Conversation conversation) {
 		setSelectedConversation(conversation);
 		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
-				openConversation();
-			}
-		});
+            @Override
+            public void run() {
+                ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
+                openConversation();
+            }
+        });
 	}
 
 	private void updateActionBarTitle() {
 		updateActionBarTitle(isConversationsOverviewHideable() && !isConversationsOverviewVisable());
 	}
 
-	private void updateActionBarTitle(boolean titleShouldBeName) {
+    private void updateActionBarTitle(boolean titleShouldBeName) {
 		final ActionBar ab = getActionBar();
 		final Conversation conversation = getSelectedConversation();
 		if (ab != null) {
@@ -316,13 +318,25 @@ public class ConversationActivity extends XmppActivity
 				ab.setHomeButtonEnabled(true);
 				if (conversation.getMode() == Conversation.MODE_SINGLE || useSubjectToIdentifyConference()) {
 					ab.setTitle(conversation.getName());
+                    if (conversation.getMode() == Conversation.MODE_SINGLE) {
+                        //ab.setSubtitle(getString(R.string.contact_is_typing, conversation.getName()));
+
+                        ChatState state = conversation.getIncomingChatState();
+                        if (state == ChatState.COMPOSING) {
+                            ab.setSubtitle(getString(R.string.contact_is_typing, conversation.getName()));
+                        } else if (state == ChatState.PAUSED) {
+                            ab.setSubtitle(getString(R.string.contact_has_stopped_typing, conversation.getName()));
+                        }
+                    }
 				} else {
 					ab.setTitle(conversation.getJid().toBareJid().toString());
+                    ab.setSubtitle(null);
 				}
 			} else {
 				ab.setDisplayHomeAsUpEnabled(false);
 				ab.setHomeButtonEnabled(false);
 				ab.setTitle(R.string.app_name);
+                ab.setSubtitle(null);
 			}
 		}
 	}
@@ -457,7 +471,7 @@ public class ConversationActivity extends XmppActivity
 			conversation.setNextCounterpart(null);
 			callback.onPresenceSelected();
 		} else {
-			selectPresence(conversation,callback);
+			selectPresence(conversation, callback);
 		}
 	}
 
@@ -467,7 +481,7 @@ public class ConversationActivity extends XmppActivity
 		if (intent.resolveActivity(getPackageManager()) != null) {
 			return intent;
 		} else {
-			intent.setData(Uri.parse("http://play.google.com/store/apps/details?id="+packageId));
+			intent.setData(Uri.parse("http://play.google.com/store/apps/details?id=" + packageId));
 			return intent;
 		}
 	}
@@ -535,7 +549,7 @@ public class ConversationActivity extends XmppActivity
 				showInstallPgpDialog();
 			}
 		} else {
-			selectPresenceToAttachFile(attachmentChoice,encryption);
+			selectPresenceToAttachFile(attachmentChoice, encryption);
 		}
 	}
 
@@ -625,18 +639,18 @@ public class ConversationActivity extends XmppActivity
 		builder.setView(dialogView);
 		builder.setNegativeButton(getString(R.string.cancel), null);
 		builder.setPositiveButton(getString(R.string.delete_messages),
-				new OnClickListener() {
+                new OnClickListener() {
 
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						ConversationActivity.this.xmppConnectionService.clearConversationHistory(conversation);
-						if (endConversationCheckBox.isChecked()) {
-							endConversation(conversation);
-						} else {
-							updateConversationList();
-							ConversationActivity.this.mConversationFragment.updateMessages();
-						}
-					}
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        ConversationActivity.this.xmppConnectionService.clearConversationHistory(conversation);
+                        if (endConversationCheckBox.isChecked()) {
+                            endConversation(conversation);
+                        } else {
+                            updateConversationList();
+                            ConversationActivity.this.mConversationFragment.updateMessages();
+                        }
+                    }
 				});
 		builder.create().show();
 	}
@@ -656,28 +670,28 @@ public class ConversationActivity extends XmppActivity
 		}
 		attachFilePopup.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 
-			@Override
-			public boolean onMenuItemClick(MenuItem item) {
-				switch (item.getItemId()) {
-					case R.id.attach_choose_picture:
-						attachFile(ATTACHMENT_CHOICE_CHOOSE_IMAGE);
-						break;
-					case R.id.attach_take_picture:
-						attachFile(ATTACHMENT_CHOICE_TAKE_PHOTO);
-						break;
-					case R.id.attach_choose_file:
-						attachFile(ATTACHMENT_CHOICE_CHOOSE_FILE);
-						break;
-					case R.id.attach_record_voice:
-						attachFile(ATTACHMENT_CHOICE_RECORD_VOICE);
-						break;
-					case R.id.attach_location:
-						attachFile(ATTACHMENT_CHOICE_LOCATION);
-						break;
-				}
-				return false;
-			}
-		});
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                switch (item.getItemId()) {
+                    case R.id.attach_choose_picture:
+                        attachFile(ATTACHMENT_CHOICE_CHOOSE_IMAGE);
+                        break;
+                    case R.id.attach_take_picture:
+                        attachFile(ATTACHMENT_CHOICE_TAKE_PHOTO);
+                        break;
+                    case R.id.attach_choose_file:
+                        attachFile(ATTACHMENT_CHOICE_CHOOSE_FILE);
+                        break;
+                    case R.id.attach_record_voice:
+                        attachFile(ATTACHMENT_CHOICE_RECORD_VOICE);
+                        break;
+                    case R.id.attach_location:
+                        attachFile(ATTACHMENT_CHOICE_LOCATION);
+                        break;
+                }
+                return false;
+            }
+        });
 		attachFilePopup.show();
 	}
 
@@ -700,13 +714,13 @@ public class ConversationActivity extends XmppActivity
 				intent.putExtra("account", conversation.getAccount().getJid().toBareJid().toString());
 				switch (menuItem.getItemId()) {
 					case R.id.scan_fingerprint:
-						intent.putExtra("mode",VerifyOTRActivity.MODE_SCAN_FINGERPRINT);
+						intent.putExtra("mode", VerifyOTRActivity.MODE_SCAN_FINGERPRINT);
 						break;
 					case R.id.ask_question:
-						intent.putExtra("mode",VerifyOTRActivity.MODE_ASK_QUESTION);
+						intent.putExtra("mode", VerifyOTRActivity.MODE_ASK_QUESTION);
 						break;
 					case R.id.manual_verification:
-						intent.putExtra("mode",VerifyOTRActivity.MODE_MANUAL_VERIFICATION);
+						intent.putExtra("mode", VerifyOTRActivity.MODE_MANUAL_VERIFICATION);
 						break;
 				}
 				startActivity(intent);
@@ -795,23 +809,23 @@ public class ConversationActivity extends XmppActivity
 		final int[] durations = getResources().getIntArray(
 				R.array.mute_options_durations);
 		builder.setItems(R.array.mute_options_descriptions,
-				new OnClickListener() {
+                new OnClickListener() {
 
-					@Override
-					public void onClick(final DialogInterface dialog, final int which) {
-						final long till;
-						if (durations[which] == -1) {
-							till = Long.MAX_VALUE;
-						} else {
-							till = System.currentTimeMillis() + (durations[which] * 1000);
-						}
-						conversation.setMutedTill(till);
-						ConversationActivity.this.xmppConnectionService.databaseBackend
-							.updateConversation(conversation);
-						updateConversationList();
-						ConversationActivity.this.mConversationFragment.updateMessages();
-						invalidateOptionsMenu();
-					}
+                    @Override
+                    public void onClick(final DialogInterface dialog, final int which) {
+                        final long till;
+                        if (durations[which] == -1) {
+                            till = Long.MAX_VALUE;
+                        } else {
+                            till = System.currentTimeMillis() + (durations[which] * 1000);
+                        }
+                        conversation.setMutedTill(till);
+                        ConversationActivity.this.xmppConnectionService.databaseBackend
+                                .updateConversation(conversation);
+                        updateConversationList();
+                        ConversationActivity.this.mConversationFragment.updateMessages();
+                        invalidateOptionsMenu();
+                    }
 				});
 		builder.create().show();
 	}
@@ -840,7 +854,7 @@ public class ConversationActivity extends XmppActivity
 				handleViewConversationIntent(intent);
 			}
 		} else {
-			setIntent(intent);
+            setIntent(intent);
 		}
 	}
 
@@ -872,7 +886,7 @@ public class ConversationActivity extends XmppActivity
 		final int theme = findTheme();
 		final boolean usingEnterKey = usingEnterKey();
 		if (this.mTheme != theme || usingEnterKey != mUsingEnterKey) {
-			recreate();
+            recreate();
 		}
 		this.mActivityPaused = false;
 		if (this.xmppConnectionServiceBound) {
@@ -890,10 +904,10 @@ public class ConversationActivity extends XmppActivity
 		Conversation conversation = getSelectedConversation();
 		if (conversation != null) {
 			savedInstanceState.putString(STATE_OPEN_CONVERSATION,
-					conversation.getUuid());
+                    conversation.getUuid());
 		}
 		savedInstanceState.putBoolean(STATE_PANEL_OPEN,
-				isConversationsOverviewVisable());
+                isConversationsOverviewVisable());
 		if (this.mPendingImageUris.size() >= 1) {
 			savedInstanceState.putString(STATE_PENDING_URI, this.mPendingImageUris.get(0).toString());
 		}
@@ -1016,7 +1030,7 @@ public class ConversationActivity extends XmppActivity
 				uris.add(clipData.getItemAt(i).getUri());
 			}
 		} else {
-			uris.add(uri);
+            uris.add(uri);
 		}
 		return uris;
 	}
@@ -1077,22 +1091,22 @@ public class ConversationActivity extends XmppActivity
 		if (conversation == null) {
 			return;
 		}
-		xmppConnectionService.attachLocationToConversation(conversation,uri, new UiCallback<Message>() {
+		xmppConnectionService.attachLocationToConversation(conversation, uri, new UiCallback<Message>() {
 
-			@Override
-			public void success(Message message) {
-				xmppConnectionService.sendMessage(message);
-			}
+            @Override
+            public void success(Message message) {
+                xmppConnectionService.sendMessage(message);
+            }
 
-			@Override
-			public void error(int errorCode, Message object) {
+            @Override
+            public void error(int errorCode, Message object) {
 
-			}
+            }
 
-			@Override
-			public void userInputRequried(PendingIntent pi, Message object) {
+            @Override
+            public void userInputRequried(PendingIntent pi, Message object) {
 
-			}
+            }
 		});
 	}
 
@@ -1102,23 +1116,23 @@ public class ConversationActivity extends XmppActivity
 		}
 		prepareFileToast = Toast.makeText(getApplicationContext(),getText(R.string.preparing_file), Toast.LENGTH_LONG);
 		prepareFileToast.show();
-		xmppConnectionService.attachFileToConversation(conversation,uri, new UiCallback<Message>() {
-			@Override
-			public void success(Message message) {
-				hidePrepareFileToast();
-				xmppConnectionService.sendMessage(message);
-			}
+		xmppConnectionService.attachFileToConversation(conversation, uri, new UiCallback<Message>() {
+            @Override
+            public void success(Message message) {
+                hidePrepareFileToast();
+                xmppConnectionService.sendMessage(message);
+            }
 
-			@Override
-			public void error(int errorCode, Message message) {
-				displayErrorDialog(errorCode);
-			}
+            @Override
+            public void error(int errorCode, Message message) {
+                displayErrorDialog(errorCode);
+            }
 
-			@Override
-			public void userInputRequried(PendingIntent pi, Message message) {
+            @Override
+            public void userInputRequried(PendingIntent pi, Message message) {
 
-			}
-		});
+            }
+        });
 	}
 
 	private void attachImageToConversation(Conversation conversation, Uri uri) {
@@ -1128,25 +1142,25 @@ public class ConversationActivity extends XmppActivity
 		prepareFileToast = Toast.makeText(getApplicationContext(),getText(R.string.preparing_image), Toast.LENGTH_LONG);
 		prepareFileToast.show();
 		xmppConnectionService.attachImageToConversation(conversation, uri,
-				new UiCallback<Message>() {
+                new UiCallback<Message>() {
 
-					@Override
-					public void userInputRequried(PendingIntent pi,
-							Message object) {
-						hidePrepareFileToast();
-					}
+                    @Override
+                    public void userInputRequried(PendingIntent pi,
+                                                  Message object) {
+                        hidePrepareFileToast();
+                    }
 
-					@Override
-					public void success(Message message) {
-						xmppConnectionService.sendMessage(message);
-					}
+                    @Override
+                    public void success(Message message) {
+                        xmppConnectionService.sendMessage(message);
+                    }
 
-					@Override
-					public void error(int error, Message message) {
-						hidePrepareFileToast();
-						displayErrorDialog(error);
-					}
-				});
+                    @Override
+                    public void error(int error, Message message) {
+                        hidePrepareFileToast();
+                        displayErrorDialog(error);
+                    }
+                });
 	}
 
 	private void hidePrepareFileToast() {
@@ -1260,13 +1274,14 @@ public class ConversationActivity extends XmppActivity
 	public void OnUpdateBlocklist(Status status) {
 		this.refreshUi();
 		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				invalidateOptionsMenu();
-			}
-		});
+            @Override
+            public void run() {
+                invalidateOptionsMenu();
+            }
+        });
 	}
 
+
 	public void unblockConversation(final Blockable conversation) {
 		xmppConnectionService.sendUnblockRequest(conversation);
 	}
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 587e923aa..350b63e50 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -978,12 +978,13 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 	protected void updateStatusMessages() {
 		synchronized (this.messageList) {
 			if (conversation.getMode() == Conversation.MODE_SINGLE) {
+				/*
 				ChatState state = conversation.getIncomingChatState();
 				if (state == ChatState.COMPOSING) {
 					this.messageList.add(Message.createStatusMessage(conversation, getString(R.string.contact_is_typing, conversation.getName())));
 				} else if (state == ChatState.PAUSED) {
 					this.messageList.add(Message.createStatusMessage(conversation, getString(R.string.contact_has_stopped_typing, conversation.getName())));
-				} else {
+				} else { */
 					for (int i = this.messageList.size() - 1; i >= 0; --i) {
 						if (this.messageList.get(i).getStatus() == Message.STATUS_RECEIVED) {
 							return;
@@ -995,7 +996,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 							}
 						}
 					}
-				}
+				//}
 			}
 		}
 	}
diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index dc0f5d3eb..e691e858a 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
+	<item
+		android:id="@+id/action_contact_details"
+		android:title="@string/action_contact_details"
+		android:visible="false" />
+	<item
         android:id="@+id/start_conversation"
         android:title="@string/start_conversation"
         android:visible="false" />
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 528afed72..ab3f2fe9e 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -288,11 +288,7 @@
   <string name="conference_members_only">此讨论组只允许成员加入</string>
   <string name="conference_kicked">你被从此讨论组踢出</string>
   <string name="using_account">用账户  %s</string>
-<<<<<<< HEAD
-  <string name="checking_file">正在 HTTP 托管中检查图片</string>
   <string name="image_file_deleted">此图片已经被删除</string>
-=======
->>>>>>> 4f62793a67415e91f589924b70fdd5bdd35c284d
   <string name="not_connected_try_again">你没有连接。请稍后重试</string>
   <string name="message_options">消息选项</string>
   <string name="copy_text">拷贝文本</string>