various null pointer checks

Daniel Gultsch created 9 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Account.java             | 3 
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java    | 3 
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java | 9 
3 files changed, 12 insertions(+), 3 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Account.java

@@ -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) {

src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java

@@ -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()) {

src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java

@@ -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) {