Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

fix a crash in ComposeActivity when trying to share images while logged out

This commit is contained in:
Conny Duck 2018-02-25 15:41:45 +01:00
parent 1f9eb41a9a
commit 49a74f57a5
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
View File

@ -204,6 +204,32 @@ public final class ComposeActivity extends BaseActivity
actionBar.setHomeAsUpIndicator(closeIcon); actionBar.setHomeAsUpIndicator(closeIcon);
} }
// setup the account image
AccountEntity activeAccount = TuskyApplication.getAccountManager().getActiveAccount();
if(activeAccount != null) {
ImageView composeAvatar = findViewById(R.id.composeAvatar);
if(TextUtils.isEmpty(activeAccount.getProfilePictureUrl())) {
composeAvatar.setImageResource(R.drawable.avatar_default);
} else {
Picasso.with(this).load(activeAccount.getProfilePictureUrl())
.transform(new RoundedTransformation(7, 0))
.error(R.drawable.avatar_default)
.placeholder(R.drawable.avatar_default)
.into(composeAvatar);
}
composeAvatar.setContentDescription(
getString(R.string.compose_active_account_description,
activeAccount.getFullName()));
} else {
// do not do anything when not logged in, activity will be finished in super.onCreate() anyway
return;
}
// Setup the interface buttons. // Setup the interface buttons.
floatingBtn.setOnClickListener(v -> onSendClicked()); floatingBtn.setOnClickListener(v -> onSendClicked());
floatingBtn.setOnLongClickListener(v -> saveDraft()); floatingBtn.setOnLongClickListener(v -> saveDraft());
@ -450,28 +476,6 @@ public final class ComposeActivity extends BaseActivity
} }
} }
AccountEntity activeAccount = TuskyApplication.getAccountManager().getActiveAccount();
if(activeAccount != null) {
ImageView composeAvatar = findViewById(R.id.composeAvatar);
if(TextUtils.isEmpty(activeAccount.getProfilePictureUrl())) {
composeAvatar.setImageResource(R.drawable.avatar_default);
} else {
Picasso.with(this).load(activeAccount.getProfilePictureUrl())
.transform(new RoundedTransformation(7, 0))
.error(R.drawable.avatar_default)
.placeholder(R.drawable.avatar_default)
.into(composeAvatar);
}
composeAvatar.setContentDescription(
getString(R.string.compose_active_account_description,
activeAccount.getFullName()));
}
} }
@Override @Override