mirror of
https://github.com/moparisthebest/Conversations
synced 2024-11-24 01:32:17 -05:00
various null pointer checks
This commit is contained in:
parent
a0038565c5
commit
8927ba8065
@ -302,7 +302,8 @@ public class Account extends AbstractEntity {
|
||||
}
|
||||
|
||||
public boolean isOnion() {
|
||||
return getServer().toString().toLowerCase().endsWith(".onion");
|
||||
final Jid server = getServer();
|
||||
return server != null && server.toString().toLowerCase().endsWith(".onion");
|
||||
}
|
||||
|
||||
public void setPort(int port) {
|
||||
|
@ -313,6 +313,9 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
|
||||
}
|
||||
|
||||
private void populateView() {
|
||||
if (contact == null) {
|
||||
return;
|
||||
}
|
||||
invalidateOptionsMenu();
|
||||
setTitle(contact.getDisplayName());
|
||||
if (contact.showInRoster()) {
|
||||
|
@ -815,8 +815,13 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
|
||||
switch (intent.getAction()) {
|
||||
case Intent.ACTION_SENDTO:
|
||||
case Intent.ACTION_VIEW:
|
||||
Log.d(Config.LOGTAG, "received uri=" + intent.getData());
|
||||
return new Invite(intent.getData()).invite();
|
||||
Uri uri = intent.getData();
|
||||
if (uri != null) {
|
||||
Log.d(Config.LOGTAG, "received uri=" + intent.getData());
|
||||
return new Invite(intent.getData()).invite();
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
case NfcAdapter.ACTION_NDEF_DISCOVERED:
|
||||
for (Parcelable message : getIntent().getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES)) {
|
||||
if (message instanceof NdefMessage) {
|
||||
|
Loading…
Reference in New Issue
Block a user