aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-03-06 21:38:41 +0100
committerChristian Schneppe <christian@pix-art.de>2019-03-06 21:38:41 +0100
commitd450fe5113c5dab799eed214bf0b995dc57b985b (patch)
tree0125a1695d182e5e11fb5b8e3bf5e1139131219a /src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
parent9b4fcd7e1f7b721b477ac67f3ff18ebdc45de6a2 (diff)
try to catch some NPE
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/EditAccountActivity.java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/EditAccountActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index 129f5400e..456b907df 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -626,10 +626,10 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
private void onEditYourNameClicked(View view) {
String nick;
try {
- if (mAccount.getDisplayName() != null) {
+ if (mAccount != null) {
nick = mAccount.getDisplayName();
} else {
- nick = mAccount.getJid().getLocal();
+ nick = "";
}
} catch (Exception e) {
e.printStackTrace();