Fixes On screen rotation selected forms get unselected bug

Using onSaveInstanceState() and restoring in the onCreateView()

Removing ViewModel

Fixes On screen rotation selected forms get unselected bug
Using onSaveInstanceState() and restoring in the onCreateView()

Author: iadeelzafar

skunkworks_crow/src/main/java/org/odk/share/fragments/BlankFormsFragment.java

@@ -56,6 +56,7 @@ public class BlankFormsFragment extends FormListFragment implements LoaderManage
     private static final String FORM_CHOOSER_LIST_SORTING_ORDER = "formChooserListSortingOrder";
 
     public static final String FORM_IDS = "form_ids";
+    private final String SELECTED_INSTANCES_KEY="ROTATION_SELECTED_INSTANCES";
 
     private static final int FORM_LOADER = 2;
     private FormsAdapter formAdapter;
@@ -77,6 +78,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         LinearLayoutManager llm = new LinearLayoutManager(getActivity());
         llm.setOrientation(LinearLayoutManager.VERTICAL);
         recyclerView.setLayoutManager(llm);
+
+        if(savedInstanceState!=null)
+        {
+            long[] previousSelectedInstances=savedInstanceState.getLongArray(SELECTED_INSTANCES_KEY);
+            for(int i=0;i<previousSelectedInstances.length;i++)
+            {
+                selectedForms.add(previousSelectedInstances[i]);
+            }
+        }
+
         return view;
     }
 
@@ -92,6 +103,13 @@ public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         return new FormsDao().getFormsCursorLoader(getFilterText(), getSortingOrder());
     }
 
+    @Override public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putLongArray(SELECTED_INSTANCES_KEY, ArrayUtils.toPrimitive(
+            selectedForms.toArray(new Long[selectedInstances.size()])));
+
+    }
+
     @Override
     public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
         if (cursor != null) {

skunkworks_crow/src/main/java/org/odk/share/fragments/FilledFormsFragment.java

@@ -57,23 +57,32 @@ public class FilledFormsFragment extends InstanceListFragment implements LoaderM
     private static final int INSTANCE_LOADER = 1;
     private InstanceAdapter instanceAdapter;
     private LinkedHashSet<Long> selectedInstances;
+    private final String SELECTED_INSTANCES_KEY="ROTATION_SELECTED_INSTANCES";
 
 
     public FilledFormsFragment() {
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+        Bundle savedInstanceState) {
         setHasOptionsMenu(true);
         View view = inflater.inflate(R.layout.fragment_forms, container, false);
         ButterKnife.bind(this, view);
-
         selectedInstances = new LinkedHashSet<>();
-
         LinearLayoutManager llm = new LinearLayoutManager(getActivity());
         llm.setOrientation(LinearLayoutManager.VERTICAL);
         recyclerView.setLayoutManager(llm);
+
+        if(savedInstanceState!=null)
+        {
+            long[] previousSelectedInstances=savedInstanceState.getLongArray(SELECTED_INSTANCES_KEY);
+            for(int i=0;i<previousSelectedInstances.length;i++)
+            {
+                selectedInstances.add(previousSelectedInstances[i]);
+            }
+        }
+
         return view;
     }
 
@@ -89,6 +98,13 @@ public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         return new InstancesDao().getSavedInstancesCursorLoader(getFilterText(), getSortingOrder());
     }
 
+    @Override public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putLongArray(SELECTED_INSTANCES_KEY, ArrayUtils.toPrimitive(
+            selectedInstances.toArray(new Long[selectedInstances.size()])));
+
+    }
+
     @Override
     public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
         if (cursor != null) {