Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

3 files changed, 33 insertions, 2 deletions

diff --git a/Conversations-Plus-ChangeLog.md b/Conversations-Plus-ChangeLog.md
index 8cb7db2f..5e7b7782 100644
--- a/Conversations-Plus-ChangeLog.md
+++ b/Conversations-Plus-ChangeLog.md
@@ -1,6 +1,9 @@
 ###Conversations+ ChangeLog
 
 ####Version 0.0.6
+* Fixes FS#107: Account can be edited while online
+* Implements FS#77: Open list of resources for own jid
+* Fixes FS#99: Adjust namespace according to XEP-0363
 * Fixes FS#95: NPE when opening message details for failed file transfer
 * Implements FS#89: Change about information
 * Implements FS#84: Setting for location to store received pictures
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 908c29d2..714a5c60 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -23,6 +23,8 @@ import android.widget.TableLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogListener;
+
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate;
@@ -437,6 +439,15 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			this.mRegisterNew.setChecked(false);
 		}
 		if (this.mAccount.isOnlineAndConnected() && !this.mFetchingAvatar) {
+            this.findViewById(R.id.editAccountBoxes).setVisibility(View.GONE);
+            this.findViewById(R.id.displayAccountFrame).setVisibility(View.VISIBLE);
+            TextView detailsAccountJid = (TextView)this.findViewById(R.id.detailsAccountJid);
+            if (this.mAccount.countPresences() > 0) {
+                detailsAccountJid.setText(this.mAccount.getJid().toBareJid().toString() + " (" + this.mAccount.countPresences() + ")");
+                detailsAccountJid.setOnClickListener(new ShowResourcesListDialogListener(EditAccountActivity.this, this.mAccount.getRoster().getContact(this.mAccount.getJid().toBareJid())));
+            } else {
+                detailsAccountJid.setText(this.mAccount.getJid().toBareJid().toString());
+            }
 			this.mStats.setVisibility(View.VISIBLE);
 			this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(this, this.mAccount.getXmppConnection()
 						.getLastSessionEstablished()));
@@ -502,7 +513,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			}
 		} else {
 			if (this.mAccount.errorStatus()) {
-				this.mAccountJid.setError(getString(this.mAccount.getStatus().getReadableId()));
+                this.mAccountJid.setError(getString(this.mAccount.getStatus().getReadableId()));
 				if (init || !accountInfoEdited()) {
 					this.mAccountJid.requestFocus();
 				}
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 9c951afd..0c9809bc 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -37,7 +37,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:layout_toRightOf="@+id/avater">
+                    android:layout_toRightOf="@+id/avater"
+                    android:id="@+id/editAccountBoxes">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -103,6 +104,22 @@
                     android:textColorHint="@color/secondaryText"
                     android:textSize="?attr/TextSizeBody" />
                 </LinearLayout>
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_toRightOf="@+id/avater"
+                    android:id="@+id/displayAccountFrame"
+                    android:visibility="gone">
+                    <TextView
+                        android:id="@+id/detailsAccountJid"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/account_settings_example_jabber_id"
+                        android:textColor="@color/primaryText"
+                        android:textSize="?attr/TextSizeHeadline"
+                        android:textStyle="bold" />
+                </LinearLayout>
             </RelativeLayout>
 
            <LinearLayout