From c7e74586514c0600ca40db8832ff6890ccc45010 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Fri, 16 Mar 2012 17:06:24 -0700 Subject: [PATCH] Handle crashes in various places --- astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java | 2 ++ .../com/todoroo/astrid/activity/EditPreferences.java | 12 ++++++++---- .../todoroo/astrid/activity/TaskEditFragment.java | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java b/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java index 5c35e277a..a2619b3af 100644 --- a/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java +++ b/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java @@ -160,6 +160,8 @@ public class C2DMReceiver extends BroadcastReceiver { } actFmSyncService.fetchTask(task); + } catch(NumberFormatException e) { + // invalid task id } finally { cursor.close(); } diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java index 943ca62f0..b0300f832 100644 --- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java @@ -402,10 +402,14 @@ public class EditPreferences extends TodorooPreferenceActivity { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { Boolean value = (Boolean) newValue; - if (!value.booleanValue()) { - Crittercism.setOptOutStatus(true); - } else { - Crittercism.setOptOutStatus(false); + try { + if (!value.booleanValue()) { + Crittercism.setOptOutStatus(true); + } else { + Crittercism.setOptOutStatus(false); + } + } catch (NullPointerException e) { + return false; } return true; } diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index ccd5e6dab..64b2d4f58 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -1128,8 +1128,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { (tabStyle == TAB_STYLE_ACTIVITY_WEB && position == 2)) return TAB_VIEW_WEB_SERVICES; - throw new RuntimeException("Error - requested position " + position - + ", tab style " + tabStyle); + // error experienced + return TAB_VIEW_MORE; } /**