fix NPE

Conflicts: src/de/ub0r/android/smsdroid/MessageListActivity.java
felixb · May 6, 2012 · d585504 · d585504
1 parent f23961c
commit d585504
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 19 deletions.
diff --git a/src/de/ub0r/android/smsdroid/Ads.java b/src/de/ub0r/android/smsdroid/Ads.java
@@ -132,26 +132,28 @@ public void onCreate() {
 			@Override
 			public void run() {
 
-				Log.i(TAG, "Refresh Thread started");
+				Log.d(TAG, "Refresh Thread started");
 				Looper.prepare();
 				Ads.this.refreshLooper = Looper.myLooper();
-				Ads.this.refreshHandler = new Handler(Ads.this.refreshLooper) {
+				if (Ads.this.refreshLooper != null) {
-
+					Ads.this.refreshHandler = new Handler(Ads.this.refreshLooper) {
-					@Override
+
-					public void handleMessage(final Message msg) {
+						@Override
-						switch (msg.what) {
+						public void handleMessage(final Message msg) {
-						case REFRESH_AD:
+							switch (msg.what) {
-							Log.i(TAG, "Refresh Ad message received. Requesting ad from MobFox");
+							case REFRESH_AD:
-							Ads.this.mMobFoxView.loadNextAd();
+								Log.d(TAG, "Refresh Ad message received. Requesting ad from MobFox");
-							break;
+								Ads.this.mMobFoxView.loadNextAd();
-						default:
+								break;
-							Log.w(TAG, "unknown msg.what: " + msg.what);
+							default:
-							break;
+								Log.w(TAG, "unknown msg.what: " + msg.what);
+								break;
+							}
 						}
-					}
+					};
-				};
+					Looper.loop();
-				Looper.loop();
+					Log.d(TAG, "Refresh Thread stopped");
-				Log.i(TAG, "Refresh Thread stopped");
+				}
 			}
 		};
 		refreshThread.start();

diff --git a/src/de/ub0r/android/smsdroid/MessageListActivity.java b/src/de/ub0r/android/smsdroid/MessageListActivity.java
@@ -540,7 +540,13 @@ public void onClick(final DialogInterface dialog, final int which) {
 						final Uri u = MessageListActivity.this.conv.getContact().getUri();
 						i = new Intent(Intent.ACTION_VIEW, u);
 					}
-					MessageListActivity.this.startActivity(i);
+					try {
+						MessageListActivity.this.startActivity(i);
+					} catch (ActivityNotFoundException e) {
+						Log.e(TAG, "activity not found: " + i.getAction(), e);
+						Toast.makeText(MessageListActivity.this, "activity not found",
+								Toast.LENGTH_LONG).show();
+					}
 					break;
 				case WHICH_CALL:
 					MessageListActivity.this.startActivity(new Intent(Intent.ACTION_VIEW, Uri

diff --git a/src/de/ub0r/android/smsdroid/MobilePhoneAdapter.java b/src/de/ub0r/android/smsdroid/MobilePhoneAdapter.java
@@ -133,7 +133,9 @@ public static String cleanRecipient(final String recipient) {
 			return "";
 		}
 		String n;
-		if (recipient.indexOf("<") < recipient.indexOf(">")) {
+		int i = recipient.indexOf("<");
+		int j = recipient.indexOf(">");
+		if (i != -1 && i < j) {
 			n = recipient.substring(recipient.indexOf("<"), recipient.indexOf(">"));
 		} else {
 			n = recipient;