Create a list of tuples <vuln result, vuln descr>

Author: Fuzion24

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

@@ -28,10 +28,10 @@ public class VulnerabilityDescriptor {
     List<String> patches;
 
     private VulnerabilityDescriptor(String cve,
-                       String desc,
-                       String impact,
-                       Double cvssv2,
-                       String cveDate,
+                                    String desc,
+                                    String impact,
+                                    Double cvssv2,
+                                    String cveDate,
                                     List<String> externLinks,
                                     List<String> altNames,
                                     List<String> patches) {
@@ -45,17 +45,6 @@ private VulnerabilityDescriptor(String cve,
         this.patches = patches;
     }
 
-    public static VulnerabilityDescriptor getDescriptorObject(String cve,
-                                                                  String desc,
-                                                                  String impact,
-                                                                  Double cvssv2,
-                                                                  String cveDate,
-                                                                  String[] externLinks,
-                                                                  String[] altNames,
-                                                                  String[] patches) {
-        VulnerabilityDescriptor vo = new VulnerabilityDescriptor(cve, desc, impact, cvssv2, cveDate, externLinks, altNames, patches);
-        return vo;
-    }
 
     private static List<String> extractStringArray(JSONObject obj, String arrayName) throws Exception {
         JSONArray jsonStringArray = obj.getJSONArray(arrayName);
@@ -98,9 +87,17 @@ public static Map<String, VulnerabilityDescriptor> getParsedVulnMap(Context ctx)
             patches = extractStringArray(jobj, "patch");
             cveDate = jobj.getString("cvedate");
 
-            new VulnerabilityDescriptor(cve, description, impact, cvssV2Score, cveDate, externalLinks, altNames, patches);
-
-            descriptorMap.put(cve, )
+            VulnerabilityDescriptor vd = new VulnerabilityDescriptor(
+                    cve,
+                    description,
+                    impact,
+                    cvssV2Score,
+                    cveDate,
+                    externalLinks,
+                    altNames,
+                    patches);
+
+            descriptorMap.put(cve, vd);
         }
 
         return descriptorMap;

app/src/main/java/fuzion24/device/vulnerability/test/adapter/RecyclerAdapter.java

@@ -4,6 +4,7 @@
 import android.graphics.Color;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,21 +15,33 @@
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
+import fuzion24.device.vulnerability.test.VulnerabilityDescriptor;
 import fuzion24.device.vulnerability.test.VulnerabilityTestResult;
 import fuzion24.device.vulnerability.test.adapter.viewholder.RecyclerItemViewHolder;
 import fuzion24.device.vulnerability.vulnerabilities.helper.BinaryAssets;
 
 public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-    private List<VulnerabilityTestResult> mResults;
+    final private List<Pair<VulnerabilityTestResult, VulnerabilityDescriptor>> mResults;
     private Context mContext;
 
     public RecyclerAdapter(Context context, List<VulnerabilityTestResult> itemList) {
         this.mContext = context;
-        this.mResults = itemList;
+        Map<String, VulnerabilityDescriptor> vMap = VulnerabilityDescriptor.getParsedVulnMap(context);
 
+        List<Pair<VulnerabilityTestResult, VulnerabilityDescriptor>> res =
+                        new ArrayList<Pair<VulnerabilityTestResult, VulnerabilityDescriptor>>();
+
+        for(VulnerabilityTestResult vtr : itemList){
+            VulnerabilityDescriptor vd = vMap.get(vtr.getCVEorID());
+            res.add(Pair.create(vtr, vd));
+        }
+
+        this.mResults = res;
 
     }
 
@@ -49,25 +62,19 @@ private class VulnObject {
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) {
         RecyclerItemViewHolder holder = (RecyclerItemViewHolder) viewHolder;
-        VulnerabilityTestResult item = mResults.get(position);
+        Pair<VulnerabilityTestResult, VulnerabilityDescriptor> item = mResults.get(position);
 
-        holder.setItemTestName(item.getCVEorID());
+        VulnerabilityTestResult vulnRes = item.first;
+        VulnerabilityDescriptor vulnDesc = item.second;
 
+        holder.setItemTestName(vulnRes.getCVEorID());
 
-        try {
-            jobj = mVulnMap.getJSONObject(item.getCVEorID());
-
-
-        } catch (Exception e) {
-            //We dont have an entry or are missing necessary components of it
-            e.printStackTrace();
-        }
 
-        if (item.getException() != null) {
+        if (vulnRes.getException() != null) {
             holder.setItemTestResult(mContext.getString(R.string.error_test, item.getException().getMessage()));
             holder.setItemTestResultColor(mContext.getResources().getColor(R.color.orange));
         } else {
-            if (item.getResult()) {
+            if (vulnRes.getResult()) {
                 holder.setItemTestResultColor(mContext.getResources().getColor(R.color.red));
                 holder.setItemTestResult(mContext.getString(R.string.test_result_failure));
             } else {