diff options
Diffstat (limited to 'src/eu/siacs/conversations')
| -rw-r--r-- | src/eu/siacs/conversations/ui/ManageAccountActivity.java | 4 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/ui/PublishProfilePictureActivity.java | 24 |
2 files changed, 19 insertions, 9 deletions
diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java index 105275ce..238cf0a4 100644 --- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -100,7 +100,9 @@ public class ManageAccountActivity extends XmppActivity { .updateAccount(selectedAccountForActionMode); mode.finish(); } else if (item.getItemId() == R.id.mgmt_account_publish_avatar) { - startActivity(new Intent(getApplicationContext(), PublishProfilePictureActivity.class)); + Intent intent = new Intent(getApplicationContext(), PublishProfilePictureActivity.class); + intent.putExtra("account", selectedAccountForActionMode.getJid()); + startActivity(intent); } else if (item.getItemId() == R.id.mgmt_account_delete) { AlertDialog.Builder builder = new AlertDialog.Builder(activity); builder.setTitle(getString(R.string.mgmt_account_are_you_sure)); diff --git a/src/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/eu/siacs/conversations/ui/PublishProfilePictureActivity.java index 0e369a97..776ed774 100644 --- a/src/eu/siacs/conversations/ui/PublishProfilePictureActivity.java +++ b/src/eu/siacs/conversations/ui/PublishProfilePictureActivity.java @@ -11,6 +11,7 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.utils.PhoneHelper; public class PublishProfilePictureActivity extends XmppActivity { @@ -24,6 +25,8 @@ public class PublishProfilePictureActivity extends XmppActivity { private Uri avatarUri; + private Account account; + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -37,7 +40,7 @@ public class PublishProfilePictureActivity extends XmppActivity { @Override public void onClick(View v) { if (avatarUri!=null) { - xmppConnectionService.pushAvatar(null, avatarUri); + xmppConnectionService.pushAvatar(account, avatarUri); finish(); } } @@ -67,7 +70,6 @@ public class PublishProfilePictureActivity extends XmppActivity { protected void onActivityResult(int requestCode, int resultCode, final Intent data) { super.onActivityResult(requestCode, resultCode, data); - Log.d("xmppService","on activity result"); if (resultCode == RESULT_OK) { if (requestCode == REQUEST_CHOOSE_FILE) { Log.d("xmppService","bla"); @@ -78,13 +80,19 @@ public class PublishProfilePictureActivity extends XmppActivity { @Override protected void onBackendConnected() { - Log.d("xmppService","on backend connected"); - if (this.avatarUri == null) { - avatarUri = PhoneHelper.getSefliUri(getApplicationContext()); + if (getIntent()!=null) { + String jid = getIntent().getStringExtra("account"); + if (jid!=null) { + this.account = xmppConnectionService.findAccountByJid(jid); + if (this.avatarUri == null) { + avatarUri = PhoneHelper.getSefliUri(getApplicationContext()); + } + loadImageIntoPreview(avatarUri); + String explainText = getString(R.string.publish_avatar_explanation,account.getJid()); + this.explanation.setText(explainText); + } } - loadImageIntoPreview(avatarUri); - String explainText = getString(R.string.publish_avatar_explanation,"daniel@gultsch.de"); - this.explanation.setText(explainText); + } protected void loadImageIntoPreview(Uri uri) { |