From 63cc38df24526d5776626351f4bc50df69306ea9 Mon Sep 17 00:00:00 2001 From: Arne Jans Date: Tue, 10 Jan 2012 12:07:27 +0100 Subject: [PATCH 1/3] Fixed Phone: Pressing a filter-item sometimes crashes with NPE --- .../activity/FilterListWrapperActivity.java | 15 ++++++++++++--- .../activity/TaskEditWrapperActivity.java | 17 +++++++++++++---- .../activity/TaskListWrapperActivity.java | 15 ++++++++++++--- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java index a3c90ee40..0c494c7d6 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterListWrapperActivity.java @@ -17,14 +17,23 @@ public class FilterListWrapperActivity extends AstridWrapperActivity { ThemeService.applyTheme(this); super.onCreate(savedInstanceState); setContentView(R.layout.filter_list_wrapper_activity); + } + + /* (non-Javadoc) + * @see android.support.v4.app.FragmentActivity#onResume() + */ + @Override + protected void onResume() { + super.onResume(); Fragment frag = (Fragment) getSupportFragmentManager() .findFragmentById(R.id.tasklist_fragment); - if (frag != null) - { + if (frag != null && frag.isInLayout()) { mMultipleFragments = true; + } else { + mMultipleFragments = false; } - } + } @Override public void setTitle(CharSequence title) { diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java index 52862a082..5deafd83d 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java @@ -16,14 +16,23 @@ public class TaskEditWrapperActivity extends AstridWrapperActivity { ThemeService.applyTheme(this); super.onCreate(savedInstanceState); setContentView(R.layout.task_edit_wrapper_activity); + } + + /* (non-Javadoc) + * @see android.support.v4.app.FragmentActivity#onResume() + */ + @Override + protected void onResume() { + super.onResume(); Fragment frag = (Fragment) getSupportFragmentManager() - .findFragmentById(R.id.taskedit_fragment); - if (frag != null) - { + .findFragmentById(R.id.tasklist_fragment); + if (frag != null) { mMultipleFragments = true; + } else { + mMultipleFragments = false; } - } + } @Override public boolean onKeyDown(int keyCode, KeyEvent event) { diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java index 5000125f0..9c31a8b09 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java @@ -16,14 +16,23 @@ public class TaskListWrapperActivity extends AstridWrapperActivity { ThemeService.applyTheme(this); super.onCreate(savedInstanceState); setContentView(R.layout.task_list_wrapper_activity); + } + + /* (non-Javadoc) + * @see android.support.v4.app.FragmentActivity#onResume() + */ + @Override + protected void onResume() { + super.onResume(); Fragment frag = (Fragment) getSupportFragmentManager() .findFragmentById(R.id.filterlist_fragment); - if (frag != null && frag.isInLayout()) - { + if (frag != null && frag.isInLayout()) { mMultipleFragments = true; + } else { + mMultipleFragments = false; } - } + } @Override public void setTitle(CharSequence title) { From f2bced613c00f3c504863875ab6f54ca15353735 Mon Sep 17 00:00:00 2001 From: Arne Jans Date: Tue, 10 Jan 2012 12:18:56 +0100 Subject: [PATCH 2/3] Explicit support large and xlarge screens as explained in http://developer.android.com/guide/topics/manifest/supports-screens-element.html#large --- astrid/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index 6fd374941..728c3d585 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -64,11 +64,11 @@ - + + android:name="greendroid.app.GDApplication" android:hardwareAccelerated="true" android:manageSpaceActivity="com.todoroo.astrid.core.OldTaskPreferences"> From e53ed0e130e35214b87b37999f9c903ec552d253 Mon Sep 17 00:00:00 2001 From: Arne Jans Date: Tue, 10 Jan 2012 12:20:24 +0100 Subject: [PATCH 3/3] Moved landscape-layouts to layout-large-land and removed the dupes in layout-small. --- .../filter_list_wrapper_activity.xml | 0 .../task_edit_wrapper_activity.xml | 0 .../task_list_wrapper_activity.xml | 0 .../layout-small-land/filter_list_wrapper_activity.xml | 8 -------- .../res/layout-small-land/task_edit_wrapper_activity.xml | 8 -------- .../res/layout-small-land/task_list_wrapper_activity.xml | 8 -------- astrid/res/layout-small/filter_list_wrapper_activity.xml | 8 -------- astrid/res/layout-small/task_edit_wrapper_activity.xml | 8 -------- astrid/res/layout-small/task_list_wrapper_activity.xml | 8 -------- 9 files changed, 48 deletions(-) rename astrid/res/{layout-land => layout-large-land}/filter_list_wrapper_activity.xml (100%) rename astrid/res/{layout-land => layout-large-land}/task_edit_wrapper_activity.xml (100%) rename astrid/res/{layout-land => layout-large-land}/task_list_wrapper_activity.xml (100%) delete mode 100644 astrid/res/layout-small-land/filter_list_wrapper_activity.xml delete mode 100644 astrid/res/layout-small-land/task_edit_wrapper_activity.xml delete mode 100644 astrid/res/layout-small-land/task_list_wrapper_activity.xml delete mode 100644 astrid/res/layout-small/filter_list_wrapper_activity.xml delete mode 100644 astrid/res/layout-small/task_edit_wrapper_activity.xml delete mode 100644 astrid/res/layout-small/task_list_wrapper_activity.xml diff --git a/astrid/res/layout-land/filter_list_wrapper_activity.xml b/astrid/res/layout-large-land/filter_list_wrapper_activity.xml similarity index 100% rename from astrid/res/layout-land/filter_list_wrapper_activity.xml rename to astrid/res/layout-large-land/filter_list_wrapper_activity.xml diff --git a/astrid/res/layout-land/task_edit_wrapper_activity.xml b/astrid/res/layout-large-land/task_edit_wrapper_activity.xml similarity index 100% rename from astrid/res/layout-land/task_edit_wrapper_activity.xml rename to astrid/res/layout-large-land/task_edit_wrapper_activity.xml diff --git a/astrid/res/layout-land/task_list_wrapper_activity.xml b/astrid/res/layout-large-land/task_list_wrapper_activity.xml similarity index 100% rename from astrid/res/layout-land/task_list_wrapper_activity.xml rename to astrid/res/layout-large-land/task_list_wrapper_activity.xml diff --git a/astrid/res/layout-small-land/filter_list_wrapper_activity.xml b/astrid/res/layout-small-land/filter_list_wrapper_activity.xml deleted file mode 100644 index 7cee3fcd5..000000000 --- a/astrid/res/layout-small-land/filter_list_wrapper_activity.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - \ No newline at end of file diff --git a/astrid/res/layout-small-land/task_edit_wrapper_activity.xml b/astrid/res/layout-small-land/task_edit_wrapper_activity.xml deleted file mode 100644 index 4a7586aa2..000000000 --- a/astrid/res/layout-small-land/task_edit_wrapper_activity.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - \ No newline at end of file diff --git a/astrid/res/layout-small-land/task_list_wrapper_activity.xml b/astrid/res/layout-small-land/task_list_wrapper_activity.xml deleted file mode 100644 index 6a904c32c..000000000 --- a/astrid/res/layout-small-land/task_list_wrapper_activity.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - \ No newline at end of file diff --git a/astrid/res/layout-small/filter_list_wrapper_activity.xml b/astrid/res/layout-small/filter_list_wrapper_activity.xml deleted file mode 100644 index 7cee3fcd5..000000000 --- a/astrid/res/layout-small/filter_list_wrapper_activity.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - \ No newline at end of file diff --git a/astrid/res/layout-small/task_edit_wrapper_activity.xml b/astrid/res/layout-small/task_edit_wrapper_activity.xml deleted file mode 100644 index 4a7586aa2..000000000 --- a/astrid/res/layout-small/task_edit_wrapper_activity.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - \ No newline at end of file diff --git a/astrid/res/layout-small/task_list_wrapper_activity.xml b/astrid/res/layout-small/task_list_wrapper_activity.xml deleted file mode 100644 index 6a904c32c..000000000 --- a/astrid/res/layout-small/task_list_wrapper_activity.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - \ No newline at end of file