Removed some unneeded code in MotorListFragment. Use startActivityForResult when...

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@407 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/src/net/sf/openrocket/android/ActivityHelpers.java b/android/src/net/sf/openrocket/android/ActivityHelpers.java
index aaef2c6fa03c27a9c0d3d47ef4af39a2e03dbcb8..b2b573823eef904faef3e7f4756c08048d6f0eee 100644 (file)
--- a/android/src/net/sf/openrocket/android/ActivityHelpers.java
+++ b/android/src/net/sf/openrocket/android/ActivityHelpers.java
@@ -18,9 +18,9 @@ public abstract class ActivityHelpers {
                parent.startActivity(intent);\r
        }\r
        \r
-       public static void downloadFromThrustcurve( Activity parent ) {\r
+       public static void downloadFromThrustcurve( Activity parent, int requestCode ) {\r
                Intent i = new Intent(parent, TCQueryActivity.class);\r
-               parent.startActivity(i);\r
+               parent.startActivityForResult(i, requestCode);\r
        }\r
 \r
 }\r

diff --git a/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java b/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java
index 4fc0c2c9d20e45f4bed45359165973acf3fe5a6b..282baec288e81230b8510433465635d231a10fd9 100644 (file)
--- a/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java
+++ b/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java
@@ -19,6 +19,8 @@ implements MotorListFragment.OnMotorSelectedListener
 {\r
 \r
        MotorListFragment motorList;\r
+       \r
+       private final static int DOWNLOAD_REQUEST_CODE = 1;\r
 \r
        /** Called when the activity is first created. */\r
        @Override\r
@@ -40,7 +42,7 @@ implements MotorListFragment.OnMotorSelectedListener
                AndroidLogWrapper.d(MotorBrowserActivity.class,"onMenuItemSelected" + item.getItemId());\r
                switch(item.getItemId()) {\r
                case R.id.download_from_thrustcurve_menu_option:\r
-                       ActivityHelpers.downloadFromThrustcurve(this);\r
+                       ActivityHelpers.downloadFromThrustcurve(this,DOWNLOAD_REQUEST_CODE);\r
                        return true;\r
                case R.id.preference_menu_option:\r
                        Intent intent = new Intent().setClass(this, PreferencesActivity.class);\r
@@ -50,6 +52,14 @@ implements MotorListFragment.OnMotorSelectedListener
                return super.onMenuItemSelected(featureId, item);\r
        }\r
 \r
+       @Override\r
+       protected void onActivityResult(int requestCode, int responseCode, Intent intent) {\r
+               if ( requestCode == DOWNLOAD_REQUEST_CODE ) {\r
+                       MotorListFragment frag = (MotorListFragment) getSupportFragmentManager().findFragmentById(R.id.motorBrowserList);\r
+                       frag.refreshData();\r
+               }\r
+       }\r
+\r
        @Override\r
        public void onMotorSelected(long motorId) {\r
                \r

diff --git a/android/src/net/sf/openrocket/android/motor/MotorListFragment.java b/android/src/net/sf/openrocket/android/motor/MotorListFragment.java
index c480cbb85b3c76c63f89a139a7150f5eb5e444d3..7fc2162ecd774e1b618004a6662e36da6f61da46 100644 (file)
--- a/android/src/net/sf/openrocket/android/motor/MotorListFragment.java
+++ b/android/src/net/sf/openrocket/android/motor/MotorListFragment.java
@@ -20,7 +20,6 @@ import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Menu;\r
 import android.view.MenuItem;\r
 import android.view.View;\r
-import android.widget.CursorTreeAdapter;\r
 import android.widget.ExpandableListView;\r
 import android.widget.ResourceCursorTreeAdapter;\r
 import android.widget.TextView;\r
@@ -55,8 +54,6 @@ implements SharedPreferences.OnSharedPreferenceChangeListener
                MotorDao.MANUFACTURER\r
        };\r
 \r
-       private CursorTreeAdapter mAdapter;\r
-\r
        private DbAdapter mDbHelper;\r
 \r
        private OnMotorSelectedListener motorSelectedListener;\r
@@ -138,6 +135,10 @@ implements SharedPreferences.OnSharedPreferenceChangeListener
        @Override\r
        public void onViewCreated(View view, Bundle savedInstanceState) {\r
                super.onViewCreated(view, savedInstanceState);\r
+               // TODO - need some error text but unfortunately doing this, makes the layout funky\r
+               // on ICS.\r
+               //setEmptyText("No motors in database - download them from Thrustcurve using the Option Menu");\r
+\r
                refreshData();\r
 \r
                registerForContextMenu(getExpandableListView());\r
@@ -204,7 +205,6 @@ implements SharedPreferences.OnSharedPreferenceChangeListener
        @Override\r
        public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {\r
                super.onChildClick(parent, v, groupPosition, childPosition, id);\r
-               //Intent i = new Intent(this, BurnPlotActivity.class);\r
                if( motorSelectedListener != null ) {\r
                        motorSelectedListener.onMotorSelected(id);\r
                }\r
@@ -217,11 +217,6 @@ implements SharedPreferences.OnSharedPreferenceChangeListener
                SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(getActivity());\r
                pref.unregisterOnSharedPreferenceChangeListener(this);\r
 \r
-               // Null out the group cursor. This will cause the group cursor and all of the child cursors\r
-               // to be closed.\r
-               mAdapter.changeCursor(null);\r
-               mAdapter = null;\r
-\r
                mDbHelper.close();\r
        }\r
 \r
@@ -240,20 +235,15 @@ implements SharedPreferences.OnSharedPreferenceChangeListener
                groupColumn = groupColumns[index];\r
 \r
        }\r
-       private void refreshData() {\r
+\r
+       public void refreshData() {\r
                Cursor motorCursor = mDbHelper.getMotorDao().fetchGroups(groupColumn);\r
-               if (mAdapter != null ) {\r
-                       mAdapter.changeCursor(motorCursor);\r
-               }\r
-               else {\r
-                       // Set up our adapter\r
-                       mAdapter = new MotorHierarchicalListAdapter( \r
-                                       getActivity(),\r
-                                       motorCursor,\r
-                                       R.layout.motor_list_group,\r
-                                       R.layout.motor_list_child);\r
-                       setListAdapter(mAdapter);\r
-               }\r
+               MotorHierarchicalListAdapter mAdapter = new MotorHierarchicalListAdapter( \r
+                               getActivity(),\r
+                               motorCursor,\r
+                               R.layout.motor_list_group,\r
+                               R.layout.motor_list_child);\r
+               setListAdapter(mAdapter);\r
+               onContentChanged();\r
        }\r
-\r
 }\r