sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed some ux glitches in editaccount

This commit is contained in:
Daniel Gultsch 2015-07-16 13:42:52 +02:00
parent babbd389f6
commit 6a329c7465
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View File

@ -123,11 +123,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
mAccount.setOption(Account.OPTION_REGISTER, registerNewAccount); mAccount.setOption(Account.OPTION_REGISTER, registerNewAccount);
xmppConnectionService.createAccount(mAccount); xmppConnectionService.createAccount(mAccount);
} }
if (jidToEdit != null) { if (jidToEdit != null && !mAccount.isOptionSet(Account.OPTION_DISABLED)) {
finish(); finish();
} else { } else {
updateSaveButton(); updateSaveButton();
updateAccountInformation(); updateAccountInformation(true);
} }
} }
@ -163,7 +163,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
updateSaveButton(); updateSaveButton();
} }
if (mAccount != null) { if (mAccount != null) {
updateAccountInformation(); updateAccountInformation(false);
} }
} }
}); });
@ -384,7 +384,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
xmppConnectionService.getKnownHosts()); xmppConnectionService.getKnownHosts());
if (this.jidToEdit != null) { if (this.jidToEdit != null) {
this.mAccount = xmppConnectionService.findAccountByJid(jidToEdit); this.mAccount = xmppConnectionService.findAccountByJid(jidToEdit);
updateAccountInformation(); updateAccountInformation(true);
} else if (this.xmppConnectionService.getAccounts().size() == 0) { } else if (this.xmppConnectionService.getAccounts().size() == 0) {
if (getActionBar() != null) { if (getActionBar() != null) {
getActionBar().setDisplayHomeAsUpEnabled(false); getActionBar().setDisplayHomeAsUpEnabled(false);
@ -419,9 +419,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
private void updateAccountInformation() { private void updateAccountInformation(boolean init) {
if (init) {
this.mAccountJid.setText(this.mAccount.getJid().toBareJid().toString()); this.mAccountJid.setText(this.mAccount.getJid().toBareJid().toString());
this.mPassword.setText(this.mAccount.getPassword()); this.mPassword.setText(this.mAccount.getPassword());
}
if (this.jidToEdit != null) { if (this.jidToEdit != null) {
this.mAvatar.setVisibility(View.VISIBLE); this.mAvatar.setVisibility(View.VISIBLE);
this.mAvatar.setImageBitmap(avatarService().get(this.mAccount, getPixel(72))); this.mAvatar.setImageBitmap(avatarService().get(this.mAccount, getPixel(72)));

1
src/main/res/layout/message_received.xml
View File

@ -51,7 +51,6 @@
style="?android:attr/buttonStyleSmall" style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/download_image"
android:visibility="gone" /> android:visibility="gone" />
<LinearLayout <LinearLayout

1
src/main/res/layout/message_sent.xml
View File

@ -51,7 +51,6 @@
style="?android:attr/buttonStyleSmall" style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/download_image"
android:visibility="gone" /> android:visibility="gone" />
<LinearLayout <LinearLayout