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

proper account send to publish avatar activity

This commit is contained in:
iNPUTmice 2014-08-03 20:42:05 +02:00
parent 5073069adb
commit 629ff3afcd
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/eu/siacs/conversations/ui/ManageAccountActivity.java
View File

@ -100,7 +100,9 @@ public class ManageAccountActivity extends XmppActivity {
.updateAccount(selectedAccountForActionMode); .updateAccount(selectedAccountForActionMode);
mode.finish(); mode.finish();
} else if (item.getItemId() == R.id.mgmt_account_publish_avatar) { } 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) { } else if (item.getItemId() == R.id.mgmt_account_delete) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity); AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setTitle(getString(R.string.mgmt_account_are_you_sure)); builder.setTitle(getString(R.string.mgmt_account_are_you_sure));

24
src/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
View File

@ -11,6 +11,7 @@ import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.utils.PhoneHelper; import eu.siacs.conversations.utils.PhoneHelper;
public class PublishProfilePictureActivity extends XmppActivity { public class PublishProfilePictureActivity extends XmppActivity {
@ -24,6 +25,8 @@ public class PublishProfilePictureActivity extends XmppActivity {
private Uri avatarUri; private Uri avatarUri;
private Account account;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -37,7 +40,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (avatarUri!=null) { if (avatarUri!=null) {
xmppConnectionService.pushAvatar(null, avatarUri); xmppConnectionService.pushAvatar(account, avatarUri);
finish(); finish();
} }
} }
@ -67,7 +70,6 @@ public class PublishProfilePictureActivity extends XmppActivity {
protected void onActivityResult(int requestCode, int resultCode, protected void onActivityResult(int requestCode, int resultCode,
final Intent data) { final Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
Log.d("xmppService","on activity result");
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
if (requestCode == REQUEST_CHOOSE_FILE) { if (requestCode == REQUEST_CHOOSE_FILE) {
Log.d("xmppService","bla"); Log.d("xmppService","bla");
@ -78,13 +80,19 @@ public class PublishProfilePictureActivity extends XmppActivity {
@Override @Override
protected void onBackendConnected() { protected void onBackendConnected() {
Log.d("xmppService","on backend connected"); if (getIntent()!=null) {
if (this.avatarUri == null) { String jid = getIntent().getStringExtra("account");
avatarUri = PhoneHelper.getSefliUri(getApplicationContext()); 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) { protected void loadImageIntoPreview(Uri uri) {