archive/conversations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
steckbrief 2016-01-08 17:29:15 +01:00
commit 06398afd40
3 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Conversations-Plus-ChangeLog.md
View file

@ -1,6 +1,9 @@
###Conversations+ ChangeLog ###Conversations+ ChangeLog
####Version 0.0.6 ####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 * Fixes FS#95: NPE when opening message details for failed file transfer
* Implements FS#89: Change about information * Implements FS#89: Change about information
* Implements FS#84: Setting for location to store received pictures * Implements FS#84: Setting for location to store received pictures

13
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View file

@ -23,6 +23,8 @@ import android.widget.TableLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogListener;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate; import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate;
@ -437,6 +439,15 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
this.mRegisterNew.setChecked(false); this.mRegisterNew.setChecked(false);
} }
if (this.mAccount.isOnlineAndConnected() && !this.mFetchingAvatar) { 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.mStats.setVisibility(View.VISIBLE);
this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(this, this.mAccount.getXmppConnection() this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(this, this.mAccount.getXmppConnection()
.getLastSessionEstablished())); .getLastSessionEstablished()));
@ -502,7 +513,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
} }
} else { } else {
if (this.mAccount.errorStatus()) { if (this.mAccount.errorStatus()) {
this.mAccountJid.setError(getString(this.mAccount.getStatus().getReadableId())); this.mAccountJid.setError(getString(this.mAccount.getStatus().getReadableId()));
if (init || !accountInfoEdited()) { if (init || !accountInfoEdited()) {
this.mAccountJid.requestFocus(); this.mAccountJid.requestFocus();
} }

19
src/main/res/layout/activity_edit_account.xml
View file

@ -37,7 +37,8 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_toRightOf="@+id/avater"> android:layout_toRightOf="@+id/avater"
android:id="@+id/editAccountBoxes">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -103,6 +104,22 @@
android:textColorHint="@color/secondaryText" android:textColorHint="@color/secondaryText"
android:textSize="?attr/TextSizeBody" /> android:textSize="?attr/TextSizeBody" />
</LinearLayout> </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> </RelativeLayout>
<LinearLayout <LinearLayout