From acbe33c66d289793b4c5364a971b8a6e7682eb1d Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Mon, 25 May 2020 00:04:40 +0100
Subject: [PATCH] Limit gallery items to 150. Download filtering. Open rewards
 page from Invites reward driver card.

---
 .../tasks/localdata/LoadGalleryItemsTask.java       |  3 +--
 .../io/lbry/browser/ui/library/LibraryFragment.java |  2 +-
 .../io/lbry/browser/ui/wallet/InvitesFragment.java  | 13 +++++++++++++
 app/src/main/java/io/lbry/browser/utils/Helper.java |  8 ++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/lbry/browser/tasks/localdata/LoadGalleryItemsTask.java b/app/src/main/java/io/lbry/browser/tasks/localdata/LoadGalleryItemsTask.java
index 5676f072..1b2e8307 100644
--- a/app/src/main/java/io/lbry/browser/tasks/localdata/LoadGalleryItemsTask.java
+++ b/app/src/main/java/io/lbry/browser/tasks/localdata/LoadGalleryItemsTask.java
@@ -54,7 +54,7 @@ public class LoadGalleryItemsTask extends AsyncTask<Void, GalleryItem, List<Gall
                 cursor = resolver.query(
                         MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
                         projection, null, null,
-                        String.format("%s DESC", MediaStore.MediaColumns.DATE_MODIFIED));
+                        String.format("%s DESC LIMIT 150", MediaStore.MediaColumns.DATE_MODIFIED));
                 while (cursor.moveToNext()) {
                     int idColumn = cursor.getColumnIndex(MediaStore.MediaColumns._ID);
                     int nameColumn = cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
@@ -71,7 +71,6 @@ public class LoadGalleryItemsTask extends AsyncTask<Void, GalleryItem, List<Gall
                     items.add(item);
                 }
             } catch (SQLiteException ex) {
-
                 // failed to load videos. log and pass
                 Log.e(TAG, ex.getMessage(), ex);
             } finally {
diff --git a/app/src/main/java/io/lbry/browser/ui/library/LibraryFragment.java b/app/src/main/java/io/lbry/browser/ui/library/LibraryFragment.java
index 157ed9ba..f6d7f8b9 100644
--- a/app/src/main/java/io/lbry/browser/ui/library/LibraryFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/library/LibraryFragment.java
@@ -268,6 +268,7 @@ public class LibraryFragment extends BaseFragment implements
         checkStatsLink();
         layoutSdkInitializing.setVisibility(Lbry.SDK_READY ? View.GONE : View.VISIBLE);
         currentPage = 1;
+        currentFiles = new ArrayList<>();
         if (Lbry.SDK_READY) {
             if (!initialOwnClaimsFetched) {
                 fetchOwnClaimsAndShowDownloads();
@@ -381,7 +382,6 @@ public class LibraryFragment extends BaseFragment implements
                 listReachedEnd = hasReachedEnd;
                 List<LbryFile> filteredFiles = Helper.filterDownloads(files);
                 List<Claim> claims = Helper.claimsFromFiles(filteredFiles);
-
                 addFiles(filteredFiles);
                 updateStats();
                 checkStatsLink();
diff --git a/app/src/main/java/io/lbry/browser/ui/wallet/InvitesFragment.java b/app/src/main/java/io/lbry/browser/ui/wallet/InvitesFragment.java
index fd0ea501..76e37557 100644
--- a/app/src/main/java/io/lbry/browser/ui/wallet/InvitesFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/wallet/InvitesFragment.java
@@ -16,6 +16,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatSpinner;
+import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -78,6 +79,7 @@ public class InvitesFragment extends BaseFragment implements SdkStatusListener,
     private View progressLoadingInviteByEmail;
     private View progressLoadingStatus;
 
+    private CardView rewardDriverCard;
     private View inlineChannelCreator;
     private TextInputEditText inlineChannelCreatorInputName;
     private TextInputEditText inlineChannelCreatorInputDeposit;
@@ -95,6 +97,7 @@ public class InvitesFragment extends BaseFragment implements SdkStatusListener,
         layoutSdkInitializing = root.findViewById(R.id.container_sdk_initializing);
         textLearnMoreLink = root.findViewById(R.id.invites_account_driver_learn_more);
         buttonGetStarted = root.findViewById(R.id.invites_get_started_button);
+        rewardDriverCard = root.findViewById(R.id.reward_driver_card);
 
         textInviteLink = root.findViewById(R.id.invites_invite_link);
         buttonCopyInviteLink = root.findViewById(R.id.invites_copy_invite_link);
@@ -131,6 +134,16 @@ public class InvitesFragment extends BaseFragment implements SdkStatusListener,
         layoutSdkInitializing.setVisibility(Lbry.SDK_READY ? View.GONE : View.VISIBLE);
         Helper.applyHtmlForTextView(textLearnMoreLink);
 
+        rewardDriverCard.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Context context = getContext();
+                if (context instanceof MainActivity) {
+                    ((MainActivity) context).openRewards();
+                }
+            }
+        });
+
         inputEmail.setOnFocusChangeListener(new View.OnFocusChangeListener() {
             @Override
             public void onFocusChange(View view, boolean hasFocus) {
diff --git a/app/src/main/java/io/lbry/browser/utils/Helper.java b/app/src/main/java/io/lbry/browser/utils/Helper.java
index 2bac1c09..01aec06b 100644
--- a/app/src/main/java/io/lbry/browser/utils/Helper.java
+++ b/app/src/main/java/io/lbry/browser/utils/Helper.java
@@ -660,8 +660,12 @@ public final class Helper {
         for (int i = 0; i < files.size(); i++) {
             LbryFile file = files.get(i);
             // remove own claims as well
-            if (file.getClaim() != null && Lbry.ownClaims.contains(file.getClaim())) {
-                continue;
+            if (Lbry.ownClaims != null && Lbry.ownClaims.size() > 0) {
+                for (Claim own : Lbry.ownClaims) {
+                    if (own.getClaimId().equalsIgnoreCase(file.getClaimId())) {
+                        continue;
+                    }
+                }
             }
             if (!Helper.isNullOrEmpty(file.getDownloadPath())) {
                 filtered.add(file);