Fix issue #318 - Crashes when replying with Friendica
This commit is contained in:
parent
22d393919a
commit
9ce6c56771
|
@ -453,7 +453,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
|
||||||
|
|
||||||
public static String getVisibility(String defaultVisibility) {
|
public static String getVisibility(String defaultVisibility) {
|
||||||
int tootVisibility = visibilityToNumber(defaultVisibility);
|
int tootVisibility = visibilityToNumber(defaultVisibility);
|
||||||
if (currentAccount != null) {
|
if (currentAccount != null && currentAccount.mastodon_account.source != null) {
|
||||||
int userVisibility = visibilityToNumber(currentAccount.mastodon_account.source.privacy);
|
int userVisibility = visibilityToNumber(currentAccount.mastodon_account.source.privacy);
|
||||||
if (tootVisibility > userVisibility) {
|
if (tootVisibility > userVisibility) {
|
||||||
return visibilityToString(userVisibility);
|
return visibilityToString(userVisibility);
|
||||||
|
@ -497,7 +497,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
|
||||||
visibility = b.getString(Helper.ARG_VISIBILITY, null);
|
visibility = b.getString(Helper.ARG_VISIBILITY, null);
|
||||||
if (visibility == null && statusReply != null) {
|
if (visibility == null && statusReply != null) {
|
||||||
visibility = getVisibility(statusReply.visibility);
|
visibility = getVisibility(statusReply.visibility);
|
||||||
} else if (visibility == null && currentAccount != null) {
|
} else if (visibility == null && currentAccount != null && currentAccount.mastodon_account.source != null) {
|
||||||
visibility = currentAccount.mastodon_account.source.privacy;
|
visibility = currentAccount.mastodon_account.source.privacy;
|
||||||
}
|
}
|
||||||
mentionBooster = (app.fedilab.android.client.entities.api.Account) b.getSerializable(Helper.ARG_MENTION_BOOSTER);
|
mentionBooster = (app.fedilab.android.client.entities.api.Account) b.getSerializable(Helper.ARG_MENTION_BOOSTER);
|
||||||
|
|
Loading…
Reference in New Issue