From 07630ca97bbd51a31ed6a3094a829426ce3ae3ef Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 25 Jun 2020 20:23:24 +0100
Subject: [PATCH] fix: crash bugs

---
 .../lbry/browser/adapter/ClaimListAdapter.java  | 17 ++++++++++++++---
 .../ui/findcontent/FileViewFragment.java        | 12 +++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java b/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
index 05f6eb90..f5fe2613 100644
--- a/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
@@ -60,7 +60,13 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
 
     public ClaimListAdapter(List<Claim> items, Context context) {
         this.context = context;
-        this.items = new ArrayList<>(items);
+        this.items = new ArrayList<>();
+        for (Claim item : items) {
+            if (item != null) {
+                items.add(item);
+            }
+        }
+
         this.selectedItems = new ArrayList<>();
         quickClaimIdMap = new HashMap<>();
         quickClaimUrlMap = new HashMap<>();
@@ -139,7 +145,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
 
     public void addItems(List<Claim> claims) {
         for (Claim claim : claims) {
-            if (!items.contains(claim)) {
+            if (claim != null && !items.contains(claim)) {
                 items.add(claim);
             }
         }
@@ -149,7 +155,12 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
         notifyDataSetChanged();
     }
     public void setItems(List<Claim> claims) {
-        items = new ArrayList<>(claims);
+        items = new ArrayList<>();
+        for (Claim claim : claims) {
+            if (claim != null) {
+                items.add(claim);
+            }
+        }
         notifyDataSetChanged();
     }
 
diff --git a/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java b/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java
index 561da67c..a3d0a1d1 100644
--- a/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java
@@ -1678,15 +1678,21 @@ public class FileViewFragment extends BaseFragment implements
             }
             if (claim.getFile() == null && !claim.isFree()) {
                 if (!Lbry.SDK_READY) {
-                    Snackbar.make(getView().findViewById(R.id.file_view_global_layout), R.string.sdk_initializing_functionality, Snackbar.LENGTH_LONG).show();
+                    if (root != null) {
+                        Snackbar.make(root.findViewById(R.id.file_view_global_layout),
+                                R.string.sdk_initializing_functionality, Snackbar.LENGTH_LONG).show();
+                    }
                     restoreMainActionButton();
                     return;
                 }
 
                 checkAndConfirmPurchaseUrl();
             } else {
-                if (!claim.isPlayable() && !Lbry.SDK_READY) {
-                    Snackbar.make(getView().findViewById(R.id.file_view_global_layout), R.string.sdk_initializing_functionality, Snackbar.LENGTH_LONG).show();
+                if (claim != null && !claim.isPlayable() && !Lbry.SDK_READY) {
+                    if (root != null) {
+                        Snackbar.make(root.findViewById(R.id.file_view_global_layout),
+                                R.string.sdk_initializing_functionality, Snackbar.LENGTH_LONG).show();
+                    }
                     restoreMainActionButton();
                     return;
                 }