Merge pull request #72 from SandroMachado/bugfix/app-reconstruction

Fix application onCreate with savedInstanceState

Author: Fuzion24

app/src/main/java/fuzion24/device/vulnerability/test/VulnerabilityTestResult.java

@@ -1,8 +1,10 @@
 package fuzion24.device.vulnerability.test;
 
+import java.io.Serializable;
+
 import fuzion24.device.vulnerability.vulnerabilities.VulnerabilityTest;
 
-public class VulnerabilityTestResult {
+public class VulnerabilityTestResult implements Serializable {
 
     private final VulnerabilityTest mTest;
     private final boolean mIsVuln;

app/src/main/java/fuzion24/device/vulnerability/test/ui/MainActivity.java

@@ -25,6 +25,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import fuzion24.device.vulnerability.test.ResultsCallback;
@@ -36,13 +37,16 @@
 
 public class MainActivity extends AppCompatActivity {
 
+    private static final String SERIALIZABLE_RESULTS = "SERIALIZABLE_RESULTS";
+
     private static final String TAG = "VULN_TEST";
 
     private DeviceInfo devInfo;
-    private List<VulnerabilityTestResult> testResults;
+    private ArrayList<VulnerabilityTestResult> testResults;
     private RecyclerView recyclerView;
     private TextView emptyView;
     private CoordinatorLayout coordinatorLayout;
+    RecyclerAdapter recyclerAdapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -54,9 +58,19 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
         getSupportActionBar().setTitle(R.string.app_name);
 
+        if (savedInstanceState != null && savedInstanceState.containsKey(SERIALIZABLE_RESULTS)) {
+            testResults =  (ArrayList<VulnerabilityTestResult>) savedInstanceState.getSerializable(SERIALIZABLE_RESULTS);
+        } else {
+            testResults = new ArrayList<>();
+        }
+
         coordinatorLayout = (CoordinatorLayout) findViewById(R.id.coordinatorLayout);
         emptyView = (TextView) findViewById(R.id.emptyView);
         recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
+        recyclerAdapter = new RecyclerAdapter(MainActivity.this, testResults);
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(MainActivity.this));
+        recyclerView.setAdapter(recyclerAdapter);
 
         final TextView tvKernelVersion = (TextView) findViewById(R.id.kernelVersion);
         final TextView tvBuildFingerPrint = (TextView) findViewById(R.id.buildFingerPrint);
@@ -69,7 +83,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         final TextView tvBuildABIList = (TextView) findViewById(R.id.buildABIList);
 
-
         devInfo = DeviceInfo.getDeviceInfo();
         tvBuildFingerPrint.setText(devInfo.getBuildFingerPrint());
         tvBuildID.setText(devInfo.getBuildID());
@@ -199,14 +212,11 @@ private void runTestsSuit() {
             public void finished(final List<VulnerabilityTestResult> results) {
                 Log.d(TAG, "Device Vulnerability callback, finished");
 
-                testResults = results;
+                testResults.clear();
+                testResults.addAll(results);
 
                 emptyView.setVisibility(View.GONE);
-                recyclerView.setLayoutManager(new LinearLayoutManager(MainActivity.this));
-
-                RecyclerAdapter recyclerAdapter = new RecyclerAdapter(MainActivity.this, results);
-                recyclerView.setAdapter(recyclerAdapter);
-
+                recyclerAdapter.notifyDataSetChanged();
             }
         }).execute();
     }
@@ -216,4 +226,9 @@ public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
     }
 
+    @Override
+    protected void onSaveInstanceState(final Bundle outState) {
+        outState.putSerializable(SERIALIZABLE_RESULTS, testResults);
+    }
+
 }

app/src/main/java/fuzion24/device/vulnerability/vulnerabilities/VulnerabilityTest.java

@@ -1,10 +1,12 @@
 package fuzion24.device.vulnerability.vulnerabilities;
 
 import android.content.Context;
+
+import java.io.Serializable;
 import java.util.List;
 import fuzion24.device.vulnerability.util.CPUArch;
 
-public interface VulnerabilityTest {
+public interface VulnerabilityTest extends Serializable {
    public String getCVEorID();
    public boolean isVulnerable(Context context) throws Exception;
    public List<CPUArch> getSupportedArchitectures();