From 258ea4aff68625f169f3943f3af313dcfc009607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Tue, 12 Jan 2021 01:41:22 +0100 Subject: [PATCH 01/31] FirebaseAnalytics needs ACCESS_NETWORK_STATE permission --- app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d5aacbb8..3d14f1be 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ + Date: Tue, 12 Jan 2021 02:11:37 +0100 Subject: [PATCH 02/31] Simplify code, not needed to check if collection contains key before trying to remove it --- app/src/main/java/io/lbry/browser/MainActivity.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/io/lbry/browser/MainActivity.java b/app/src/main/java/io/lbry/browser/MainActivity.java index 5816b9bf..cc7ffd43 100644 --- a/app/src/main/java/io/lbry/browser/MainActivity.java +++ b/app/src/main/java/io/lbry/browser/MainActivity.java @@ -818,9 +818,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener public void removeNavFragment(Class fragmentClass, int navItemId) { String key = buildNavFragmentKey(fragmentClass, navItemId, null); - if (openNavFragments.containsKey(key)) { - openNavFragments.remove(key); - } + openNavFragments.remove(key); } public void addFetchChannelsListener(FetchChannelsListener listener) { -- 2.43.4 From 49dee407c8a92f3403a7bae28e7f5cf8879cbb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Tue, 12 Jan 2021 02:12:30 +0100 Subject: [PATCH 03/31] No need for null check before instanceof --- app/src/main/java/io/lbry/browser/model/ClaimCacheKey.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/io/lbry/browser/model/ClaimCacheKey.java b/app/src/main/java/io/lbry/browser/model/ClaimCacheKey.java index 6f8c868b..d15b338a 100644 --- a/app/src/main/java/io/lbry/browser/model/ClaimCacheKey.java +++ b/app/src/main/java/io/lbry/browser/model/ClaimCacheKey.java @@ -40,7 +40,7 @@ public class ClaimCacheKey { @Override public boolean equals(@Nullable Object obj) { - if (obj == null || !(obj instanceof ClaimCacheKey)) { + if (!(obj instanceof ClaimCacheKey)) { return false; } ClaimCacheKey key = (ClaimCacheKey) obj; -- 2.43.4 From a261a625846c7358595ca1b3f2532ef6cba5839d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Tue, 12 Jan 2021 02:19:37 +0100 Subject: [PATCH 04/31] fix check for claims --- app/src/main/java/io/lbry/browser/utils/Helper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 cd117028..35956ff9 100644 --- a/app/src/main/java/io/lbry/browser/utils/Helper.java +++ b/app/src/main/java/io/lbry/browser/utils/Helper.java @@ -691,11 +691,15 @@ public final class Helper { LbryFile file = files.get(i); // remove own claims as well if (Lbry.ownClaims != null && Lbry.ownClaims.size() > 0) { + boolean hasClaim = false; for (Claim own : Lbry.ownClaims) { if (own.getClaimId().equalsIgnoreCase(file.getClaimId())) { - continue; + hasClaim = true; } } + if (hasClaim) { + continue; + } } if (!Helper.isNullOrEmpty(file.getDownloadPath())) { filtered.add(file); -- 2.43.4 From 8c9a1a396ac929d5c846a56f4513846f17781b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Tue, 12 Jan 2021 02:20:29 +0100 Subject: [PATCH 05/31] simplify code for readability --- app/src/main/java/io/lbry/browser/utils/Helper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 35956ff9..c6b75719 100644 --- a/app/src/main/java/io/lbry/browser/utils/Helper.java +++ b/app/src/main/java/io/lbry/browser/utils/Helper.java @@ -782,7 +782,7 @@ public final class Helper { rv.setAdapter(null); rv.setAdapter(adapter); - rv.scrollToPosition(prevScrollPosition > 0 ? prevScrollPosition : 0); + rv.scrollToPosition(Math.max(prevScrollPosition, 0)); } public static String makeid(int length) { -- 2.43.4 From d39952e048c163cc55d506f400d4cb4bf3a1c2ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Tue, 12 Jan 2021 02:21:37 +0100 Subject: [PATCH 06/31] simplify code for readability, stringbuilder is overkill --- app/src/main/java/io/lbry/browser/utils/Helper.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 c6b75719..f3d3ad44 100644 --- a/app/src/main/java/io/lbry/browser/utils/Helper.java +++ b/app/src/main/java/io/lbry/browser/utils/Helper.java @@ -758,11 +758,12 @@ public final class Helper { public static String generateUrl() { Random random = new Random(); - StringBuilder sb = new StringBuilder(); - sb.append(Predefined.ADJECTIVES.get(random.nextInt(Predefined.ADJECTIVES.size()))).append("-"). - append(Predefined.ADJECTIVES.get(random.nextInt(Predefined.ADJECTIVES.size()))).append("-"). - append(Predefined.ANIMALS.get(random.nextInt(Predefined.ANIMALS.size()))); - return sb.toString().toLowerCase(); + + String sb = ""; + sb += Predefined.ADJECTIVES.get(random.nextInt(Predefined.ADJECTIVES.size())) + "-"; + sb += Predefined.ADJECTIVES.get(random.nextInt(Predefined.ADJECTIVES.size())) + "-"; + sb += Predefined.ANIMALS.get(random.nextInt(Predefined.ANIMALS.size())); + return sb.toLowerCase(); } public static void refreshRecyclerView(RecyclerView rv) { -- 2.43.4 From e0bf54c304065a40617d30a29742b3843f9f5454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Tue, 12 Jan 2021 02:22:02 +0100 Subject: [PATCH 07/31] simplify code for readability, no need for null check before instanceof check --- app/src/main/java/io/lbry/browser/utils/LbryUri.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/io/lbry/browser/utils/LbryUri.java b/app/src/main/java/io/lbry/browser/utils/LbryUri.java index 2cecead7..6eb27eef 100644 --- a/app/src/main/java/io/lbry/browser/utils/LbryUri.java +++ b/app/src/main/java/io/lbry/browser/utils/LbryUri.java @@ -262,7 +262,7 @@ public class LbryUri { return toString().hashCode(); } public boolean equals(Object o) { - if (o == null || !(o instanceof LbryUri)) { + if (!(o instanceof LbryUri)) { return false; } return toString().equalsIgnoreCase(o.toString()); -- 2.43.4 From 35d448c601fa0cc670e335dbe369bb31e1749962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Tue, 12 Jan 2021 15:08:22 +0100 Subject: [PATCH 08/31] code-cleanup. Make non-changing variables final --- .../io/lbry/browser/FirstRunActivity.java | 6 +-- .../java/io/lbry/browser/MainActivity.java | 10 ++-- .../io/lbry/browser/VerificationActivity.java | 2 +- .../adapter/ChannelFilterListAdapter.java | 14 ++--- .../browser/adapter/ClaimListAdapter.java | 52 +++++++++---------- .../browser/adapter/CommentListAdapter.java | 22 ++++---- .../adapter/EditorsChoiceItemAdapter.java | 14 ++--- .../browser/adapter/GalleryGridAdapter.java | 12 ++--- .../adapter/InlineChannelSpinnerAdapter.java | 6 +-- .../browser/adapter/InviteeListAdapter.java | 8 +-- .../adapter/LanguageSpinnerAdapter.java | 4 +- .../adapter/LicenseSpinnerAdapter.java | 4 +- .../adapter/NavigationMenuAdapter.java | 8 +-- .../adapter/NotificationListAdapter.java | 20 +++---- .../browser/adapter/RewardListAdapter.java | 22 ++++---- .../adapter/SuggestedChannelGridAdapter.java | 16 +++--- .../lbry/browser/adapter/TagListAdapter.java | 9 ++-- .../adapter/TransactionListAdapter.java | 20 +++---- .../adapter/UrlSuggestionListAdapter.java | 10 ++-- .../adapter/VerificationPagerAdapter.java | 2 +- .../dialog/ContentFromDialogFragment.java | 4 +- .../dialog/ContentScopeDialogFragment.java | 4 +- .../dialog/ContentSortDialogFragment.java | 4 +- .../dialog/CustomizeTagsDialogFragment.java | 2 +- .../browser/model/ClaimSearchCacheValue.java | 6 +-- .../java/io/lbry/browser/model/Language.java | 6 +-- .../java/io/lbry/browser/model/License.java | 4 +- .../io/lbry/browser/model/NavMenuItem.java | 4 +- .../io/lbry/browser/model/StartupStage.java | 4 +- .../io/lbry/browser/model/WalletBalance.java | 14 +++++ .../io/lbry/browser/model/WalletSync.java | 9 +++- .../lbry/browser/tasks/BufferEventTask.java | 10 ++-- .../lbry/browser/tasks/CommentCreateTask.java | 6 +-- .../lbry/browser/tasks/CommentListTask.java | 4 +- .../browser/tasks/FollowUnfollowTagTask.java | 8 +-- .../tasks/LighthouseAutoCompleteTask.java | 6 +-- .../browser/tasks/LighthouseSearchTask.java | 14 ++--- .../io/lbry/browser/tasks/LoadTagsTask.java | 4 +- .../browser/tasks/MergeSubscriptionsTask.java | 8 +-- .../lbry/browser/tasks/ReadTextFileTask.java | 4 +- .../lbry/browser/tasks/SetSdkSettingTask.java | 6 +-- .../tasks/UpdateSuggestedTagsTask.java | 14 ++--- .../lbry/browser/tasks/UploadImageTask.java | 6 +-- .../tasks/claim/AbandonChannelTask.java | 6 +-- .../tasks/claim/AbandonStreamTask.java | 6 +-- .../tasks/claim/ChannelCreateUpdateTask.java | 10 ++-- .../browser/tasks/claim/ClaimListTask.java | 6 +-- .../browser/tasks/claim/ClaimSearchTask.java | 8 +-- .../browser/tasks/claim/PublishClaimTask.java | 8 +-- .../browser/tasks/claim/PurchaseListTask.java | 4 +- .../lbry/browser/tasks/claim/ResolveTask.java | 8 +-- .../browser/tasks/claim/StreamRepostTask.java | 12 ++--- .../tasks/file/BulkDeleteFilesTask.java | 2 +- .../browser/tasks/file/DeleteFileTask.java | 4 +- .../lbry/browser/tasks/file/FileListTask.java | 6 +-- .../lbry/browser/tasks/file/GetFileTask.java | 8 +-- .../tasks/lbryinc/AndroidPurchaseTask.java | 8 +-- .../tasks/lbryinc/ChannelSubscribeTask.java | 10 ++-- .../tasks/lbryinc/ClaimRewardTask.java | 10 ++-- .../tasks/lbryinc/FetchCurrentUserTask.java | 4 +- .../tasks/lbryinc/FetchInviteStatusTask.java | 4 +- .../tasks/lbryinc/FetchReferralCodeTask.java | 4 +- .../tasks/lbryinc/FetchRewardsTask.java | 4 +- .../tasks/lbryinc/FetchStatCountTask.java | 8 +-- .../tasks/lbryinc/FetchSubscriptionsTask.java | 6 +-- .../tasks/lbryinc/InviteByEmailTask.java | 6 +-- .../tasks/lbryinc/LogFileViewTask.java | 8 +-- .../browser/tasks/lbryinc/LogPublishTask.java | 2 +- .../tasks/lbryinc/NotificationDeleteTask.java | 2 +- .../tasks/lbryinc/NotificationListTask.java | 6 +-- .../tasks/lbryinc/NotificationUpdateTask.java | 8 +-- .../tasks/lbryinc/TwitterVerifyTask.java | 8 +-- .../localdata/FetchRecentUrlHistoryTask.java | 4 +- .../tasks/localdata/FetchViewHistoryTask.java | 8 +-- .../tasks/localdata/LoadGalleryItemsTask.java | 6 +-- .../tasks/localdata/SaveUrlHistoryTask.java | 6 +-- .../tasks/localdata/SaveViewHistoryTask.java | 6 +-- .../CheckUserEmailVerifiedTask.java | 4 +- .../tasks/verification/EmailNewTask.java | 6 +-- .../tasks/verification/EmailResendTask.java | 6 +-- .../verification/PhoneNewVerifyTask.java | 10 ++-- .../verification/TwitterAccessTokenTask.java | 4 +- .../verification/TwitterRequestTokenTask.java | 6 +-- .../tasks/wallet/LoadSharedUserStateTask.java | 4 +- .../tasks/wallet/SaveSharedUserStateTask.java | 2 +- .../tasks/wallet/SupportCreateTask.java | 12 ++--- .../browser/tasks/wallet/SyncApplyTask.java | 4 +- .../browser/tasks/wallet/SyncGetTask.java | 6 +-- .../browser/tasks/wallet/SyncSetTask.java | 8 +-- .../tasks/wallet/TransactionListTask.java | 8 +-- .../browser/tasks/wallet/UnlockTipsTask.java | 2 +- .../tasks/wallet/WalletAddressUnusedTask.java | 2 +- .../tasks/wallet/WalletBalanceTask.java | 2 +- .../browser/tasks/wallet/WalletSendTask.java | 8 +-- .../browser/ui/channel/ChannelFragment.java | 4 +- .../ui/channel/ChannelManagerFragment.java | 2 +- .../browser/ui/controls/OutlineIconView.java | 2 +- .../browser/ui/controls/SolidIconView.java | 2 +- .../ui/findcontent/AllContentFragment.java | 2 +- .../ui/findcontent/FileViewFragment.java | 8 +-- .../ui/findcontent/ShuffleFragment.java | 2 +- .../ui/publish/PublishFormFragment.java | 22 ++++---- .../browser/ui/publish/PublishesFragment.java | 2 +- .../WalletVerificationFragment.java | 1 + .../browser/utils/ExoplayerAudioRenderer.java | 2 +- .../main/java/io/lbry/browser/utils/Lbry.java | 4 +- .../java/io/lbry/browser/utils/LbryUri.java | 6 +-- .../java/io/lbry/browser/utils/Lbryio.java | 4 +- .../io/lbry/browser/utils/Lighthouse.java | 4 +- 109 files changed, 404 insertions(+), 385 deletions(-) diff --git a/app/src/main/java/io/lbry/browser/FirstRunActivity.java b/app/src/main/java/io/lbry/browser/FirstRunActivity.java index 46c85da7..5760118c 100644 --- a/app/src/main/java/io/lbry/browser/FirstRunActivity.java +++ b/app/src/main/java/io/lbry/browser/FirstRunActivity.java @@ -172,8 +172,8 @@ public class FirstRunActivity extends AppCompatActivity { } private static class CheckInstallIdTask extends AsyncTask { - private Context context; - private InstallIdHandler handler; + private final Context context; + private final InstallIdHandler handler; public CheckInstallIdTask(Context context, InstallIdHandler handler) { this.context = context; this.handler = handler; @@ -236,7 +236,7 @@ public class FirstRunActivity extends AppCompatActivity { } private static class AuthenticateTask extends AsyncTask { - private Context context; + private final Context context; public AuthenticateTask(Context context) { this.context = context; } diff --git a/app/src/main/java/io/lbry/browser/MainActivity.java b/app/src/main/java/io/lbry/browser/MainActivity.java index cc7ffd43..c113c707 100644 --- a/app/src/main/java/io/lbry/browser/MainActivity.java +++ b/app/src/main/java/io/lbry/browser/MainActivity.java @@ -260,7 +260,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener public static boolean startingFilePickerActivity = false; public static boolean startingShareActivity = false; public static boolean startingPermissionRequest = false; - public static boolean startingSignInFlowActivity = false; + public static final boolean startingSignInFlowActivity = false; private ActionMode actionMode; private BillingClient billingClient; @@ -403,7 +403,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener private List fetchClaimsListeners; private List fetchChannelsListeners; @Getter - private ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(); + private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(); private boolean walletBalanceUpdateScheduled; private boolean shouldOpenUserSelectedMenuItem; private boolean walletSyncScheduled; @@ -1012,7 +1012,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener openFragment(RewardsFragment.class, true, NavMenuItem.ID_ITEM_REWARDS); } - private FragmentManager.OnBackStackChangedListener backStackChangedListener = new FragmentManager.OnBackStackChangedListener() { + private final FragmentManager.OnBackStackChangedListener backStackChangedListener = new FragmentManager.OnBackStackChangedListener() { @Override public void onBackStackChanged() { FragmentManager manager = getSupportFragmentManager(); @@ -3246,8 +3246,8 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener } private static class CheckSdkReadyTask extends AsyncTask { - private Context context; - private List listeners; + private final Context context; + private final List listeners; public CheckSdkReadyTask(Context context, List listeners) { this.context = context; diff --git a/app/src/main/java/io/lbry/browser/VerificationActivity.java b/app/src/main/java/io/lbry/browser/VerificationActivity.java index 8b08e91f..a9489f56 100644 --- a/app/src/main/java/io/lbry/browser/VerificationActivity.java +++ b/app/src/main/java/io/lbry/browser/VerificationActivity.java @@ -56,7 +56,7 @@ public class VerificationActivity extends FragmentActivity implements SignInList private boolean signedIn; private int flow; - private PurchasesUpdatedListener purchasesUpdatedListener = new PurchasesUpdatedListener() { + private final PurchasesUpdatedListener purchasesUpdatedListener = new PurchasesUpdatedListener() { @Override public void onPurchasesUpdated(@NonNull BillingResult billingResult, @Nullable List purchases) { int responseCode = billingResult.getResponseCode(); diff --git a/app/src/main/java/io/lbry/browser/adapter/ChannelFilterListAdapter.java b/app/src/main/java/io/lbry/browser/adapter/ChannelFilterListAdapter.java index 63e1f406..0f38a3b7 100644 --- a/app/src/main/java/io/lbry/browser/adapter/ChannelFilterListAdapter.java +++ b/app/src/main/java/io/lbry/browser/adapter/ChannelFilterListAdapter.java @@ -23,7 +23,7 @@ import lombok.Getter; import lombok.Setter; public class ChannelFilterListAdapter extends RecyclerView.Adapter { - private Context context; + private final Context context; private List items; @Getter @Setter @@ -42,12 +42,12 @@ public class ChannelFilterListAdapter extends RecyclerView.Adapter quickClaimIdMap; - private Map quickClaimUrlMap; - private Map notFoundClaimIdMap; - private Map notFoundClaimUrlMap; + private final Map quickClaimIdMap; + private final Map quickClaimUrlMap; + private final Map notFoundClaimIdMap; + private final Map notFoundClaimUrlMap; @Setter private boolean hideFee; @Setter private boolean canEnterSelectionMode; - private Context context; + private final Context context; private List items; - private List selectedItems; + private final List selectedItems; @Setter private ClaimListItemListener listener; @Getter @@ -176,27 +176,27 @@ public class ClaimListAdapter extends RecyclerView.Adapter { - private List items; - private Context context; - private boolean nested; + private final List items; + private final Context context; + private final boolean nested; private float scale; @Setter private ClaimListAdapter.ClaimListItemListener listener; @@ -102,14 +102,14 @@ public class CommentListAdapter extends RecyclerView.Adapter items; + private final Context context; + private final List items; @Setter private EditorsChoiceItemListener listener; @@ -48,11 +48,11 @@ public class EditorsChoiceItemAdapter extends RecyclerView.Adapter { - private Context context; - private List items; + private final Context context; + private final List items; @Setter private GalleryItemClickListener listener; @@ -32,8 +32,8 @@ public class GalleryGridAdapter extends RecyclerView.Adapter { - private List channels; - private int layoutResourceId; - private LayoutInflater inflater; + private final List channels; + private final int layoutResourceId; + private final LayoutInflater inflater; public InlineChannelSpinnerAdapter(Context context, int resource, List channels) { super(context, resource, 0, channels); diff --git a/app/src/main/java/io/lbry/browser/adapter/InviteeListAdapter.java b/app/src/main/java/io/lbry/browser/adapter/InviteeListAdapter.java index 7ff066b0..af1e59fd 100644 --- a/app/src/main/java/io/lbry/browser/adapter/InviteeListAdapter.java +++ b/app/src/main/java/io/lbry/browser/adapter/InviteeListAdapter.java @@ -24,8 +24,8 @@ import lombok.Setter; public class InviteeListAdapter extends RecyclerView.Adapter { - private Context context; - private List items; + private final Context context; + private final List items; public InviteeListAdapter(List invitees, Context context) { this.context = context; @@ -80,8 +80,8 @@ public class InviteeListAdapter extends RecyclerView.Adapter { - private int layoutResourceId; - private LayoutInflater inflater; + private final int layoutResourceId; + private final LayoutInflater inflater; public LanguageSpinnerAdapter(Context context, int resource) { super(context, resource, 0, Predefined.PUBLISH_LANGUAGES); diff --git a/app/src/main/java/io/lbry/browser/adapter/LicenseSpinnerAdapter.java b/app/src/main/java/io/lbry/browser/adapter/LicenseSpinnerAdapter.java index c6776cf9..62a808ce 100644 --- a/app/src/main/java/io/lbry/browser/adapter/LicenseSpinnerAdapter.java +++ b/app/src/main/java/io/lbry/browser/adapter/LicenseSpinnerAdapter.java @@ -15,8 +15,8 @@ import io.lbry.browser.model.License; import io.lbry.browser.utils.Predefined; public class LicenseSpinnerAdapter extends ArrayAdapter { - private int layoutResourceId; - private LayoutInflater inflater; + private final int layoutResourceId; + private final LayoutInflater inflater; public LicenseSpinnerAdapter(Context context, int resource) { super(context, resource, 0, Predefined.LICENSES); diff --git a/app/src/main/java/io/lbry/browser/adapter/NavigationMenuAdapter.java b/app/src/main/java/io/lbry/browser/adapter/NavigationMenuAdapter.java index f5c75a55..0106aaf3 100644 --- a/app/src/main/java/io/lbry/browser/adapter/NavigationMenuAdapter.java +++ b/app/src/main/java/io/lbry/browser/adapter/NavigationMenuAdapter.java @@ -24,8 +24,8 @@ public class NavigationMenuAdapter extends RecyclerView.Adapter menuItems; + private final Context context; + private final List menuItems; private NavMenuItem currentItem; @Setter private NavigationMenuItemClickListener listener; @@ -65,8 +65,8 @@ public class NavigationMenuAdapter extends RecyclerView.Adapter items; - private List selectedItems; + private final Context context; + private final List items; + private final List selectedItems; @Setter private NotificationClickListener clickListener; @Getter @@ -62,13 +62,13 @@ public class NotificationListAdapter extends RecyclerView.Adapter all; private List items; @@ -85,16 +85,16 @@ public class RewardListAdapter extends RecyclerView.Adapter { - private Context context; - private List items; - private List selectedItems; + private final Context context; + private final List items; + private final List selectedItems; @Setter private ChannelItemSelectionListener listener; @@ -35,11 +35,11 @@ public class SuggestedChannelGridAdapter extends RecyclerView.Adapter items; @Setter private TagClickListener clickListener; - @Getter + @Setter + @Getter private int customizeMode; public TagListAdapter(List tags, Context context) { @@ -38,8 +39,8 @@ public class TagListAdapter extends RecyclerView.Adapter items; + private final Context context; + private final List items; @Setter private TransactionClickListener listener; @@ -107,14 +107,14 @@ public class TransactionListAdapter extends RecyclerView.Adapter { - private Context context; - private List items; + private final Context context; + private final List items; @Setter private UrlSuggestionClickListener listener; @@ -130,9 +130,9 @@ public class UrlSuggestionListAdapter extends RecyclerView.Adapter claims; + private final List claims; @Getter - @Setter - private long timestamp; + private final long timestamp; public ClaimSearchCacheValue(List claims, long timestamp) { this.claims = new ArrayList<>(claims); diff --git a/app/src/main/java/io/lbry/browser/model/Language.java b/app/src/main/java/io/lbry/browser/model/Language.java index e3f4567b..552643d6 100644 --- a/app/src/main/java/io/lbry/browser/model/Language.java +++ b/app/src/main/java/io/lbry/browser/model/Language.java @@ -4,9 +4,9 @@ import lombok.Data; @Data public class Language { - private String code; - private String name; - private int stringResourceId; + private final String code; + private final String name; + private final int stringResourceId; public Language(String code, String name, int stringResourceId) { this.code = code; diff --git a/app/src/main/java/io/lbry/browser/model/License.java b/app/src/main/java/io/lbry/browser/model/License.java index b278eafa..eb8cb6c3 100644 --- a/app/src/main/java/io/lbry/browser/model/License.java +++ b/app/src/main/java/io/lbry/browser/model/License.java @@ -4,9 +4,9 @@ import lombok.Data; @Data public class License { - private String name; + private final String name; private String url; - private int stringResourceId; + private final int stringResourceId; public License(String name, int stringResourceId) { this.name = name; diff --git a/app/src/main/java/io/lbry/browser/model/NavMenuItem.java b/app/src/main/java/io/lbry/browser/model/NavMenuItem.java index 9f5ce45d..1059d004 100644 --- a/app/src/main/java/io/lbry/browser/model/NavMenuItem.java +++ b/app/src/main/java/io/lbry/browser/model/NavMenuItem.java @@ -37,8 +37,8 @@ public class NavMenuItem { public static final int ID_ITEM_SETTINGS = 401; public static final int ID_ITEM_ABOUT = 402; - private Context context; - private int id; + private final Context context; + private final int id; private boolean group; private int icon; private String title; diff --git a/app/src/main/java/io/lbry/browser/model/StartupStage.java b/app/src/main/java/io/lbry/browser/model/StartupStage.java index 955d239a..469d2cb0 100644 --- a/app/src/main/java/io/lbry/browser/model/StartupStage.java +++ b/app/src/main/java/io/lbry/browser/model/StartupStage.java @@ -1,8 +1,8 @@ package io.lbry.browser.model; public class StartupStage { - public Integer stage; - public Boolean stageDone; + public final Integer stage; + public final Boolean stageDone; public StartupStage(Integer stage, Boolean stageDone) { this.stage = stage; diff --git a/app/src/main/java/io/lbry/browser/model/WalletBalance.java b/app/src/main/java/io/lbry/browser/model/WalletBalance.java index c2102b70..b2c881f8 100644 --- a/app/src/main/java/io/lbry/browser/model/WalletBalance.java +++ b/app/src/main/java/io/lbry/browser/model/WalletBalance.java @@ -6,14 +6,28 @@ import java.math.BigDecimal; import io.lbry.browser.utils.Helper; import lombok.Data; +import lombok.Getter; +import lombok.Setter; @Data public class WalletBalance { + @Setter + @Getter private BigDecimal available; + @Setter + @Getter private BigDecimal reserved; + @Setter + @Getter private BigDecimal claims; + @Setter + @Getter private BigDecimal supports; + @Setter + @Getter private BigDecimal tips; + @Setter + @Getter private BigDecimal total; public WalletBalance() { diff --git a/app/src/main/java/io/lbry/browser/model/WalletSync.java b/app/src/main/java/io/lbry/browser/model/WalletSync.java index 05857ff0..24c3eacd 100644 --- a/app/src/main/java/io/lbry/browser/model/WalletSync.java +++ b/app/src/main/java/io/lbry/browser/model/WalletSync.java @@ -1,11 +1,15 @@ package io.lbry.browser.model; import lombok.Data; +import lombok.Getter; @Data public class WalletSync { - private String hash; - private String data; + @Getter + private final String hash; + @Getter + private final String data; + @Getter private boolean changed; public WalletSync(String hash, String data) { @@ -17,4 +21,5 @@ public class WalletSync { this(hash, data); this.changed = changed; } + } diff --git a/app/src/main/java/io/lbry/browser/tasks/BufferEventTask.java b/app/src/main/java/io/lbry/browser/tasks/BufferEventTask.java index 826e392f..fa35ea92 100644 --- a/app/src/main/java/io/lbry/browser/tasks/BufferEventTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/BufferEventTask.java @@ -17,11 +17,11 @@ public class BufferEventTask extends AsyncTask { private static final String TAG = "LbryBufferEvent"; private static final String ENDPOINT = "https://collector-service.api.lbry.tv/api/v1/events/video"; - private String streamUrl; - private String userIdHash; - private long streamDuration; - private long streamPosition; - private long bufferDuration; + private final String streamUrl; + private final String userIdHash; + private final long streamDuration; + private final long streamPosition; + private final long bufferDuration; public BufferEventTask(String streamUrl, long streamDuration, long streamPosition, long bufferDuration, String userIdHash) { this.streamUrl = streamUrl; diff --git a/app/src/main/java/io/lbry/browser/tasks/CommentCreateTask.java b/app/src/main/java/io/lbry/browser/tasks/CommentCreateTask.java index 54f810e6..8465bfed 100644 --- a/app/src/main/java/io/lbry/browser/tasks/CommentCreateTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/CommentCreateTask.java @@ -27,9 +27,9 @@ import okhttp3.Response; public class CommentCreateTask extends AsyncTask { private static final String STATUS_ENDPOINT = "https://comments.lbry.com"; - private Comment comment; - private View progressView; - private CommentCreateWithTipHandler handler; + private final Comment comment; + private final View progressView; + private final CommentCreateWithTipHandler handler; private Exception error; public CommentCreateTask(Comment comment, View progressView, CommentCreateWithTipHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/CommentListTask.java b/app/src/main/java/io/lbry/browser/tasks/CommentListTask.java index 2833e003..5c088278 100644 --- a/app/src/main/java/io/lbry/browser/tasks/CommentListTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/CommentListTask.java @@ -21,8 +21,8 @@ public class CommentListTask extends AsyncTask> { private final int page; private final int pageSize; private final String claim; - private ProgressBar progressBar; - private CommentListHandler handler; + private final ProgressBar progressBar; + private final CommentListHandler handler; private Exception error; public CommentListTask(int page, int pageSize, String claim, ProgressBar progressBar, CommentListHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/FollowUnfollowTagTask.java b/app/src/main/java/io/lbry/browser/tasks/FollowUnfollowTagTask.java index 3c7f4dca..2a9ceba0 100644 --- a/app/src/main/java/io/lbry/browser/tasks/FollowUnfollowTagTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/FollowUnfollowTagTask.java @@ -10,10 +10,10 @@ import io.lbry.browser.model.Tag; import io.lbry.browser.utils.Lbry; public class FollowUnfollowTagTask extends AsyncTask { - private Tag tag; - private boolean unfollowing; - private Context context; - private FollowUnfollowTagHandler handler; + private final Tag tag; + private final boolean unfollowing; + private final Context context; + private final FollowUnfollowTagHandler handler; private Exception error; public FollowUnfollowTagTask(Tag tag, boolean unfollowing, Context context, FollowUnfollowTagHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/LighthouseAutoCompleteTask.java b/app/src/main/java/io/lbry/browser/tasks/LighthouseAutoCompleteTask.java index a0c32b86..d8abb751 100644 --- a/app/src/main/java/io/lbry/browser/tasks/LighthouseAutoCompleteTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/LighthouseAutoCompleteTask.java @@ -12,9 +12,9 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lighthouse; public class LighthouseAutoCompleteTask extends AsyncTask> { - private String text; - private AutoCompleteResultHandler handler; - private View progressView; + private final String text; + private final AutoCompleteResultHandler handler; + private final View progressView; private Exception error; public LighthouseAutoCompleteTask(String text, View progressView, AutoCompleteResultHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/LighthouseSearchTask.java b/app/src/main/java/io/lbry/browser/tasks/LighthouseSearchTask.java index 6da1d943..98fd9e3f 100644 --- a/app/src/main/java/io/lbry/browser/tasks/LighthouseSearchTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/LighthouseSearchTask.java @@ -14,13 +14,13 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lighthouse; public class LighthouseSearchTask extends AsyncTask> { - private String rawQuery; - private int size; - private int from; - private boolean nsfw; - private String relatedTo; - private ClaimSearchResultHandler handler; - private ProgressBar progressBar; + private final String rawQuery; + private final int size; + private final int from; + private final boolean nsfw; + private final String relatedTo; + private final ClaimSearchResultHandler handler; + private final ProgressBar progressBar; private Exception error; public LighthouseSearchTask(String rawQuery, int size, int from, boolean nsfw, String relatedTo, ProgressBar progressBar, ClaimSearchResultHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/LoadTagsTask.java b/app/src/main/java/io/lbry/browser/tasks/LoadTagsTask.java index 4eb465e3..fa95c52f 100644 --- a/app/src/main/java/io/lbry/browser/tasks/LoadTagsTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/LoadTagsTask.java @@ -18,8 +18,8 @@ import io.lbry.browser.model.Tag; import io.lbry.browser.utils.Helper; public class LoadTagsTask extends AsyncTask> { - private Context context; - private LoadTagsHandler handler; + private final Context context; + private final LoadTagsHandler handler; private Exception error; public LoadTagsTask(Context context, LoadTagsHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java b/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java index 842c381e..b2476f89 100644 --- a/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java @@ -29,12 +29,12 @@ import okhttp3.Response; // background task to create a diff of local and remote subscriptions and try to merge public class MergeSubscriptionsTask extends AsyncTask> { private static final String TAG = "MergeSubscriptionsTask"; - private Context context; - private List base; + private final Context context; + private final List base; private List diff; - private MergeSubscriptionsHandler handler; + private final MergeSubscriptionsHandler handler; private Exception error; - private boolean replaceLocal; + private final boolean replaceLocal; public MergeSubscriptionsTask(List base, boolean replaceLocal, Context context, MergeSubscriptionsHandler handler) { this.base = base; diff --git a/app/src/main/java/io/lbry/browser/tasks/ReadTextFileTask.java b/app/src/main/java/io/lbry/browser/tasks/ReadTextFileTask.java index 3dfa6b93..e9eb6bf1 100644 --- a/app/src/main/java/io/lbry/browser/tasks/ReadTextFileTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/ReadTextFileTask.java @@ -13,9 +13,9 @@ import java.nio.Buffer; import io.lbry.browser.utils.Helper; public class ReadTextFileTask extends AsyncTask { - private String filePath; + private final String filePath; private Exception error; - private ReadTextFileHandler handler; + private final ReadTextFileHandler handler; public ReadTextFileTask(String filePath, ReadTextFileHandler handler) { this.filePath = filePath; this.handler = handler; diff --git a/app/src/main/java/io/lbry/browser/tasks/SetSdkSettingTask.java b/app/src/main/java/io/lbry/browser/tasks/SetSdkSettingTask.java index 42dafdc7..87459305 100644 --- a/app/src/main/java/io/lbry/browser/tasks/SetSdkSettingTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/SetSdkSettingTask.java @@ -9,9 +9,9 @@ import io.lbry.browser.exceptions.ApiCallException; import io.lbry.browser.utils.Lbry; public class SetSdkSettingTask extends AsyncTask { - private String key; - private String value; - private GenericTaskHandler handler; + private final String key; + private final String value; + private final GenericTaskHandler handler; private Exception error; public SetSdkSettingTask(String key, String value, GenericTaskHandler handler) { this.key = key; diff --git a/app/src/main/java/io/lbry/browser/tasks/UpdateSuggestedTagsTask.java b/app/src/main/java/io/lbry/browser/tasks/UpdateSuggestedTagsTask.java index d0dd0326..fbd07614 100644 --- a/app/src/main/java/io/lbry/browser/tasks/UpdateSuggestedTagsTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/UpdateSuggestedTagsTask.java @@ -13,13 +13,13 @@ import io.lbry.browser.utils.Lbry; public class UpdateSuggestedTagsTask extends AsyncTask> { - private boolean clearPrevious; - private boolean excludeMature; - private int limit; - private String filter; - private TagListAdapter addedTagsAdapter; - private TagListAdapter suggestedTagsAdapter; - private KnownTagsHandler handler; + private final boolean clearPrevious; + private final boolean excludeMature; + private final int limit; + private final String filter; + private final TagListAdapter addedTagsAdapter; + private final TagListAdapter suggestedTagsAdapter; + private final KnownTagsHandler handler; public UpdateSuggestedTagsTask( String filter, diff --git a/app/src/main/java/io/lbry/browser/tasks/UploadImageTask.java b/app/src/main/java/io/lbry/browser/tasks/UploadImageTask.java index 2dcd8d65..9e4194df 100644 --- a/app/src/main/java/io/lbry/browser/tasks/UploadImageTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/UploadImageTask.java @@ -21,9 +21,9 @@ import okhttp3.RequestBody; import okhttp3.Response; public class UploadImageTask extends AsyncTask { - private String filePath; - private View progressView; - private UploadThumbnailHandler handler; + private final String filePath; + private final View progressView; + private final UploadThumbnailHandler handler; private Exception error; public UploadImageTask(String filePath, View progressView, UploadThumbnailHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/claim/AbandonChannelTask.java b/app/src/main/java/io/lbry/browser/tasks/claim/AbandonChannelTask.java index 3b71a45b..8cd5987c 100644 --- a/app/src/main/java/io/lbry/browser/tasks/claim/AbandonChannelTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/claim/AbandonChannelTask.java @@ -16,12 +16,12 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class AbandonChannelTask extends AsyncTask { - private List claimIds; + private final List claimIds; private List successfulClaimIds; private List failedClaimIds; private List failedExceptions; - private View progressView; - private AbandonHandler handler; + private final View progressView; + private final AbandonHandler handler; public AbandonChannelTask(List claimIds, View progressView, AbandonHandler handler) { this.claimIds = claimIds; diff --git a/app/src/main/java/io/lbry/browser/tasks/claim/AbandonStreamTask.java b/app/src/main/java/io/lbry/browser/tasks/claim/AbandonStreamTask.java index a5c68d93..162a9b6d 100644 --- a/app/src/main/java/io/lbry/browser/tasks/claim/AbandonStreamTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/claim/AbandonStreamTask.java @@ -16,12 +16,12 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class AbandonStreamTask extends AsyncTask { - private List claimIds; + private final List claimIds; private List successfulClaimIds; private List failedClaimIds; private List failedExceptions; - private View progressView; - private AbandonHandler handler; + private final View progressView; + private final AbandonHandler handler; public AbandonStreamTask(List claimIds, View progressView, AbandonHandler handler) { this.claimIds = claimIds; diff --git a/app/src/main/java/io/lbry/browser/tasks/claim/ChannelCreateUpdateTask.java b/app/src/main/java/io/lbry/browser/tasks/claim/ChannelCreateUpdateTask.java index 6611572d..42d5abc5 100644 --- a/app/src/main/java/io/lbry/browser/tasks/claim/ChannelCreateUpdateTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/claim/ChannelCreateUpdateTask.java @@ -21,12 +21,12 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class ChannelCreateUpdateTask extends AsyncTask { - private Claim claim; - private BigDecimal deposit; - private boolean update; + private final Claim claim; + private final BigDecimal deposit; + private final boolean update; private Exception error; - private ClaimResultHandler handler; - private View progressView; + private final ClaimResultHandler handler; + private final View progressView; public ChannelCreateUpdateTask(Claim claim, BigDecimal deposit, boolean update, View progressView, ClaimResultHandler handler) { this.claim = claim; diff --git a/app/src/main/java/io/lbry/browser/tasks/claim/ClaimListTask.java b/app/src/main/java/io/lbry/browser/tasks/claim/ClaimListTask.java index 592aab55..63c6d68a 100644 --- a/app/src/main/java/io/lbry/browser/tasks/claim/ClaimListTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/claim/ClaimListTask.java @@ -19,9 +19,9 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class ClaimListTask extends AsyncTask> { - private List types; - private View progressView; - private ClaimListResultHandler handler; + private final List types; + private final View progressView; + private final ClaimListResultHandler handler; private Exception error; public ClaimListTask(String type, View progressView, ClaimListResultHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/claim/ClaimSearchTask.java b/app/src/main/java/io/lbry/browser/tasks/claim/ClaimSearchTask.java index 8b243b86..ec135afc 100644 --- a/app/src/main/java/io/lbry/browser/tasks/claim/ClaimSearchTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/claim/ClaimSearchTask.java @@ -12,10 +12,10 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class ClaimSearchTask extends AsyncTask> { - private Map options; - private String connectionString; - private ClaimSearchResultHandler handler; - private View progressView; + private final Map options; + private final String connectionString; + private final ClaimSearchResultHandler handler; + private final View progressView; private ApiCallException error; public ClaimSearchTask(Map options, String connectionString, View progressView, ClaimSearchResultHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/claim/PublishClaimTask.java b/app/src/main/java/io/lbry/browser/tasks/claim/PublishClaimTask.java index d5e59397..87c6a524 100644 --- a/app/src/main/java/io/lbry/browser/tasks/claim/PublishClaimTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/claim/PublishClaimTask.java @@ -21,10 +21,10 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class PublishClaimTask extends AsyncTask { - private Claim claim; - private String filePath; - private View progressView; - private ClaimResultHandler handler; + private final Claim claim; + private final String filePath; + private final View progressView; + private final ClaimResultHandler handler; private Exception error; public PublishClaimTask(Claim claim, String filePath, View progressView, ClaimResultHandler handler) { this.claim = claim; diff --git a/app/src/main/java/io/lbry/browser/tasks/claim/PurchaseListTask.java b/app/src/main/java/io/lbry/browser/tasks/claim/PurchaseListTask.java index 06b05ba2..e4cee5fa 100644 --- a/app/src/main/java/io/lbry/browser/tasks/claim/PurchaseListTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/claim/PurchaseListTask.java @@ -21,8 +21,8 @@ public class PurchaseListTask extends AsyncTask> { private String claimId; private int page; private int pageSize; - private ClaimSearchResultHandler handler; - private View progressView; + private final ClaimSearchResultHandler handler; + private final View progressView; private Exception error; public PurchaseListTask(String claimId, View progressView, ClaimSearchResultHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/claim/ResolveTask.java b/app/src/main/java/io/lbry/browser/tasks/claim/ResolveTask.java index 120c36b7..b6588caf 100644 --- a/app/src/main/java/io/lbry/browser/tasks/claim/ResolveTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/claim/ResolveTask.java @@ -13,10 +13,10 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class ResolveTask extends AsyncTask> { - private List urls; - private String connectionString; - private ClaimListResultHandler handler; - private View progressView; + private final List urls; + private final String connectionString; + private final ClaimListResultHandler handler; + private final View progressView; private ApiCallException error; public ResolveTask(String url, String connectionString, View progressView, ClaimListResultHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/claim/StreamRepostTask.java b/app/src/main/java/io/lbry/browser/tasks/claim/StreamRepostTask.java index 28ec4dcf..da4aaadc 100644 --- a/app/src/main/java/io/lbry/browser/tasks/claim/StreamRepostTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/claim/StreamRepostTask.java @@ -20,12 +20,12 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class StreamRepostTask extends AsyncTask { - private String name; - private BigDecimal bid; - private String claimId; - private String channelId; - private View progressView; - private ClaimResultHandler handler; + private final String name; + private final BigDecimal bid; + private final String claimId; + private final String channelId; + private final View progressView; + private final ClaimResultHandler handler; private Exception error; public StreamRepostTask(String name, BigDecimal bid, String claimId, String channelId, View progressView, ClaimResultHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/file/BulkDeleteFilesTask.java b/app/src/main/java/io/lbry/browser/tasks/file/BulkDeleteFilesTask.java index b05ec9d8..f696d65a 100644 --- a/app/src/main/java/io/lbry/browser/tasks/file/BulkDeleteFilesTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/file/BulkDeleteFilesTask.java @@ -12,7 +12,7 @@ import io.lbry.browser.utils.Lbry; // Just run delete on the specified claim IDs (no need for a handler) public class BulkDeleteFilesTask extends AsyncTask { - private List claimIds; + private final List claimIds; public BulkDeleteFilesTask(List claimIds) { this.claimIds = claimIds; } diff --git a/app/src/main/java/io/lbry/browser/tasks/file/DeleteFileTask.java b/app/src/main/java/io/lbry/browser/tasks/file/DeleteFileTask.java index bdc50bc4..50bd8ff8 100644 --- a/app/src/main/java/io/lbry/browser/tasks/file/DeleteFileTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/file/DeleteFileTask.java @@ -10,9 +10,9 @@ import io.lbry.browser.tasks.GenericTaskHandler; import io.lbry.browser.utils.Lbry; public class DeleteFileTask extends AsyncTask { - private String claimId; + private final String claimId; private Exception error; - private GenericTaskHandler handler; + private final GenericTaskHandler handler; public DeleteFileTask(String claimId, GenericTaskHandler handler) { this.claimId = claimId; diff --git a/app/src/main/java/io/lbry/browser/tasks/file/FileListTask.java b/app/src/main/java/io/lbry/browser/tasks/file/FileListTask.java index 0b442d77..9fa0119b 100644 --- a/app/src/main/java/io/lbry/browser/tasks/file/FileListTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/file/FileListTask.java @@ -11,12 +11,12 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class FileListTask extends AsyncTask> { - private String claimId; + private final String claimId; private boolean downloads; private int page; private int pageSize; - private FileListResultHandler handler; - private View progressView; + private final FileListResultHandler handler; + private final View progressView; private ApiCallException error; public FileListTask(int page, int pageSize, boolean downloads, View progressView, FileListResultHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/file/GetFileTask.java b/app/src/main/java/io/lbry/browser/tasks/file/GetFileTask.java index bf708c82..69badf6e 100644 --- a/app/src/main/java/io/lbry/browser/tasks/file/GetFileTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/file/GetFileTask.java @@ -14,10 +14,10 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class GetFileTask extends AsyncTask { - private String uri; - private boolean saveFile; - private View progressView; - private GetFileHandler handler; + private final String uri; + private final boolean saveFile; + private final View progressView; + private final GetFileHandler handler; private Exception error; public GetFileTask(String uri, boolean saveFile, View progressView, GetFileHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/AndroidPurchaseTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/AndroidPurchaseTask.java index 67a2ba8e..46fa0df8 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/AndroidPurchaseTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/AndroidPurchaseTask.java @@ -23,10 +23,10 @@ import io.lbry.browser.utils.Lbryio; import okhttp3.Response; public class AndroidPurchaseTask extends AsyncTask { - private Context context; - private View progressView; - private String purchaseToken; - private RewardVerifiedHandler handler; + private final Context context; + private final View progressView; + private final String purchaseToken; + private final RewardVerifiedHandler handler; private Exception error; public AndroidPurchaseTask(String purchaseToken, View progressView, Context context, RewardVerifiedHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/ChannelSubscribeTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/ChannelSubscribeTask.java index ee02e63e..f271d36b 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/ChannelSubscribeTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/ChannelSubscribeTask.java @@ -17,12 +17,12 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbryio; public class ChannelSubscribeTask extends AsyncTask { - private Context context; - private String channelClaimId; - private Subscription subscription; - private ChannelSubscribeHandler handler; + private final Context context; + private final String channelClaimId; + private final Subscription subscription; + private final ChannelSubscribeHandler handler; private Exception error; - private boolean isUnsubscribing; + private final boolean isUnsubscribing; public ChannelSubscribeTask(Context context, String channelClaimId, Subscription subscription, boolean isUnsubscribing, ChannelSubscribeHandler handler) { this.context = context; diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/ClaimRewardTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/ClaimRewardTask.java index cf2c9319..4c4fddde 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/ClaimRewardTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/ClaimRewardTask.java @@ -25,12 +25,12 @@ import io.lbry.browser.utils.Lbryio; public class ClaimRewardTask extends AsyncTask { - private Context context; - private String type; - private String rewardCode; - private View progressView; + private final Context context; + private final String type; + private final String rewardCode; + private final View progressView; private double amountClaimed; - private ClaimRewardHandler handler; + private final ClaimRewardHandler handler; private Exception error; public ClaimRewardTask(String type, String rewardCode, View progressView, Context context, ClaimRewardHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchCurrentUserTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchCurrentUserTask.java index eef296d3..c39adb30 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchCurrentUserTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchCurrentUserTask.java @@ -7,9 +7,9 @@ import io.lbry.browser.model.lbryinc.User; import io.lbry.browser.utils.Lbryio; public class FetchCurrentUserTask extends AsyncTask { - private Context context; + private final Context context; private Exception error; - private FetchUserTaskHandler handler; + private final FetchUserTaskHandler handler; public FetchCurrentUserTask(Context context, FetchUserTaskHandler handler) { this.context = context; diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchInviteStatusTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchInviteStatusTask.java index d56f7dbd..45ac5bf7 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchInviteStatusTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchInviteStatusTask.java @@ -17,8 +17,8 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbryio; public class FetchInviteStatusTask extends AsyncTask> { - private FetchInviteStatusHandler handler; - private View progressView; + private final FetchInviteStatusHandler handler; + private final View progressView; private Exception error; public FetchInviteStatusTask(View progressView, FetchInviteStatusHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchReferralCodeTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchReferralCodeTask.java index af15d83a..86a4d4e1 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchReferralCodeTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchReferralCodeTask.java @@ -12,8 +12,8 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbryio; public class FetchReferralCodeTask extends AsyncTask { - private FetchReferralCodeHandler handler; - private View progressView; + private final FetchReferralCodeHandler handler; + private final View progressView; private Exception error; public FetchReferralCodeTask(View progressView, FetchReferralCodeHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchRewardsTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchRewardsTask.java index b9f18067..3bdbd8fa 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchRewardsTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchRewardsTask.java @@ -18,8 +18,8 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbryio; public class FetchRewardsTask extends AsyncTask> { - private FetchRewardsHandler handler; - private View progressView; + private final FetchRewardsHandler handler; + private final View progressView; private Exception error; public FetchRewardsTask(View progressView, FetchRewardsHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchStatCountTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchStatCountTask.java index 1f8bb465..59b4777a 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchStatCountTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchStatCountTask.java @@ -15,10 +15,10 @@ public class FetchStatCountTask extends AsyncTask { public static final int STAT_VIEW_COUNT = 1; public static final int STAT_SUB_COUNT = 2; - private String claimId; - private int stat; - private FetchStatCountHandler handler; - private View progressView; + private final String claimId; + private final int stat; + private final FetchStatCountHandler handler; + private final View progressView; private Exception error; public FetchStatCountTask(int stat, String claimId, View progressView, FetchStatCountHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchSubscriptionsTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchSubscriptionsTask.java index e3c2a1f8..a6182133 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchSubscriptionsTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/FetchSubscriptionsTask.java @@ -23,9 +23,9 @@ import io.lbry.browser.utils.LbryUri; import io.lbry.browser.utils.Lbryio; public class FetchSubscriptionsTask extends AsyncTask> { - private Context context; - private FetchSubscriptionsHandler handler; - private ProgressBar progressBar; + private final Context context; + private final FetchSubscriptionsHandler handler; + private final ProgressBar progressBar; private Exception error; public FetchSubscriptionsTask(Context context, ProgressBar progressBar, FetchSubscriptionsHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/InviteByEmailTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/InviteByEmailTask.java index e2709862..4221a8f6 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/InviteByEmailTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/InviteByEmailTask.java @@ -14,9 +14,9 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbryio; public class InviteByEmailTask extends AsyncTask { - private String email; - private View progressView; - private GenericTaskHandler handler; + private final String email; + private final View progressView; + private final GenericTaskHandler handler; private Exception error; public InviteByEmailTask(String email, View progressView, GenericTaskHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogFileViewTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogFileViewTask.java index c0055a7c..0d2d5a07 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogFileViewTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogFileViewTask.java @@ -15,11 +15,11 @@ import io.lbry.browser.utils.Lbryio; import okhttp3.Response; public class LogFileViewTask extends AsyncTask { - private String uri; - private Claim claim; + private final String uri; + private final Claim claim; private Exception error; - private GenericTaskHandler handler; - private long timeToStart; + private final GenericTaskHandler handler; + private final long timeToStart; public LogFileViewTask(String uri, Claim claim, long timeToStart, GenericTaskHandler handler) { this.uri = uri; diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogPublishTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogPublishTask.java index f807f360..c9594999 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogPublishTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogPublishTask.java @@ -13,7 +13,7 @@ import io.lbry.browser.utils.Lbryio; import okhttp3.Response; public class LogPublishTask extends AsyncTask { - private Claim claimResult; + private final Claim claimResult; public LogPublishTask(Claim claimResult) { this.claimResult = claimResult; } diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationDeleteTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationDeleteTask.java index 42e23391..a30134b5 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationDeleteTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationDeleteTask.java @@ -12,7 +12,7 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbryio; public class NotificationDeleteTask extends AsyncTask { - private List ids; + private final List ids; public NotificationDeleteTask(List ids) { this.ids = ids; diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationListTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationListTask.java index 9dcc4a52..be8c64f6 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationListTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationListTask.java @@ -30,9 +30,9 @@ import io.lbry.browser.utils.Lbryio; public class NotificationListTask extends AsyncTask> { private static final String TAG = "Notifications"; - private Context context; - private ListNotificationsHandler handler; - private ProgressBar progressBar; + private final Context context; + private final ListNotificationsHandler handler; + private final ProgressBar progressBar; private Exception error; public NotificationListTask(Context context, ProgressBar progressBar, ListNotificationsHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationUpdateTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationUpdateTask.java index f942f7d6..e8a06570 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationUpdateTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationUpdateTask.java @@ -12,10 +12,10 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbryio; public class NotificationUpdateTask extends AsyncTask { - private List ids; - private boolean seen; - private boolean read; - private boolean updateRead; + private final List ids; + private final boolean seen; + private final boolean read; + private final boolean updateRead; public NotificationUpdateTask(List ids, boolean seen) { this(ids, false, true, false); diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/TwitterVerifyTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/TwitterVerifyTask.java index 265125e3..036a7650 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/TwitterVerifyTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/TwitterVerifyTask.java @@ -22,10 +22,10 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbryio; public class TwitterVerifyTask extends AsyncTask { - private Context context; - private View progressView; - private TwitterOauth twitterOauth; - private RewardVerifiedHandler handler; + private final Context context; + private final View progressView; + private final TwitterOauth twitterOauth; + private final RewardVerifiedHandler handler; private Exception error; public TwitterVerifyTask(TwitterOauth twitterOauth, View progressView, Context context, RewardVerifiedHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/localdata/FetchRecentUrlHistoryTask.java b/app/src/main/java/io/lbry/browser/tasks/localdata/FetchRecentUrlHistoryTask.java index 852e87ae..dd4f7dff 100644 --- a/app/src/main/java/io/lbry/browser/tasks/localdata/FetchRecentUrlHistoryTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/localdata/FetchRecentUrlHistoryTask.java @@ -11,8 +11,8 @@ import io.lbry.browser.data.DatabaseHelper; import io.lbry.browser.model.UrlSuggestion; public class FetchRecentUrlHistoryTask extends AsyncTask> { - private DatabaseHelper dbHelper; - private FetchRecentUrlHistoryHandler handler; + private final DatabaseHelper dbHelper; + private final FetchRecentUrlHistoryHandler handler; public FetchRecentUrlHistoryTask(DatabaseHelper dbHelper, FetchRecentUrlHistoryHandler handler) { this.dbHelper = dbHelper; this.handler = handler; diff --git a/app/src/main/java/io/lbry/browser/tasks/localdata/FetchViewHistoryTask.java b/app/src/main/java/io/lbry/browser/tasks/localdata/FetchViewHistoryTask.java index fd0d4b21..6c20bc87 100644 --- a/app/src/main/java/io/lbry/browser/tasks/localdata/FetchViewHistoryTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/localdata/FetchViewHistoryTask.java @@ -15,10 +15,10 @@ import io.lbry.browser.model.ViewHistory; import io.lbry.browser.utils.Helper; public class FetchViewHistoryTask extends AsyncTask> { - private DatabaseHelper dbHelper; - private FetchViewHistoryHandler handler; - private int pageSize; - private Date lastDate; + private final DatabaseHelper dbHelper; + private final FetchViewHistoryHandler handler; + private final int pageSize; + private final Date lastDate; public FetchViewHistoryTask(Date lastDate, int pageSize, DatabaseHelper dbHelper, FetchViewHistoryHandler handler) { this.lastDate = lastDate; this.pageSize = pageSize; 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 845f5ec5..679d57ab 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 @@ -23,9 +23,9 @@ import io.lbry.browser.utils.Helper; public class LoadGalleryItemsTask extends AsyncTask> { private static final String TAG = "LoadGalleryItemsTask"; - private LoadGalleryHandler handler; - private View progressView; - private Context context; + private final LoadGalleryHandler handler; + private final View progressView; + private final Context context; public LoadGalleryItemsTask(View progressView, Context context, LoadGalleryHandler handler) { this.progressView = progressView; diff --git a/app/src/main/java/io/lbry/browser/tasks/localdata/SaveUrlHistoryTask.java b/app/src/main/java/io/lbry/browser/tasks/localdata/SaveUrlHistoryTask.java index a5778984..5f51140a 100644 --- a/app/src/main/java/io/lbry/browser/tasks/localdata/SaveUrlHistoryTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/localdata/SaveUrlHistoryTask.java @@ -10,9 +10,9 @@ import io.lbry.browser.model.UrlSuggestion; import io.lbry.browser.tasks.GenericTaskHandler; public class SaveUrlHistoryTask extends AsyncTask { - private DatabaseHelper dbHelper; - private UrlSuggestion suggestion; - private SaveUrlHistoryHandler handler; + private final DatabaseHelper dbHelper; + private final UrlSuggestion suggestion; + private final SaveUrlHistoryHandler handler; private Exception error; public SaveUrlHistoryTask(UrlSuggestion suggestion, DatabaseHelper dbHelper, SaveUrlHistoryHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/localdata/SaveViewHistoryTask.java b/app/src/main/java/io/lbry/browser/tasks/localdata/SaveViewHistoryTask.java index bb7e0f64..9c3da2e3 100644 --- a/app/src/main/java/io/lbry/browser/tasks/localdata/SaveViewHistoryTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/localdata/SaveViewHistoryTask.java @@ -7,9 +7,9 @@ import io.lbry.browser.data.DatabaseHelper; import io.lbry.browser.model.ViewHistory; public class SaveViewHistoryTask extends AsyncTask { - private DatabaseHelper dbHelper; - private ViewHistory history; - private SaveViewHistoryHandler handler; + private final DatabaseHelper dbHelper; + private final ViewHistory history; + private final SaveViewHistoryHandler handler; private Exception error; public SaveViewHistoryTask(ViewHistory history, DatabaseHelper dbHelper, SaveViewHistoryHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/verification/CheckUserEmailVerifiedTask.java b/app/src/main/java/io/lbry/browser/tasks/verification/CheckUserEmailVerifiedTask.java index fdf54524..27285ce5 100644 --- a/app/src/main/java/io/lbry/browser/tasks/verification/CheckUserEmailVerifiedTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/verification/CheckUserEmailVerifiedTask.java @@ -8,8 +8,8 @@ import io.lbry.browser.model.lbryinc.User; import io.lbry.browser.utils.Lbryio; public class CheckUserEmailVerifiedTask extends AsyncTask { - private Context context; - private CheckUserEmailVerifiedHandler handler; + private final Context context; + private final CheckUserEmailVerifiedHandler handler; public CheckUserEmailVerifiedTask(Context context, CheckUserEmailVerifiedHandler handler) { this.context = context; diff --git a/app/src/main/java/io/lbry/browser/tasks/verification/EmailNewTask.java b/app/src/main/java/io/lbry/browser/tasks/verification/EmailNewTask.java index f699835e..b1afbd1f 100644 --- a/app/src/main/java/io/lbry/browser/tasks/verification/EmailNewTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/verification/EmailNewTask.java @@ -15,9 +15,9 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbryio; public class EmailNewTask extends AsyncTask { - private String email; - private View progressView; - private EmailNewHandler handler; + private final String email; + private final View progressView; + private final EmailNewHandler handler; private Exception error; public EmailNewTask(String email, View progressView, EmailNewHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/verification/EmailResendTask.java b/app/src/main/java/io/lbry/browser/tasks/verification/EmailResendTask.java index 715acb30..2b92e575 100644 --- a/app/src/main/java/io/lbry/browser/tasks/verification/EmailResendTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/verification/EmailResendTask.java @@ -13,9 +13,9 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbryio; public class EmailResendTask extends AsyncTask { - private String email; - private View progressView; - private GenericTaskHandler handler; + private final String email; + private final View progressView; + private final GenericTaskHandler handler; private Exception error; public EmailResendTask(String email, View progressView, GenericTaskHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/verification/PhoneNewVerifyTask.java b/app/src/main/java/io/lbry/browser/tasks/verification/PhoneNewVerifyTask.java index 15730464..0a9f0295 100644 --- a/app/src/main/java/io/lbry/browser/tasks/verification/PhoneNewVerifyTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/verification/PhoneNewVerifyTask.java @@ -13,11 +13,11 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbryio; public class PhoneNewVerifyTask extends AsyncTask { - private String countryCode; - private String phoneNumber; - private String verificationCode; - private View progressView; - private GenericTaskHandler handler; + private final String countryCode; + private final String phoneNumber; + private final String verificationCode; + private final View progressView; + private final GenericTaskHandler handler; private Exception error; public PhoneNewVerifyTask(String countryCode, String phoneNumber, String verificationCode, View progressView, GenericTaskHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/verification/TwitterAccessTokenTask.java b/app/src/main/java/io/lbry/browser/tasks/verification/TwitterAccessTokenTask.java index c114d8f0..9b558648 100644 --- a/app/src/main/java/io/lbry/browser/tasks/verification/TwitterAccessTokenTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/verification/TwitterAccessTokenTask.java @@ -20,8 +20,8 @@ public class TwitterAccessTokenTask extends AsyncTask { private static final String ENDPOINT = "https://api.twitter.com/oauth/access_token"; private Exception error; - private String oauthParams; - private TwitterOauthHandler handler; + private final String oauthParams; + private final TwitterOauthHandler handler; public TwitterAccessTokenTask(String oauthParams, TwitterOauthHandler handler) { this.oauthParams = oauthParams; diff --git a/app/src/main/java/io/lbry/browser/tasks/verification/TwitterRequestTokenTask.java b/app/src/main/java/io/lbry/browser/tasks/verification/TwitterRequestTokenTask.java index 4082f80b..bd3f8a78 100644 --- a/app/src/main/java/io/lbry/browser/tasks/verification/TwitterRequestTokenTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/verification/TwitterRequestTokenTask.java @@ -22,10 +22,10 @@ import okhttp3.Response; public class TwitterRequestTokenTask extends AsyncTask { private static final String ENDPOINT = "https://api.twitter.com/oauth/request_token"; - private String consumerKey; - private String consumerSecret; + private final String consumerKey; + private final String consumerSecret; private Exception error; - private TwitterOauthHandler handler; + private final TwitterOauthHandler handler; public TwitterRequestTokenTask(String consumerKey, String consumerSecret, TwitterOauthHandler handler) { this.consumerKey = consumerKey; diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/LoadSharedUserStateTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/LoadSharedUserStateTask.java index 323a1949..0570e5a8 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/LoadSharedUserStateTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/LoadSharedUserStateTask.java @@ -36,8 +36,8 @@ import io.lbry.browser.utils.LbryUri; public class LoadSharedUserStateTask extends AsyncTask { private static final String KEY = "shared"; - private Context context; - private LoadSharedUserStateHandler handler; + private final Context context; + private final LoadSharedUserStateHandler handler; private Exception error; private List subscriptions; diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/SaveSharedUserStateTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/SaveSharedUserStateTask.java index 2b962061..07ea8b67 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/SaveSharedUserStateTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/SaveSharedUserStateTask.java @@ -33,7 +33,7 @@ import io.lbry.browser.utils.Lbryio; public class SaveSharedUserStateTask extends AsyncTask { private static final String KEY = "shared"; private static final String VERSION = "0.1"; - private SaveSharedUserStateHandler handler; + private final SaveSharedUserStateHandler handler; private Exception error; public SaveSharedUserStateTask(SaveSharedUserStateHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/SupportCreateTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/SupportCreateTask.java index 5426f0cb..f349da64 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/SupportCreateTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/SupportCreateTask.java @@ -16,12 +16,12 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class SupportCreateTask extends AsyncTask { - private String claimId; - private String channelId; - private BigDecimal amount; - private boolean tip; - private View progressView; - private GenericTaskHandler handler; + private final String claimId; + private final String channelId; + private final BigDecimal amount; + private final boolean tip; + private final View progressView; + private final GenericTaskHandler handler; private Exception error; public SupportCreateTask(String claimId, String channelId, BigDecimal amount, boolean tip, View progressView, GenericTaskHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/SyncApplyTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/SyncApplyTask.java index 51572f49..4e349a37 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/SyncApplyTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/SyncApplyTask.java @@ -17,10 +17,10 @@ public class SyncApplyTask extends AsyncTask { // flag to indicate if this sync_apply is to fetch wallet data or apply data private boolean fetch; private Exception error; - private String password; + private final String password; private String data; private View progressView; - private SyncTaskHandler handler; + private final SyncTaskHandler handler; private String syncHash; private String syncData; diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/SyncGetTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/SyncGetTask.java index 76a02bb3..27b92715 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/SyncGetTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/SyncGetTask.java @@ -19,13 +19,13 @@ import io.lbry.browser.utils.Lbryio; public class SyncGetTask extends AsyncTask { - private boolean applySyncChanges; + private final boolean applySyncChanges; private boolean applySyncSuccessful; private Exception error; private Exception syncApplyError; private String password; - private SyncTaskHandler handler; - private View progressView; + private final SyncTaskHandler handler; + private final View progressView; private String syncHash; private String syncData; diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/SyncSetTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/SyncSetTask.java index 1f5c888f..83398c74 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/SyncSetTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/SyncSetTask.java @@ -14,10 +14,10 @@ import io.lbry.browser.utils.Lbryio; public class SyncSetTask extends AsyncTask { private Exception error; - private String oldHash; - private String newHash; - private String data; - private SyncTaskHandler handler; + private final String oldHash; + private final String newHash; + private final String data; + private final SyncTaskHandler handler; public SyncSetTask(String oldHash, String newHash, String data, SyncTaskHandler handler) { this.oldHash = oldHash; diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/TransactionListTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/TransactionListTask.java index b5e35539..73bf8fbe 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/TransactionListTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/TransactionListTask.java @@ -11,10 +11,10 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class TransactionListTask extends AsyncTask> { - private int page; - private int pageSize; - private View progressView; - private TransactionListHandler handler; + private final int page; + private final int pageSize; + private final View progressView; + private final TransactionListHandler handler; private Exception error; public TransactionListTask(int page, int pageSize, View progressView, TransactionListHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/UnlockTipsTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/UnlockTipsTask.java index c5513a87..c9a17bf8 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/UnlockTipsTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/UnlockTipsTask.java @@ -19,7 +19,7 @@ import io.lbry.browser.utils.Lbry; public class UnlockTipsTask extends AsyncTask { - private GenericTaskHandler handler; + private final GenericTaskHandler handler; private Exception error; public UnlockTipsTask(GenericTaskHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/WalletAddressUnusedTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/WalletAddressUnusedTask.java index 437eb2ef..9bbda172 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/WalletAddressUnusedTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/WalletAddressUnusedTask.java @@ -13,7 +13,7 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class WalletAddressUnusedTask extends AsyncTask { - private WalletAddressUnusedHandler handler; + private final WalletAddressUnusedHandler handler; private Exception error; public WalletAddressUnusedTask(WalletAddressUnusedHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/WalletBalanceTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/WalletBalanceTask.java index cad56be2..90702499 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/WalletBalanceTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/WalletBalanceTask.java @@ -12,7 +12,7 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class WalletBalanceTask extends AsyncTask { - private WalletBalanceHandler handler; + private final WalletBalanceHandler handler; private Exception error; public WalletBalanceTask(WalletBalanceHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/WalletSendTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/WalletSendTask.java index d6183c29..837ab412 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/WalletSendTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/WalletSendTask.java @@ -12,10 +12,10 @@ import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class WalletSendTask extends AsyncTask { - private String recipientAddress; - private String amount; - private View progressView; - private WalletSendHandler handler; + private final String recipientAddress; + private final String amount; + private final View progressView; + private final WalletSendHandler handler; private Exception error; public WalletSendTask(String recipientAddress, String amount, View progressView, WalletSendHandler handler) { diff --git a/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java b/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java index f7bb34e3..bf39f77f 100644 --- a/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java @@ -585,8 +585,8 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen } private static class ChannelPagerAdapter extends FragmentStateAdapter { - private Claim channelClaim; - private String commentHash; + private final Claim channelClaim; + private final String commentHash; public ChannelPagerAdapter(Claim channelClaim, String commentHash, FragmentActivity activity) { super(activity); this.channelClaim = channelClaim; diff --git a/app/src/main/java/io/lbry/browser/ui/channel/ChannelManagerFragment.java b/app/src/main/java/io/lbry/browser/ui/channel/ChannelManagerFragment.java index 44276694..c6e3fd75 100644 --- a/app/src/main/java/io/lbry/browser/ui/channel/ChannelManagerFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/channel/ChannelManagerFragment.java @@ -77,7 +77,7 @@ public class ChannelManagerFragment extends BaseFragment implements ActionMode.C return root; } - private View.OnClickListener newChannelClickListener = new View.OnClickListener() { + private final View.OnClickListener newChannelClickListener = new View.OnClickListener() { @Override public void onClick(View view) { Context context = getContext(); diff --git a/app/src/main/java/io/lbry/browser/ui/controls/OutlineIconView.java b/app/src/main/java/io/lbry/browser/ui/controls/OutlineIconView.java index 46c3c2b2..06fb8e25 100644 --- a/app/src/main/java/io/lbry/browser/ui/controls/OutlineIconView.java +++ b/app/src/main/java/io/lbry/browser/ui/controls/OutlineIconView.java @@ -8,7 +8,7 @@ import android.view.Gravity; import androidx.appcompat.widget.AppCompatTextView; public class OutlineIconView extends AppCompatTextView { - private Context context; + private final Context context; public OutlineIconView(Context context) { super(context); diff --git a/app/src/main/java/io/lbry/browser/ui/controls/SolidIconView.java b/app/src/main/java/io/lbry/browser/ui/controls/SolidIconView.java index e9de291b..1f2caa19 100644 --- a/app/src/main/java/io/lbry/browser/ui/controls/SolidIconView.java +++ b/app/src/main/java/io/lbry/browser/ui/controls/SolidIconView.java @@ -8,7 +8,7 @@ import android.view.Gravity; import androidx.appcompat.widget.AppCompatTextView; public class SolidIconView extends AppCompatTextView { - private Context context; + private final Context context; public SolidIconView(Context context) { super(context); diff --git a/app/src/main/java/io/lbry/browser/ui/findcontent/AllContentFragment.java b/app/src/main/java/io/lbry/browser/ui/findcontent/AllContentFragment.java index 6a4e09c9..8be3b89f 100644 --- a/app/src/main/java/io/lbry/browser/ui/findcontent/AllContentFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/findcontent/AllContentFragment.java @@ -289,7 +289,7 @@ public class AllContentFragment extends BaseFragment implements DownloadActionLi } } - private FollowUnfollowTagTask.FollowUnfollowTagHandler followUnfollowHandler = new FollowUnfollowTagTask.FollowUnfollowTagHandler() { + private final FollowUnfollowTagTask.FollowUnfollowTagHandler followUnfollowHandler = new FollowUnfollowTagTask.FollowUnfollowTagHandler() { @Override public void onSuccess(Tag tag, boolean unfollowing) { if (tags != null) { 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 76b75038..f4ef8c42 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 @@ -788,7 +788,7 @@ public class FileViewFragment extends BaseFragment implements } } - private View.OnClickListener bellIconListener = new View.OnClickListener() { + private final View.OnClickListener bellIconListener = new View.OnClickListener() { @Override public void onClick(View view) { if (claim != null && claim.getSigningChannel() != null) { @@ -824,7 +824,7 @@ public class FileViewFragment extends BaseFragment implements } }; - private View.OnClickListener followUnfollowListener = new View.OnClickListener() { + private final View.OnClickListener followUnfollowListener = new View.OnClickListener() { @Override public void onClick(final View view) { if (claim != null && claim.getSigningChannel() != null) { @@ -2635,7 +2635,7 @@ public class FileViewFragment extends BaseFragment implements dailyViewTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } - private ClaimRewardTask.ClaimRewardHandler eligibleRewardHandler = new ClaimRewardTask.ClaimRewardHandler() { + private final ClaimRewardTask.ClaimRewardHandler eligibleRewardHandler = new ClaimRewardTask.ClaimRewardHandler() { @Override public void onSuccess(double amountClaimed, String message) { if (Helper.isNullOrEmpty(message)) { @@ -2817,7 +2817,7 @@ public class FileViewFragment extends BaseFragment implements } private static class LbryWebViewClient extends WebViewClient { - private Context context; + private final Context context; public LbryWebViewClient(Context context) { this.context = context; } diff --git a/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java b/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java index f94044b6..66a8560f 100644 --- a/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java @@ -640,7 +640,7 @@ public class ShuffleFragment extends BaseFragment { dailyViewTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } - private ClaimRewardTask.ClaimRewardHandler eligibleRewardHandler = new ClaimRewardTask.ClaimRewardHandler() { + private final ClaimRewardTask.ClaimRewardHandler eligibleRewardHandler = new ClaimRewardTask.ClaimRewardHandler() { @Override public void onSuccess(double amountClaimed, String message) { if (Helper.isNullOrEmpty(message)) { diff --git a/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java b/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java index 5e6b0dcc..1fb2e846 100644 --- a/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java @@ -1351,8 +1351,8 @@ public class PublishFormFragment extends BaseFragment implements } private static class VideoProbeTask extends AsyncTask { - private String filePath; - private VideoProbeHandler handler; + private final String filePath; + private final VideoProbeHandler handler; public VideoProbeTask(String filePath, VideoProbeHandler handler) { this.filePath = filePath; this.handler = handler; @@ -1390,11 +1390,11 @@ public class PublishFormFragment extends BaseFragment implements private static class VideoTranscodeTask extends AsyncTask { - private String filePath; - private String scaleFlag; - private String outputFilePath; - private boolean transcodeRequired; - private VideoTranscodeHandler handler; + private final String filePath; + private final String scaleFlag; + private final String outputFilePath; + private final boolean transcodeRequired; + private final VideoTranscodeHandler handler; public VideoTranscodeTask(String filePath, String outputFilePath, String scaleFlag, boolean transcodeRequired, VideoTranscodeHandler handler) { this.handler = handler; @@ -1504,10 +1504,10 @@ public class PublishFormFragment extends BaseFragment implements } private static class CreateThumbnailTask extends AsyncTask { - private Context context; - private String filePath; - private String type; - private CreateThumbnailHandler handler; + private final Context context; + private final String filePath; + private final String type; + private final CreateThumbnailHandler handler; private Exception error; public CreateThumbnailTask(String filePath, String type, Context context, CreateThumbnailHandler handler) { this.context = context; diff --git a/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java b/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java index 79bf9d84..09ef335b 100644 --- a/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java @@ -79,7 +79,7 @@ public class PublishesFragment extends BaseFragment implements ActionMode.Callba return root; } - private View.OnClickListener newPublishClickListener = new View.OnClickListener() { + private final View.OnClickListener newPublishClickListener = new View.OnClickListener() { @Override public void onClick(View view) { Context context = getContext(); diff --git a/app/src/main/java/io/lbry/browser/ui/verification/WalletVerificationFragment.java b/app/src/main/java/io/lbry/browser/ui/verification/WalletVerificationFragment.java index db90c8b3..3a16ee3e 100644 --- a/app/src/main/java/io/lbry/browser/ui/verification/WalletVerificationFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/verification/WalletVerificationFragment.java @@ -23,6 +23,7 @@ import io.lbry.browser.MainActivity; import io.lbry.browser.R; import io.lbry.browser.VerificationActivity; import io.lbry.browser.listener.SdkStatusListener; +import io.lbry.browser.listener.SignInListener; import io.lbry.browser.listener.WalletSyncListener; import io.lbry.browser.model.WalletSync; import io.lbry.browser.tasks.wallet.DefaultSyncTaskHandler; diff --git a/app/src/main/java/io/lbry/browser/utils/ExoplayerAudioRenderer.java b/app/src/main/java/io/lbry/browser/utils/ExoplayerAudioRenderer.java index 80cb4488..00bb1021 100644 --- a/app/src/main/java/io/lbry/browser/utils/ExoplayerAudioRenderer.java +++ b/app/src/main/java/io/lbry/browser/utils/ExoplayerAudioRenderer.java @@ -22,7 +22,7 @@ import java.util.ArrayList; public class ExoplayerAudioRenderer extends DefaultRenderersFactory { - private TeeAudioProcessor.AudioBufferSink audioBufferSink; + private final TeeAudioProcessor.AudioBufferSink audioBufferSink; public ExoplayerAudioRenderer(Context context, TeeAudioProcessor.AudioBufferSink audioBufferSink) { super(context); diff --git a/app/src/main/java/io/lbry/browser/utils/Lbry.java b/app/src/main/java/io/lbry/browser/utils/Lbry.java index d900567a..940bb032 100644 --- a/app/src/main/java/io/lbry/browser/utils/Lbry.java +++ b/app/src/main/java/io/lbry/browser/utils/Lbry.java @@ -44,8 +44,8 @@ import okhttp3.Response; public final class Lbry { private static final Object lock = new Object(); - public static LinkedHashMap claimCache = new LinkedHashMap<>(); - public static LinkedHashMap, ClaimSearchCacheValue> claimSearchCache = new LinkedHashMap<>(); + public static final LinkedHashMap claimCache = new LinkedHashMap<>(); + public static final LinkedHashMap, ClaimSearchCacheValue> claimSearchCache = new LinkedHashMap<>(); public static WalletBalance walletBalance = new WalletBalance(); public static List knownTags = new ArrayList<>(); public static List followedTags = new ArrayList<>(); diff --git a/app/src/main/java/io/lbry/browser/utils/LbryUri.java b/app/src/main/java/io/lbry/browser/utils/LbryUri.java index 6eb27eef..60a12499 100644 --- a/app/src/main/java/io/lbry/browser/utils/LbryUri.java +++ b/app/src/main/java/io/lbry/browser/utils/LbryUri.java @@ -270,9 +270,9 @@ public class LbryUri { @Data public static class UriModifier { - private String claimId; - private int claimSequence; - private int bidPosition; + private final String claimId; + private final int claimSequence; + private final int bidPosition; public UriModifier(String claimId, int claimSequence, int bidPosition) { this.claimId = claimId; diff --git a/app/src/main/java/io/lbry/browser/utils/Lbryio.java b/app/src/main/java/io/lbry/browser/utils/Lbryio.java index 51f99eb4..68986978 100644 --- a/app/src/main/java/io/lbry/browser/utils/Lbryio.java +++ b/app/src/main/java/io/lbry/browser/utils/Lbryio.java @@ -65,8 +65,8 @@ public final class Lbryio { public static String AUTH_TOKEN; private static boolean generatingAuthToken = false; - public static List allRewards = new ArrayList<>(); - public static List unclaimedRewards = new ArrayList<>(); + public static final List allRewards = new ArrayList<>(); + public static final List unclaimedRewards = new ArrayList<>(); public static double totalUnclaimedRewardAmount = 0; public static Response call(String resource, String action, Context context) throws LbryioRequestException, LbryioResponseException { diff --git a/app/src/main/java/io/lbry/browser/utils/Lighthouse.java b/app/src/main/java/io/lbry/browser/utils/Lighthouse.java index 2d5cfbca..7a09976e 100644 --- a/app/src/main/java/io/lbry/browser/utils/Lighthouse.java +++ b/app/src/main/java/io/lbry/browser/utils/Lighthouse.java @@ -21,8 +21,8 @@ import okhttp3.Response; public class Lighthouse { public static final String CONNECTION_STRING = "https://lighthouse.lbry.com"; - public static Map> autocompleteCache = new HashMap<>(); - public static Map, List> searchCache = new HashMap<>(); + public static final Map> autocompleteCache = new HashMap<>(); + public static final Map, List> searchCache = new HashMap<>(); private static Map buildSearchOptionsKey(String rawQuery, int size, int from, boolean nsfw, String relatedTo) { Map options = new HashMap<>(); -- 2.43.4 From dc6b21883427dd2f86cc987a4557b1c7f2a835e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Tue, 12 Jan 2021 16:21:27 +0100 Subject: [PATCH 09/31] Upgrade gradle 5.6.4 -> 6.5 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index e14841db..156feb92 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.1.1' classpath 'com.google.gms:google-services:4.2.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d3bb33d6..ec13cf9b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 03 15:21:09 WAT 2020 +#Sun Jan 10 23:10:24 CET 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip -- 2.43.4 From ac098c4062eb1fe0645cdc2dc34fee05ad0ddb86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Tue, 12 Jan 2021 16:23:07 +0100 Subject: [PATCH 10/31] Upgrade sdkVersion from 29 -> 30 --- app/build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 97e6b6df..d40822f3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ import com.google.gms.googleservices.GoogleServicesPlugin apply plugin: 'com.android.application' android { - compileSdkVersion 29 + compileSdkVersion 30 buildToolsVersion "29.0.1" flavorDimensions "default" @@ -15,10 +15,9 @@ android { defaultConfig { applicationId "io.lbry.browser" minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1613 versionName "0.16.13" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } -- 2.43.4 From c95f25b584ab83cdba8c030c6e0f390201fbdc53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Tue, 12 Jan 2021 16:51:33 +0100 Subject: [PATCH 11/31] Change minSdkVersion from 21 to 24 since isInPictureInPictureMode requires 24 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index d40822f3..30ac046d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,7 @@ android { defaultConfig { applicationId "io.lbry.browser" - minSdkVersion 21 + minSdkVersion 24 targetSdkVersion 30 versionCode 1613 versionName "0.16.13" -- 2.43.4 From b9251c2036bc2ec328731ea61364f74d6e1667d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Tue, 12 Jan 2021 17:26:04 +0100 Subject: [PATCH 12/31] code cleanup, make newInstance use final variables for listener and claim --- .../dialog/CreateSupportDialogFragment.java | 16 ++++++---- .../dialog/RepostClaimDialogFragment.java | 16 ++++++---- .../browser/ui/channel/ChannelFragment.java | 21 +++++-------- .../ui/findcontent/FileViewFragment.java | 30 +++++++------------ 4 files changed, 38 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java b/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java index ac8b1181..5539dcb6 100644 --- a/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java +++ b/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java @@ -61,13 +61,17 @@ public class CreateSupportDialogFragment extends BottomSheetDialogFragment imple private ProgressBar progressLoadingChannels; - @Setter - private CreateSupportListener listener; - @Setter - private Claim claim; + private final CreateSupportListener listener; + private final Claim claim; - public static CreateSupportDialogFragment newInstance() { - return new CreateSupportDialogFragment(); + private CreateSupportDialogFragment(Claim claim, CreateSupportListener listener) { + super(); + this.claim = claim; + this.listener = listener; + } + + public static CreateSupportDialogFragment newInstance(Claim claim, CreateSupportListener listener) { + return new CreateSupportDialogFragment(claim, listener); } private void disableControls() { diff --git a/app/src/main/java/io/lbry/browser/dialog/RepostClaimDialogFragment.java b/app/src/main/java/io/lbry/browser/dialog/RepostClaimDialogFragment.java index 26883447..231060b5 100644 --- a/app/src/main/java/io/lbry/browser/dialog/RepostClaimDialogFragment.java +++ b/app/src/main/java/io/lbry/browser/dialog/RepostClaimDialogFragment.java @@ -57,13 +57,17 @@ public class RepostClaimDialogFragment extends BottomSheetDialogFragment impleme private TextView linkToggleAdvanced; private View advancedContainer; - @Setter - private RepostClaimListener listener; - @Setter - private Claim claim; + private final RepostClaimListener listener; + private final Claim claim; - public static RepostClaimDialogFragment newInstance() { - return new RepostClaimDialogFragment(); + private RepostClaimDialogFragment(Claim claim, RepostClaimListener listener) { + super(); + this.listener = listener; + this.claim = claim; + } + + public static RepostClaimDialogFragment newInstance(Claim claim, RepostClaimListener listener) { + return new RepostClaimDialogFragment(claim, listener); } @Override diff --git a/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java b/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java index bf39f77f..c6035c3b 100644 --- a/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java @@ -185,19 +185,14 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen } if (claim != null) { - CreateSupportDialogFragment dialog = CreateSupportDialogFragment.newInstance(); - dialog.setClaim(claim); - dialog.setListener(new CreateSupportDialogFragment.CreateSupportListener() { - @Override - public void onSupportCreated(BigDecimal amount, boolean isTip) { - double sentAmount = amount.doubleValue(); - View view = getView(); - if (view != null) { - String message = getResources().getQuantityString( - isTip ? R.plurals.you_sent_a_tip : R.plurals.you_sent_a_support, sentAmount == 1.0 ? 1 : 2, - new DecimalFormat("#,###.##").format(sentAmount)); - Snackbar.make(view, message, Snackbar.LENGTH_LONG).show(); - } + CreateSupportDialogFragment dialog = CreateSupportDialogFragment.newInstance(claim, (amount, isTip) -> { + double sentAmount = amount.doubleValue(); + View view1 = getView(); + if (view1 != null) { + String message = getResources().getQuantityString( + isTip ? R.plurals.you_sent_a_tip : R.plurals.you_sent_a_support, sentAmount == 1.0 ? 1 : 2, + new DecimalFormat("#,###.##").format(sentAmount)); + Snackbar.make(view1, message, Snackbar.LENGTH_LONG).show(); } }); Context context = getContext(); 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 f4ef8c42..a02caa3b 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 @@ -1007,17 +1007,12 @@ public class FileViewFragment extends BaseFragment implements } if (claim != null) { - CreateSupportDialogFragment dialog = CreateSupportDialogFragment.newInstance(); - dialog.setClaim(claim); - dialog.setListener(new CreateSupportDialogFragment.CreateSupportListener() { - @Override - public void onSupportCreated(BigDecimal amount, boolean isTip) { - double sentAmount = amount.doubleValue(); - String message = getResources().getQuantityString( - isTip ? R.plurals.you_sent_a_tip : R.plurals.you_sent_a_support, sentAmount == 1.0 ? 1 : 2, - new DecimalFormat("#,###.##").format(sentAmount)); - Snackbar.make(root.findViewById(R.id.file_view_claim_display_area), message, Snackbar.LENGTH_LONG).show(); - } + CreateSupportDialogFragment dialog = CreateSupportDialogFragment.newInstance(claim, (amount, isTip) -> { + double sentAmount = amount.doubleValue(); + String message = getResources().getQuantityString( + isTip ? R.plurals.you_sent_a_tip : R.plurals.you_sent_a_support, sentAmount == 1.0 ? 1 : 2, + new DecimalFormat("#,###.##").format(sentAmount)); + Snackbar.make(root.findViewById(R.id.file_view_claim_display_area), message, Snackbar.LENGTH_LONG).show(); }); Context context = getContext(); if (context instanceof MainActivity) { @@ -1036,15 +1031,10 @@ public class FileViewFragment extends BaseFragment implements } if (claim != null) { - RepostClaimDialogFragment dialog = RepostClaimDialogFragment.newInstance(); - dialog.setClaim(claim); - dialog.setListener(new RepostClaimDialogFragment.RepostClaimListener() { - @Override - public void onClaimReposted(Claim claim) { - Context context = getContext(); - if (context instanceof MainActivity) { - ((MainActivity) context).showMessage(R.string.content_successfully_reposted); - } + RepostClaimDialogFragment dialog = RepostClaimDialogFragment.newInstance(claim, claim -> { + Context context = getContext(); + if (context instanceof MainActivity) { + ((MainActivity) context).showMessage(R.string.content_successfully_reposted); } }); Context context = getContext(); -- 2.43.4 From 962cfda2063271cb4ca11f3e2134eaf8e7973a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Tue, 12 Jan 2021 20:06:02 +0100 Subject: [PATCH 13/31] Downgrade from gradle-6.5 to 6.1.1 due to FDroid not compatible with 6.5 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 156feb92..031cc804 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:3.+' classpath 'com.google.gms:google-services:4.2.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ec13cf9b..b7464ab0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Jan 10 23:10:24 CET 2021 +#Tue Jan 12 20:03:24 CET 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip -- 2.43.4 From 1eed13e8895ae84e710043583fd040ab0d87048e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 15:00:11 +0100 Subject: [PATCH 14/31] Bump buildToolsVersion 29.0.1 -> 29.0.2 for FDroid build compability --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 30ac046d..25b49c5f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 30 - buildToolsVersion "29.0.1" + buildToolsVersion "29.0.2" flavorDimensions "default" compileOptions { -- 2.43.4 From fd5ffb1e5041c378010d4cc869c2e659f970e77b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 15:07:18 +0100 Subject: [PATCH 15/31] Set gradle version to static 3.6.4 instead of dynamic 3.+ --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 031cc804..b7173582 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.+' + classpath 'com.android.tools.build:gradle:3.6.4' classpath 'com.google.gms:google-services:4.2.0' // NOTE: Do not place your application dependencies here; they belong -- 2.43.4 From 62dbfed1a3d63eb5886b430e1731f720b3a2ad8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 15:19:18 +0100 Subject: [PATCH 16/31] A couple more fields that can be final --- .../io/lbry/browser/ui/findcontent/FollowingFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/lbry/browser/ui/findcontent/FollowingFragment.java b/app/src/main/java/io/lbry/browser/ui/findcontent/FollowingFragment.java index 37ac13fd..983d8bd5 100644 --- a/app/src/main/java/io/lbry/browser/ui/findcontent/FollowingFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/findcontent/FollowingFragment.java @@ -91,8 +91,8 @@ public class FollowingFragment extends BaseFragment implements private View noContentView; private boolean subscriptionsShown; - private List queuedContentPages = new ArrayList<>(); - private List queuedSuggestedPages = new ArrayList<>(); + private final List queuedContentPages = new ArrayList<>(); + private final List queuedSuggestedPages = new ArrayList<>(); private int currentSuggestedPage = 0; private int currentClaimSearchPage; -- 2.43.4 From 1ca2b9285589b0d16bf7034f95069fc8b307e4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 15:19:56 +0100 Subject: [PATCH 17/31] Add todo for MediaStore.Video.Media.DURATION that requires API level 29 --- .../io/lbry/browser/tasks/localdata/LoadGalleryItemsTask.java | 2 ++ 1 file changed, 2 insertions(+) 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 679d57ab..87e4e067 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 @@ -44,6 +44,7 @@ public class LoadGalleryItemsTask extends AsyncTask Date: Wed, 13 Jan 2021 15:32:39 +0100 Subject: [PATCH 18/31] use contains instead of indexOf --- app/src/main/java/io/lbry/browser/LbrynetMessagingService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/io/lbry/browser/LbrynetMessagingService.java b/app/src/main/java/io/lbry/browser/LbrynetMessagingService.java index c4f46712..327cb45b 100644 --- a/app/src/main/java/io/lbry/browser/LbrynetMessagingService.java +++ b/app/src/main/java/io/lbry/browser/LbrynetMessagingService.java @@ -58,7 +58,7 @@ public class LbrynetMessagingService extends FirebaseMessagingService { String name = payload.get("name"); // notification name String hash = payload.get("hash"); // comment hash - if (type != null && getEnabledTypes().indexOf(type) > -1 && body != null && body.trim().length() > 0) { + if (type != null && getEnabledTypes().contains(type) && body != null && body.trim().length() > 0) { // only log the receive event for valid notifications received if (firebaseAnalytics != null) { Bundle bundle = new Bundle(); -- 2.43.4 From 3ca7d9b369fd0419318a0ee412ed16087ed02473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 15:33:31 +0100 Subject: [PATCH 19/31] Use StandardCharsets.UTF_8 instead of string UTF8 --- app/src/main/java/io/lbry/browser/MainActivity.java | 3 ++- app/src/main/java/io/lbry/browser/utils/Lbryio.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/lbry/browser/MainActivity.java b/app/src/main/java/io/lbry/browser/MainActivity.java index c113c707..4947efc5 100644 --- a/app/src/main/java/io/lbry/browser/MainActivity.java +++ b/app/src/main/java/io/lbry/browser/MainActivity.java @@ -121,6 +121,7 @@ import java.io.InputStreamReader; import java.io.PrintStream; import java.net.ConnectException; import java.net.URI; +import java.nio.charset.StandardCharsets; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; @@ -1799,7 +1800,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener if (!Helper.isNullOrEmpty(encryptedAuthToken)) { try { Lbryio.AUTH_TOKEN = new String(Utils.decrypt( - Base64.decode(encryptedAuthToken, Base64.NO_WRAP), this, Lbry.KEYSTORE), "UTF8"); + Base64.decode(encryptedAuthToken, Base64.NO_WRAP), this, Lbry.KEYSTORE), StandardCharsets.UTF_8); } catch (Exception ex) { // pass. A new auth token would have to be generated if the old one cannot be decrypted Log.e(TAG, "Could not decrypt existing auth token.", ex); diff --git a/app/src/main/java/io/lbry/browser/utils/Lbryio.java b/app/src/main/java/io/lbry/browser/utils/Lbryio.java index 68986978..036eb3f4 100644 --- a/app/src/main/java/io/lbry/browser/utils/Lbryio.java +++ b/app/src/main/java/io/lbry/browser/utils/Lbryio.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.lang.reflect.Type; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -304,7 +305,7 @@ public final class Lbryio { private static void broadcastAuthTokenGenerated(Context context) { try { if (context != null) { - String encryptedAuthToken = Utils.encrypt(AUTH_TOKEN.getBytes("UTF8"), context, Lbry.KEYSTORE); + String encryptedAuthToken = Utils.encrypt(AUTH_TOKEN.getBytes(StandardCharsets.UTF_8), context, Lbry.KEYSTORE); Intent intent = new Intent(MainActivity.ACTION_AUTH_TOKEN_GENERATED); intent.putExtra("authToken", encryptedAuthToken); context.sendBroadcast(intent); -- 2.43.4 From 49a3d157ee2f70aeae040fd3243448eb795a99b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 15:34:31 +0100 Subject: [PATCH 20/31] Simplify code for return value --- .../java/io/lbry/browser/ui/findcontent/ShuffleFragment.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java b/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java index 66a8560f..49686b7c 100644 --- a/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java @@ -684,10 +684,7 @@ public class ShuffleFragment extends BaseFragment { @Override public boolean onDown(MotionEvent e) { - if (control instanceof PlayerView) { - return false; - } - return true; + return control instanceof PlayerView; } @Override -- 2.43.4 From 40b6591bb02655da284f7bb1fe39fe3db6b0cb5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 15:34:58 +0100 Subject: [PATCH 21/31] Simplify code for readability --- .../java/io/lbry/browser/ui/publish/PublishFormFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java b/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java index 1fb2e846..0f08a1f7 100644 --- a/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java @@ -1171,7 +1171,7 @@ public class PublishFormFragment extends BaseFragment implements Helper.setViewEnabled(inputTitle, true); Helper.setViewEnabled(inputDescription, true); Helper.setViewEnabled(inputTagFilter, false); - Helper.setViewEnabled(inputAddress, editMode ? false : true); + Helper.setViewEnabled(inputAddress, !editMode); Helper.setViewEnabled(inputDeposit, true); Helper.setViewEnabled(inputPrice, true); Helper.setViewEnabled(inputOtherLicenseDescription, true); -- 2.43.4 From 5879cbd3dbaa102093eed18a3034fb1b6a8a7142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 15:36:17 +0100 Subject: [PATCH 22/31] context does not need null check --- .../main/java/io/lbry/browser/ui/publish/PublishFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/io/lbry/browser/ui/publish/PublishFragment.java b/app/src/main/java/io/lbry/browser/ui/publish/PublishFragment.java index 9dc62832..cd9f57ad 100644 --- a/app/src/main/java/io/lbry/browser/ui/publish/PublishFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/publish/PublishFragment.java @@ -123,7 +123,7 @@ public class PublishFragment extends BaseFragment implements private void displayPreviewWithCameraX() { Context context = getContext(); - if (context != null && MainActivity.hasPermission(Manifest.permission.CAMERA, context)) { + if (MainActivity.hasPermission(Manifest.permission.CAMERA, context)) { cameraProviderFuture = ProcessCameraProvider.getInstance(context); cameraProviderFuture.addListener(new Runnable() { @Override -- 2.43.4 From 2e026a69208f13cc16163df7103f1971a4f28460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 15:37:08 +0100 Subject: [PATCH 23/31] Unnecessecary semicolons --- .../browser/tasks/verification/TwitterRequestTokenTask.java | 2 +- .../java/io/lbry/browser/ui/findcontent/FileViewFragment.java | 2 +- .../lbry/browser/ui/verification/EmailVerificationFragment.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/lbry/browser/tasks/verification/TwitterRequestTokenTask.java b/app/src/main/java/io/lbry/browser/tasks/verification/TwitterRequestTokenTask.java index bd3f8a78..d5418f38 100644 --- a/app/src/main/java/io/lbry/browser/tasks/verification/TwitterRequestTokenTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/verification/TwitterRequestTokenTask.java @@ -43,7 +43,7 @@ public class TwitterRequestTokenTask extends AsyncTask { OAuthParameters oauthParams = new OAuthParameters(); oauthParams.callback = "https://lbry.tv"; oauthParams.consumerKey = new String( - Base64.decode(consumerKey, Base64.NO_WRAP), StandardCharsets.UTF_8.name());; + Base64.decode(consumerKey, Base64.NO_WRAP), StandardCharsets.UTF_8.name()); oauthParams.signatureMethod = "HMAC-SHA-1"; oauthParams.signer = signer; oauthParams.computeNonce(); 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 a02caa3b..eb771923 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 @@ -2347,7 +2347,7 @@ public class FileViewFragment extends BaseFragment implements private void resolveCommentPosters() { if (commentListAdapter != null) { - long st = System.currentTimeMillis();; + long st = System.currentTimeMillis(); List urlsToResolve = new ArrayList<>(commentListAdapter.getClaimUrlsToResolve()); if (urlsToResolve.size() > 0) { ResolveTask task = new ResolveTask(urlsToResolve, Lbry.LBRY_TV_CONNECTION_STRING, null, new ClaimListResultHandler() { diff --git a/app/src/main/java/io/lbry/browser/ui/verification/EmailVerificationFragment.java b/app/src/main/java/io/lbry/browser/ui/verification/EmailVerificationFragment.java index 277aba59..afc4c817 100644 --- a/app/src/main/java/io/lbry/browser/ui/verification/EmailVerificationFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/verification/EmailVerificationFragment.java @@ -147,7 +147,7 @@ public class EmailVerificationFragment extends Fragment { if (view != null && error != null) { Snackbar.make(getView(), error.getMessage(), Snackbar.LENGTH_LONG). setBackgroundTint(Color.RED).setTextColor(Color.WHITE).show(); - }; + } Helper.setViewVisibility(buttonContinue, View.VISIBLE); } }); -- 2.43.4 From da8ca05a38956d6626da741a451c93d69e08c42c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 16:05:21 +0100 Subject: [PATCH 24/31] Remove unused imports --- .../java/io/lbry/browser/adapter/ClaimListAdapter.java | 1 - .../lbry/browser/adapter/InlineChannelSpinnerAdapter.java | 2 -- .../java/io/lbry/browser/adapter/InviteeListAdapter.java | 7 ------- .../io/lbry/browser/adapter/LanguageSpinnerAdapter.java | 1 - .../io/lbry/browser/adapter/LicenseSpinnerAdapter.java | 1 - .../io/lbry/browser/adapter/NavigationMenuAdapter.java | 3 --- .../io/lbry/browser/adapter/NotificationListAdapter.java | 3 --- .../main/java/io/lbry/browser/data/DatabaseHelper.java | 1 - .../lbry/browser/dialog/CreateSupportDialogFragment.java | 2 -- .../io/lbry/browser/dialog/DiscoverDialogFragment.java | 1 - .../io/lbry/browser/dialog/RepostClaimDialogFragment.java | 1 - app/src/main/java/io/lbry/browser/model/Claim.java | 1 - .../java/io/lbry/browser/model/ClaimSearchCacheValue.java | 2 -- app/src/main/java/io/lbry/browser/model/Comment.java | 1 - app/src/main/java/io/lbry/browser/model/NavMenuItem.java | 2 -- app/src/main/java/io/lbry/browser/model/ViewHistory.java | 2 -- .../main/java/io/lbry/browser/model/lbryinc/Reward.java | 1 - .../java/io/lbry/browser/tasks/CommentCreateTask.java | 5 ----- app/src/main/java/io/lbry/browser/tasks/LoadTagsTask.java | 6 ------ .../io/lbry/browser/tasks/MergeSubscriptionsTask.java | 4 ---- .../main/java/io/lbry/browser/tasks/ReadTextFileTask.java | 3 --- .../io/lbry/browser/tasks/claim/AbandonChannelTask.java | 1 - .../io/lbry/browser/tasks/claim/AbandonStreamTask.java | 1 - .../io/lbry/browser/tasks/file/BulkDeleteFilesTask.java | 1 - .../lbry/browser/tasks/lbryinc/AndroidPurchaseTask.java | 2 -- .../lbry/browser/tasks/lbryinc/ChannelSubscribeTask.java | 1 - .../io/lbry/browser/tasks/lbryinc/ClaimRewardTask.java | 1 - .../io/lbry/browser/tasks/lbryinc/LogFileViewTask.java | 3 --- .../io/lbry/browser/tasks/lbryinc/LogPublishTask.java | 2 -- .../browser/tasks/localdata/FetchViewHistoryTask.java | 1 - .../browser/tasks/localdata/LoadGalleryItemsTask.java | 1 - .../lbry/browser/tasks/localdata/SaveUrlHistoryTask.java | 3 --- .../io/lbry/browser/tasks/verification/EmailNewTask.java | 2 -- .../tasks/verification/TwitterAccessTokenTask.java | 6 ------ .../tasks/verification/TwitterRequestTokenTask.java | 2 -- .../java/io/lbry/browser/tasks/wallet/SyncApplyTask.java | 1 - .../java/io/lbry/browser/tasks/wallet/UnlockTipsTask.java | 1 - .../browser/tasks/wallet/WalletAddressUnusedTask.java | 6 ------ .../io/lbry/browser/tasks/wallet/WalletBalanceTask.java | 3 --- app/src/main/java/io/lbry/browser/ui/BaseFragment.java | 2 -- .../lbry/browser/ui/channel/ChannelCommentsFragment.java | 2 -- .../io/lbry/browser/ui/channel/ChannelFormFragment.java | 2 -- .../java/io/lbry/browser/ui/channel/ChannelFragment.java | 1 - .../io/lbry/browser/ui/findcontent/FileViewFragment.java | 2 -- .../io/lbry/browser/ui/findcontent/ShuffleFragment.java | 1 - .../main/java/io/lbry/browser/ui/other/AboutFragment.java | 2 -- .../java/io/lbry/browser/ui/other/SettingsFragment.java | 1 - .../io/lbry/browser/ui/publish/PublishFormFragment.java | 4 ---- .../io/lbry/browser/ui/publish/PublishesFragment.java | 3 --- .../ui/verification/WalletVerificationFragment.java | 1 - .../java/io/lbry/browser/ui/wallet/InvitesFragment.java | 6 ------ .../browser/ui/wallet/TransactionHistoryFragment.java | 1 - .../io/lbry/browser/utils/ExoplayerAudioRenderer.java | 8 -------- app/src/main/java/io/lbry/browser/utils/Lbry.java | 4 ---- app/src/main/java/io/lbry/browser/utils/Lbryio.java | 1 - app/src/main/java/io/lbry/browser/utils/Predefined.java | 1 - 56 files changed, 130 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 963f5924..a9ec9705 100644 --- a/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java +++ b/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import io.lbry.browser.MainActivity; import io.lbry.browser.R; import io.lbry.browser.listener.SelectionModeListener; import io.lbry.browser.model.Claim; diff --git a/app/src/main/java/io/lbry/browser/adapter/InlineChannelSpinnerAdapter.java b/app/src/main/java/io/lbry/browser/adapter/InlineChannelSpinnerAdapter.java index 41932afd..95a8ddda 100644 --- a/app/src/main/java/io/lbry/browser/adapter/InlineChannelSpinnerAdapter.java +++ b/app/src/main/java/io/lbry/browser/adapter/InlineChannelSpinnerAdapter.java @@ -1,12 +1,10 @@ package io.lbry.browser.adapter; import android.content.Context; -import android.database.DataSetObserver; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import android.widget.SpinnerAdapter; import android.widget.TextView; import java.util.ArrayList; diff --git a/app/src/main/java/io/lbry/browser/adapter/InviteeListAdapter.java b/app/src/main/java/io/lbry/browser/adapter/InviteeListAdapter.java index af1e59fd..b23604de 100644 --- a/app/src/main/java/io/lbry/browser/adapter/InviteeListAdapter.java +++ b/app/src/main/java/io/lbry/browser/adapter/InviteeListAdapter.java @@ -1,9 +1,7 @@ package io.lbry.browser.adapter; import android.content.Context; -import android.content.Intent; import android.graphics.Typeface; -import android.net.Uri; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -11,16 +9,11 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import java.text.DecimalFormat; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; import io.lbry.browser.R; import io.lbry.browser.model.lbryinc.Invitee; -import io.lbry.browser.utils.Helper; -import io.lbry.browser.utils.LbryUri; -import lombok.Setter; public class InviteeListAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/io/lbry/browser/adapter/LanguageSpinnerAdapter.java b/app/src/main/java/io/lbry/browser/adapter/LanguageSpinnerAdapter.java index 434f4e51..fa23e955 100644 --- a/app/src/main/java/io/lbry/browser/adapter/LanguageSpinnerAdapter.java +++ b/app/src/main/java/io/lbry/browser/adapter/LanguageSpinnerAdapter.java @@ -10,7 +10,6 @@ import android.widget.TextView; import androidx.annotation.NonNull; import io.lbry.browser.R; -import io.lbry.browser.model.Claim; import io.lbry.browser.model.Language; import io.lbry.browser.utils.Predefined; diff --git a/app/src/main/java/io/lbry/browser/adapter/LicenseSpinnerAdapter.java b/app/src/main/java/io/lbry/browser/adapter/LicenseSpinnerAdapter.java index 62a808ce..9b8a3887 100644 --- a/app/src/main/java/io/lbry/browser/adapter/LicenseSpinnerAdapter.java +++ b/app/src/main/java/io/lbry/browser/adapter/LicenseSpinnerAdapter.java @@ -10,7 +10,6 @@ import android.widget.TextView; import androidx.annotation.NonNull; import io.lbry.browser.R; -import io.lbry.browser.model.Language; import io.lbry.browser.model.License; import io.lbry.browser.utils.Predefined; diff --git a/app/src/main/java/io/lbry/browser/adapter/NavigationMenuAdapter.java b/app/src/main/java/io/lbry/browser/adapter/NavigationMenuAdapter.java index 0106aaf3..00dd7449 100644 --- a/app/src/main/java/io/lbry/browser/adapter/NavigationMenuAdapter.java +++ b/app/src/main/java/io/lbry/browser/adapter/NavigationMenuAdapter.java @@ -2,10 +2,8 @@ package io.lbry.browser.adapter; import android.content.Context; import android.view.LayoutInflater; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; @@ -17,7 +15,6 @@ import io.lbry.browser.R; import io.lbry.browser.model.NavMenuItem; import io.lbry.browser.ui.controls.SolidIconView; import io.lbry.browser.utils.Helper; -import lombok.Getter; import lombok.Setter; public class NavigationMenuAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/io/lbry/browser/adapter/NotificationListAdapter.java b/app/src/main/java/io/lbry/browser/adapter/NotificationListAdapter.java index 71f8f869..35200790 100644 --- a/app/src/main/java/io/lbry/browser/adapter/NotificationListAdapter.java +++ b/app/src/main/java/io/lbry/browser/adapter/NotificationListAdapter.java @@ -14,12 +14,10 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.google.android.material.snackbar.Snackbar; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; -import java.util.Date; import java.util.GregorianCalendar; import java.util.List; import java.util.TimeZone; @@ -34,7 +32,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import lombok.ToString; @Data @EqualsAndHashCode(callSuper = false) diff --git a/app/src/main/java/io/lbry/browser/data/DatabaseHelper.java b/app/src/main/java/io/lbry/browser/data/DatabaseHelper.java index 5fc4aea9..7c4d7c0c 100644 --- a/app/src/main/java/io/lbry/browser/data/DatabaseHelper.java +++ b/app/src/main/java/io/lbry/browser/data/DatabaseHelper.java @@ -6,7 +6,6 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import java.math.BigDecimal; -import java.sql.SQLInput; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java b/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java index 5539dcb6..46c55097 100644 --- a/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java +++ b/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java @@ -13,7 +13,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; import android.widget.ProgressBar; -import android.widget.Switch; import android.widget.TextView; import androidx.appcompat.widget.AppCompatSpinner; @@ -41,7 +40,6 @@ import io.lbry.browser.tasks.claim.ClaimListTask; import io.lbry.browser.tasks.wallet.SupportCreateTask; import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; -import lombok.Setter; public class CreateSupportDialogFragment extends BottomSheetDialogFragment implements WalletBalanceListener { public static final String TAG = "CreateSupportDialog"; diff --git a/app/src/main/java/io/lbry/browser/dialog/DiscoverDialogFragment.java b/app/src/main/java/io/lbry/browser/dialog/DiscoverDialogFragment.java index 927ebda1..d5d4308c 100644 --- a/app/src/main/java/io/lbry/browser/dialog/DiscoverDialogFragment.java +++ b/app/src/main/java/io/lbry/browser/dialog/DiscoverDialogFragment.java @@ -5,7 +5,6 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ProgressBar; import androidx.annotation.NonNull; import androidx.recyclerview.widget.GridLayoutManager; diff --git a/app/src/main/java/io/lbry/browser/dialog/RepostClaimDialogFragment.java b/app/src/main/java/io/lbry/browser/dialog/RepostClaimDialogFragment.java index 231060b5..4abf1280 100644 --- a/app/src/main/java/io/lbry/browser/dialog/RepostClaimDialogFragment.java +++ b/app/src/main/java/io/lbry/browser/dialog/RepostClaimDialogFragment.java @@ -37,7 +37,6 @@ import io.lbry.browser.tasks.claim.StreamRepostTask; import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; import io.lbry.browser.utils.LbryUri; -import lombok.Setter; public class RepostClaimDialogFragment extends BottomSheetDialogFragment implements WalletBalanceListener { public static final String TAG = "RepostClaimDialog"; diff --git a/app/src/main/java/io/lbry/browser/model/Claim.java b/app/src/main/java/io/lbry/browser/model/Claim.java index 22794d8f..88dd197e 100644 --- a/app/src/main/java/io/lbry/browser/model/Claim.java +++ b/app/src/main/java/io/lbry/browser/model/Claim.java @@ -15,7 +15,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.stream.Stream; import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.LbryUri; diff --git a/app/src/main/java/io/lbry/browser/model/ClaimSearchCacheValue.java b/app/src/main/java/io/lbry/browser/model/ClaimSearchCacheValue.java index 54bc1071..8de1d8e0 100644 --- a/app/src/main/java/io/lbry/browser/model/ClaimSearchCacheValue.java +++ b/app/src/main/java/io/lbry/browser/model/ClaimSearchCacheValue.java @@ -1,11 +1,9 @@ package io.lbry.browser.model; import java.util.ArrayList; -import java.util.Date; import java.util.List; import lombok.Getter; -import lombok.Setter; public class ClaimSearchCacheValue { @Getter diff --git a/app/src/main/java/io/lbry/browser/model/Comment.java b/app/src/main/java/io/lbry/browser/model/Comment.java index 2e9a9ae1..00375ef7 100644 --- a/app/src/main/java/io/lbry/browser/model/Comment.java +++ b/app/src/main/java/io/lbry/browser/model/Comment.java @@ -3,7 +3,6 @@ package io.lbry.browser.model; import org.json.JSONException; import org.json.JSONObject; -import java.lang.reflect.Array; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/io/lbry/browser/model/NavMenuItem.java b/app/src/main/java/io/lbry/browser/model/NavMenuItem.java index 1059d004..492b197c 100644 --- a/app/src/main/java/io/lbry/browser/model/NavMenuItem.java +++ b/app/src/main/java/io/lbry/browser/model/NavMenuItem.java @@ -2,8 +2,6 @@ package io.lbry.browser.model; import android.content.Context; -import androidx.core.content.res.ResourcesCompat; - import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/io/lbry/browser/model/ViewHistory.java b/app/src/main/java/io/lbry/browser/model/ViewHistory.java index ea668615..a7d92ff2 100644 --- a/app/src/main/java/io/lbry/browser/model/ViewHistory.java +++ b/app/src/main/java/io/lbry/browser/model/ViewHistory.java @@ -3,9 +3,7 @@ package io.lbry.browser.model; import java.math.BigDecimal; import java.util.Date; -import io.lbry.browser.exceptions.LbryUriException; import io.lbry.browser.utils.LbryUri; -import io.lbry.browser.utils.Lbryio; import lombok.Data; @Data diff --git a/app/src/main/java/io/lbry/browser/model/lbryinc/Reward.java b/app/src/main/java/io/lbry/browser/model/lbryinc/Reward.java index 67f46db6..ebaea7eb 100644 --- a/app/src/main/java/io/lbry/browser/model/lbryinc/Reward.java +++ b/app/src/main/java/io/lbry/browser/model/lbryinc/Reward.java @@ -9,7 +9,6 @@ import org.json.JSONObject; import java.lang.reflect.Type; -import io.lbry.browser.model.Claim; import io.lbry.browser.utils.Helper; import lombok.Data; diff --git a/app/src/main/java/io/lbry/browser/tasks/CommentCreateTask.java b/app/src/main/java/io/lbry/browser/tasks/CommentCreateTask.java index 8465bfed..e63c8134 100644 --- a/app/src/main/java/io/lbry/browser/tasks/CommentCreateTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/CommentCreateTask.java @@ -7,11 +7,7 @@ import org.json.JSONException; import org.json.JSONObject; import java.io.IOException; -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; import java.util.HashMap; -import java.util.Locale; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -19,7 +15,6 @@ import io.lbry.browser.exceptions.ApiCallException; import io.lbry.browser.model.Comment; import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; -import io.lbry.browser.utils.Lbryio; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; diff --git a/app/src/main/java/io/lbry/browser/tasks/LoadTagsTask.java b/app/src/main/java/io/lbry/browser/tasks/LoadTagsTask.java index fa95c52f..a8f5f859 100644 --- a/app/src/main/java/io/lbry/browser/tasks/LoadTagsTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/LoadTagsTask.java @@ -4,18 +4,12 @@ import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; import android.os.AsyncTask; -import android.view.View; -import android.widget.ProgressBar; import java.util.List; import io.lbry.browser.MainActivity; import io.lbry.browser.data.DatabaseHelper; -import io.lbry.browser.exceptions.LbryRequestException; -import io.lbry.browser.exceptions.LbryResponseException; -import io.lbry.browser.model.Claim; import io.lbry.browser.model.Tag; -import io.lbry.browser.utils.Helper; public class LoadTagsTask extends AsyncTask> { private final Context context; diff --git a/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java b/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java index b2476f89..588e0dcb 100644 --- a/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java @@ -4,7 +4,6 @@ import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; import android.os.AsyncTask; -import android.util.Log; import org.json.JSONArray; import org.json.JSONException; @@ -17,14 +16,11 @@ import java.util.Map; import io.lbry.browser.MainActivity; import io.lbry.browser.data.DatabaseHelper; -import io.lbry.browser.exceptions.LbryUriException; import io.lbry.browser.exceptions.LbryioRequestException; import io.lbry.browser.exceptions.LbryioResponseException; import io.lbry.browser.model.lbryinc.Subscription; -import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.LbryUri; import io.lbry.browser.utils.Lbryio; -import okhttp3.Response; // background task to create a diff of local and remote subscriptions and try to merge public class MergeSubscriptionsTask extends AsyncTask> { diff --git a/app/src/main/java/io/lbry/browser/tasks/ReadTextFileTask.java b/app/src/main/java/io/lbry/browser/tasks/ReadTextFileTask.java index e9eb6bf1..d18b3ef1 100644 --- a/app/src/main/java/io/lbry/browser/tasks/ReadTextFileTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/ReadTextFileTask.java @@ -4,11 +4,8 @@ import android.os.AsyncTask; import java.io.BufferedReader; import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.IOException; import java.io.InputStreamReader; -import java.nio.Buffer; import io.lbry.browser.utils.Helper; diff --git a/app/src/main/java/io/lbry/browser/tasks/claim/AbandonChannelTask.java b/app/src/main/java/io/lbry/browser/tasks/claim/AbandonChannelTask.java index 8cd5987c..561c907e 100644 --- a/app/src/main/java/io/lbry/browser/tasks/claim/AbandonChannelTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/claim/AbandonChannelTask.java @@ -11,7 +11,6 @@ import java.util.List; import java.util.Map; import io.lbry.browser.exceptions.ApiCallException; -import io.lbry.browser.tasks.GenericTaskHandler; import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; diff --git a/app/src/main/java/io/lbry/browser/tasks/claim/AbandonStreamTask.java b/app/src/main/java/io/lbry/browser/tasks/claim/AbandonStreamTask.java index 162a9b6d..00f0b8a1 100644 --- a/app/src/main/java/io/lbry/browser/tasks/claim/AbandonStreamTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/claim/AbandonStreamTask.java @@ -11,7 +11,6 @@ import java.util.List; import java.util.Map; import io.lbry.browser.exceptions.ApiCallException; -import io.lbry.browser.tasks.GenericTaskHandler; import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; diff --git a/app/src/main/java/io/lbry/browser/tasks/file/BulkDeleteFilesTask.java b/app/src/main/java/io/lbry/browser/tasks/file/BulkDeleteFilesTask.java index f696d65a..0cf778ba 100644 --- a/app/src/main/java/io/lbry/browser/tasks/file/BulkDeleteFilesTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/file/BulkDeleteFilesTask.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Map; import io.lbry.browser.exceptions.ApiCallException; -import io.lbry.browser.tasks.GenericTaskHandler; import io.lbry.browser.utils.Lbry; // Just run delete on the specified claim IDs (no need for a handler) diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/AndroidPurchaseTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/AndroidPurchaseTask.java index 46fa0df8..8bf81d49 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/AndroidPurchaseTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/AndroidPurchaseTask.java @@ -15,12 +15,10 @@ import java.lang.reflect.Type; import java.util.HashMap; import java.util.Map; -import io.lbry.browser.MainActivity; import io.lbry.browser.model.lbryinc.RewardVerified; import io.lbry.browser.tasks.RewardVerifiedHandler; import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbryio; -import okhttp3.Response; public class AndroidPurchaseTask extends AsyncTask { private final Context context; diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/ChannelSubscribeTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/ChannelSubscribeTask.java index f271d36b..d1ee033c 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/ChannelSubscribeTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/ChannelSubscribeTask.java @@ -13,7 +13,6 @@ import io.lbry.browser.data.DatabaseHelper; import io.lbry.browser.exceptions.LbryioRequestException; import io.lbry.browser.exceptions.LbryioResponseException; import io.lbry.browser.model.lbryinc.Subscription; -import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbryio; public class ChannelSubscribeTask extends AsyncTask { diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/ClaimRewardTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/ClaimRewardTask.java index 4c4fddde..37c4e994 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/ClaimRewardTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/ClaimRewardTask.java @@ -9,7 +9,6 @@ import org.json.JSONException; import org.json.JSONObject; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogFileViewTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogFileViewTask.java index 0d2d5a07..f3c785ae 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogFileViewTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogFileViewTask.java @@ -2,17 +2,14 @@ package io.lbry.browser.tasks.lbryinc; import android.os.AsyncTask; -import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.Executor; import io.lbry.browser.exceptions.LbryioRequestException; import io.lbry.browser.exceptions.LbryioResponseException; import io.lbry.browser.model.Claim; import io.lbry.browser.tasks.GenericTaskHandler; import io.lbry.browser.utils.Lbryio; -import okhttp3.Response; public class LogFileViewTask extends AsyncTask { private final String uri; diff --git a/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogPublishTask.java b/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogPublishTask.java index c9594999..b92d8b29 100644 --- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogPublishTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/LogPublishTask.java @@ -2,7 +2,6 @@ package io.lbry.browser.tasks.lbryinc; import android.os.AsyncTask; -import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -10,7 +9,6 @@ import io.lbry.browser.exceptions.LbryioRequestException; import io.lbry.browser.exceptions.LbryioResponseException; import io.lbry.browser.model.Claim; import io.lbry.browser.utils.Lbryio; -import okhttp3.Response; public class LogPublishTask extends AsyncTask { private final Claim claimResult; diff --git a/app/src/main/java/io/lbry/browser/tasks/localdata/FetchViewHistoryTask.java b/app/src/main/java/io/lbry/browser/tasks/localdata/FetchViewHistoryTask.java index 6c20bc87..907809ac 100644 --- a/app/src/main/java/io/lbry/browser/tasks/localdata/FetchViewHistoryTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/localdata/FetchViewHistoryTask.java @@ -10,7 +10,6 @@ import java.util.Date; import java.util.List; import io.lbry.browser.data.DatabaseHelper; -import io.lbry.browser.model.UrlSuggestion; import io.lbry.browser.model.ViewHistory; import io.lbry.browser.utils.Helper; 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 87e4e067..6b8cc258 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 @@ -6,7 +6,6 @@ import android.database.Cursor; import android.database.sqlite.SQLiteException; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.net.Uri; import android.os.AsyncTask; import android.provider.MediaStore; import android.util.Log; diff --git a/app/src/main/java/io/lbry/browser/tasks/localdata/SaveUrlHistoryTask.java b/app/src/main/java/io/lbry/browser/tasks/localdata/SaveUrlHistoryTask.java index 5f51140a..cd57d858 100644 --- a/app/src/main/java/io/lbry/browser/tasks/localdata/SaveUrlHistoryTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/localdata/SaveUrlHistoryTask.java @@ -1,13 +1,10 @@ package io.lbry.browser.tasks.localdata; -import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.os.AsyncTask; -import io.lbry.browser.MainActivity; import io.lbry.browser.data.DatabaseHelper; import io.lbry.browser.model.UrlSuggestion; -import io.lbry.browser.tasks.GenericTaskHandler; public class SaveUrlHistoryTask extends AsyncTask { private final DatabaseHelper dbHelper; diff --git a/app/src/main/java/io/lbry/browser/tasks/verification/EmailNewTask.java b/app/src/main/java/io/lbry/browser/tasks/verification/EmailNewTask.java index b1afbd1f..cfcc5d8f 100644 --- a/app/src/main/java/io/lbry/browser/tasks/verification/EmailNewTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/verification/EmailNewTask.java @@ -3,8 +3,6 @@ package io.lbry.browser.tasks.verification; import android.os.AsyncTask; import android.view.View; -import org.json.JSONObject; - import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/io/lbry/browser/tasks/verification/TwitterAccessTokenTask.java b/app/src/main/java/io/lbry/browser/tasks/verification/TwitterAccessTokenTask.java index 9b558648..1dbb700c 100644 --- a/app/src/main/java/io/lbry/browser/tasks/verification/TwitterAccessTokenTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/verification/TwitterAccessTokenTask.java @@ -2,15 +2,9 @@ package io.lbry.browser.tasks.verification; import android.os.AsyncTask; -import com.google.api.client.auth.oauth.OAuthHmacSigner; -import com.google.api.client.auth.oauth.OAuthParameters; -import com.google.api.client.http.GenericUrl; - -import io.lbry.browser.VerificationActivity; import io.lbry.browser.model.TwitterOauth; import io.lbry.browser.tasks.TwitterOauthHandler; import io.lbry.browser.utils.Helper; -import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; diff --git a/app/src/main/java/io/lbry/browser/tasks/verification/TwitterRequestTokenTask.java b/app/src/main/java/io/lbry/browser/tasks/verification/TwitterRequestTokenTask.java index d5418f38..cb74905f 100644 --- a/app/src/main/java/io/lbry/browser/tasks/verification/TwitterRequestTokenTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/verification/TwitterRequestTokenTask.java @@ -1,6 +1,5 @@ package io.lbry.browser.tasks.verification; -import android.net.Uri; import android.os.AsyncTask; import android.util.Base64; @@ -10,7 +9,6 @@ import com.google.api.client.http.GenericUrl; import java.nio.charset.StandardCharsets; -import io.lbry.browser.VerificationActivity; import io.lbry.browser.model.TwitterOauth; import io.lbry.browser.tasks.TwitterOauthHandler; import io.lbry.browser.utils.Helper; diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/SyncApplyTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/SyncApplyTask.java index 4e349a37..a089d3ef 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/SyncApplyTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/SyncApplyTask.java @@ -3,7 +3,6 @@ package io.lbry.browser.tasks.wallet; import android.os.AsyncTask; import android.view.View; -import org.json.JSONException; import org.json.JSONObject; import java.util.HashMap; diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/UnlockTipsTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/UnlockTipsTask.java index c9a17bf8..cb344c80 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/UnlockTipsTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/UnlockTipsTask.java @@ -12,7 +12,6 @@ import java.util.List; import java.util.Map; import io.lbry.browser.exceptions.ApiCallException; -import io.lbry.browser.model.WalletBalance; import io.lbry.browser.tasks.GenericTaskHandler; import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/WalletAddressUnusedTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/WalletAddressUnusedTask.java index 9bbda172..676bdbe6 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/WalletAddressUnusedTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/WalletAddressUnusedTask.java @@ -2,13 +2,7 @@ package io.lbry.browser.tasks.wallet; import android.os.AsyncTask; -import org.json.JSONException; -import org.json.JSONObject; - -import java.math.BigDecimal; - import io.lbry.browser.exceptions.ApiCallException; -import io.lbry.browser.model.WalletBalance; import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; diff --git a/app/src/main/java/io/lbry/browser/tasks/wallet/WalletBalanceTask.java b/app/src/main/java/io/lbry/browser/tasks/wallet/WalletBalanceTask.java index 90702499..e504f6d8 100644 --- a/app/src/main/java/io/lbry/browser/tasks/wallet/WalletBalanceTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/wallet/WalletBalanceTask.java @@ -4,11 +4,8 @@ import android.os.AsyncTask; import org.json.JSONObject; -import java.math.BigDecimal; - import io.lbry.browser.exceptions.ApiCallException; import io.lbry.browser.model.WalletBalance; -import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; public class WalletBalanceTask extends AsyncTask { diff --git a/app/src/main/java/io/lbry/browser/ui/BaseFragment.java b/app/src/main/java/io/lbry/browser/ui/BaseFragment.java index 3970e582..9cbf3132 100644 --- a/app/src/main/java/io/lbry/browser/ui/BaseFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/BaseFragment.java @@ -22,11 +22,9 @@ import io.lbry.browser.MainActivity; import io.lbry.browser.R; import io.lbry.browser.adapter.InlineChannelSpinnerAdapter; import io.lbry.browser.model.Claim; -import io.lbry.browser.model.WalletBalance; import io.lbry.browser.tasks.claim.ChannelCreateUpdateTask; import io.lbry.browser.tasks.claim.ClaimResultHandler; import io.lbry.browser.tasks.lbryinc.LogPublishTask; -import io.lbry.browser.ui.wallet.RewardsFragment; import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Lbry; import io.lbry.browser.utils.LbryAnalytics; diff --git a/app/src/main/java/io/lbry/browser/ui/channel/ChannelCommentsFragment.java b/app/src/main/java/io/lbry/browser/ui/channel/ChannelCommentsFragment.java index c32d0f05..10dea146 100644 --- a/app/src/main/java/io/lbry/browser/ui/channel/ChannelCommentsFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/channel/ChannelCommentsFragment.java @@ -1,7 +1,6 @@ package io.lbry.browser.ui.channel; import android.content.Context; -import android.content.DialogInterface; import android.os.AsyncTask; import android.os.Bundle; import android.text.Editable; @@ -16,7 +15,6 @@ import android.widget.ProgressBar; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.AppCompatSpinner; import androidx.core.widget.NestedScrollView; import androidx.fragment.app.Fragment; diff --git a/app/src/main/java/io/lbry/browser/ui/channel/ChannelFormFragment.java b/app/src/main/java/io/lbry/browser/ui/channel/ChannelFormFragment.java index ccb3a609..36899697 100644 --- a/app/src/main/java/io/lbry/browser/ui/channel/ChannelFormFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/channel/ChannelFormFragment.java @@ -3,7 +3,6 @@ package io.lbry.browser.ui.channel; import android.Manifest; import android.content.Context; import android.content.Intent; -import android.graphics.Color; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; @@ -16,7 +15,6 @@ import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.appcompat.app.ActionBar; import androidx.core.content.ContextCompat; import androidx.core.widget.NestedScrollView; import androidx.recyclerview.widget.RecyclerView; diff --git a/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java b/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java index c6035c3b..41626b96 100644 --- a/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java @@ -26,7 +26,6 @@ import com.google.android.material.snackbar.Snackbar; import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; -import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.NumberFormat; import java.util.Arrays; 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 eb771923..19bfab27 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 @@ -12,7 +12,6 @@ import android.graphics.Color; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.os.Handler; import android.text.Editable; import android.text.TextWatcher; import android.text.format.DateUtils; @@ -83,7 +82,6 @@ import org.json.JSONObject; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import java.math.BigDecimal; import java.text.DecimalFormat; import java.text.NumberFormat; import java.util.ArrayList; diff --git a/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java b/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java index 49686b7c..870df8e2 100644 --- a/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java @@ -21,7 +21,6 @@ import androidx.annotation.NonNull; import androidx.preference.PreferenceManager; import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.audio.AudioAttributes; diff --git a/app/src/main/java/io/lbry/browser/ui/other/AboutFragment.java b/app/src/main/java/io/lbry/browser/ui/other/AboutFragment.java index 8091014f..b47568ed 100644 --- a/app/src/main/java/io/lbry/browser/ui/other/AboutFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/other/AboutFragment.java @@ -14,9 +14,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import androidx.appcompat.app.ActionBar; import androidx.core.content.FileProvider; -import androidx.preference.PreferenceManager; import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.Task; diff --git a/app/src/main/java/io/lbry/browser/ui/other/SettingsFragment.java b/app/src/main/java/io/lbry/browser/ui/other/SettingsFragment.java index d23c12a5..bfa00def 100644 --- a/app/src/main/java/io/lbry/browser/ui/other/SettingsFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/other/SettingsFragment.java @@ -8,7 +8,6 @@ import android.text.InputType; import android.widget.EditText; import androidx.annotation.NonNull; -import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatDelegate; import androidx.preference.EditTextPreference; import androidx.preference.PreferenceFragmentCompat; diff --git a/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java b/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java index 0f08a1f7..3d8e2a51 100644 --- a/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java @@ -25,10 +25,8 @@ import android.widget.ProgressBar; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.appcompat.app.ActionBar; import androidx.appcompat.widget.AppCompatSpinner; import androidx.cardview.widget.CardView; -import androidx.core.content.ContextCompat; import androidx.core.widget.NestedScrollView; import androidx.recyclerview.widget.RecyclerView; @@ -52,7 +50,6 @@ import org.json.JSONObject; import java.io.File; import java.io.FileOutputStream; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -77,7 +74,6 @@ import io.lbry.browser.model.License; import io.lbry.browser.model.NavMenuItem; import io.lbry.browser.model.Tag; import io.lbry.browser.model.WalletBalance; -import io.lbry.browser.tasks.claim.ChannelCreateUpdateTask; import io.lbry.browser.tasks.UpdateSuggestedTagsTask; import io.lbry.browser.tasks.UploadImageTask; import io.lbry.browser.tasks.claim.ClaimListResultHandler; diff --git a/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java b/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java index 09ef335b..a8729879 100644 --- a/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/publish/PublishesFragment.java @@ -12,7 +12,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.ProgressBar; -import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; @@ -25,9 +24,7 @@ import com.google.android.material.snackbar.Snackbar; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; import io.lbry.browser.MainActivity; import io.lbry.browser.R; diff --git a/app/src/main/java/io/lbry/browser/ui/verification/WalletVerificationFragment.java b/app/src/main/java/io/lbry/browser/ui/verification/WalletVerificationFragment.java index 3a16ee3e..db90c8b3 100644 --- a/app/src/main/java/io/lbry/browser/ui/verification/WalletVerificationFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/verification/WalletVerificationFragment.java @@ -23,7 +23,6 @@ import io.lbry.browser.MainActivity; import io.lbry.browser.R; import io.lbry.browser.VerificationActivity; import io.lbry.browser.listener.SdkStatusListener; -import io.lbry.browser.listener.SignInListener; import io.lbry.browser.listener.WalletSyncListener; import io.lbry.browser.model.WalletSync; import io.lbry.browser.tasks.wallet.DefaultSyncTaskHandler; 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 27d00f54..1a7ff933 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 @@ -3,7 +3,6 @@ package io.lbry.browser.ui.wallet; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; -import android.graphics.Color; import android.os.AsyncTask; import android.os.Bundle; import android.text.Editable; @@ -25,11 +24,9 @@ import com.google.android.material.snackbar.Snackbar; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import io.lbry.browser.BuildConfig; import io.lbry.browser.MainActivity; import io.lbry.browser.R; import io.lbry.browser.adapter.InlineChannelSpinnerAdapter; @@ -42,9 +39,6 @@ import io.lbry.browser.model.lbryinc.Invitee; import io.lbry.browser.tasks.claim.ClaimListResultHandler; import io.lbry.browser.tasks.claim.ClaimListTask; import io.lbry.browser.tasks.GenericTaskHandler; -import io.lbry.browser.tasks.claim.ChannelCreateUpdateTask; -import io.lbry.browser.tasks.claim.ClaimResultHandler; -import io.lbry.browser.tasks.lbryinc.LogPublishTask; import io.lbry.browser.tasks.lbryinc.FetchInviteStatusTask; import io.lbry.browser.tasks.lbryinc.FetchReferralCodeTask; import io.lbry.browser.tasks.lbryinc.InviteByEmailTask; diff --git a/app/src/main/java/io/lbry/browser/ui/wallet/TransactionHistoryFragment.java b/app/src/main/java/io/lbry/browser/ui/wallet/TransactionHistoryFragment.java index 13a23009..7c0f6cf4 100644 --- a/app/src/main/java/io/lbry/browser/ui/wallet/TransactionHistoryFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/wallet/TransactionHistoryFragment.java @@ -9,7 +9,6 @@ import android.view.ViewGroup; import android.widget.ProgressBar; import androidx.annotation.NonNull; -import androidx.appcompat.app.ActionBar; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; diff --git a/app/src/main/java/io/lbry/browser/utils/ExoplayerAudioRenderer.java b/app/src/main/java/io/lbry/browser/utils/ExoplayerAudioRenderer.java index 00bb1021..9fddfef2 100644 --- a/app/src/main/java/io/lbry/browser/utils/ExoplayerAudioRenderer.java +++ b/app/src/main/java/io/lbry/browser/utils/ExoplayerAudioRenderer.java @@ -3,19 +3,11 @@ package io.lbry.browser.utils; import android.content.Context; import android.os.Handler; -import androidx.annotation.Nullable; - import com.google.android.exoplayer2.DefaultRenderersFactory; -import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.Renderer; -import com.google.android.exoplayer2.audio.AudioCapabilities; -import com.google.android.exoplayer2.audio.AudioProcessor; import com.google.android.exoplayer2.audio.AudioRendererEventListener; import com.google.android.exoplayer2.audio.AudioSink; -import com.google.android.exoplayer2.audio.DefaultAudioSink; import com.google.android.exoplayer2.audio.TeeAudioProcessor; -import com.google.android.exoplayer2.drm.DrmSessionManager; -import com.google.android.exoplayer2.drm.FrameworkMediaCrypto; import com.google.android.exoplayer2.mediacodec.MediaCodecSelector; import java.util.ArrayList; diff --git a/app/src/main/java/io/lbry/browser/utils/Lbry.java b/app/src/main/java/io/lbry/browser/utils/Lbry.java index 940bb032..b727948f 100644 --- a/app/src/main/java/io/lbry/browser/utils/Lbry.java +++ b/app/src/main/java/io/lbry/browser/utils/Lbry.java @@ -14,7 +14,6 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; @@ -34,9 +33,6 @@ import io.lbry.browser.model.Tag; import io.lbry.browser.model.Transaction; import io.lbry.browser.model.WalletBalance; import io.lbry.lbrysdk.Utils; -import kotlin.Pair; -import okhttp3.CacheControl; -import okhttp3.Headers; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; diff --git a/app/src/main/java/io/lbry/browser/utils/Lbryio.java b/app/src/main/java/io/lbry/browser/utils/Lbryio.java index 036eb3f4..ad945630 100644 --- a/app/src/main/java/io/lbry/browser/utils/Lbryio.java +++ b/app/src/main/java/io/lbry/browser/utils/Lbryio.java @@ -29,7 +29,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import io.lbry.browser.BuildConfig; import io.lbry.browser.MainActivity; import io.lbry.browser.exceptions.AuthTokenInvalidatedException; import io.lbry.browser.exceptions.LbryioRequestException; diff --git a/app/src/main/java/io/lbry/browser/utils/Predefined.java b/app/src/main/java/io/lbry/browser/utils/Predefined.java index aacc42fc..f8443b96 100644 --- a/app/src/main/java/io/lbry/browser/utils/Predefined.java +++ b/app/src/main/java/io/lbry/browser/utils/Predefined.java @@ -2,7 +2,6 @@ package io.lbry.browser.utils; import java.util.Arrays; import java.util.List; -import java.util.Map; import io.lbry.browser.R; import io.lbry.browser.model.Language; -- 2.43.4 From b002621861a56988feeeb27bc27b647fbe9ab877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 16:07:43 +0100 Subject: [PATCH 25/31] add missing null check --- .../io/lbry/browser/ui/findcontent/AllContentFragment.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/lbry/browser/ui/findcontent/AllContentFragment.java b/app/src/main/java/io/lbry/browser/ui/findcontent/AllContentFragment.java index 8be3b89f..4302e09f 100644 --- a/app/src/main/java/io/lbry/browser/ui/findcontent/AllContentFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/findcontent/AllContentFragment.java @@ -207,7 +207,11 @@ public class AllContentFragment extends BaseFragment implements DownloadActionLi private void checkParams(boolean reload) { Map params = getParams(); if (params != null && params.containsKey("singleTag")) { - String tagName = params.get("singleTag").toString(); + String tagName = ""; + Object o = params.get("singleTag"); + if (o != null) { + tagName = o.toString(); + } singleTagView = true; tags = Arrays.asList(tagName); titleView.setText(Helper.capitalize(tagName)); -- 2.43.4 From e18a740b20c34876d69dd54d9a3ca0103fb5f238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 16:11:37 +0100 Subject: [PATCH 26/31] Add missing null check --- .../main/java/io/lbry/browser/tasks/BufferEventTask.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/lbry/browser/tasks/BufferEventTask.java b/app/src/main/java/io/lbry/browser/tasks/BufferEventTask.java index fa35ea92..8351d86f 100644 --- a/app/src/main/java/io/lbry/browser/tasks/BufferEventTask.java +++ b/app/src/main/java/io/lbry/browser/tasks/BufferEventTask.java @@ -12,6 +12,7 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; +import okhttp3.ResponseBody; public class BufferEventTask extends AsyncTask { private static final String TAG = "LbryBufferEvent"; @@ -53,7 +54,11 @@ public class BufferEventTask extends AsyncTask { build(); Response response = client.newCall(request).execute(); - String responseString = response.body().string(); + ResponseBody resBody = response.body(); + String responseString = ""; + if (resBody != null) { + responseString = response.body().string(); + } Log.d(TAG, String.format("buffer event sent: %s", responseString)); } catch (Exception ex) { // we don't want to fail if a buffer event fails to register -- 2.43.4 From 4ffc054bdded908a80f2b72fb08c4a0d6201bcb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 16:16:29 +0100 Subject: [PATCH 27/31] cannot compare doubles with == sainly, switch to checking if difference is less than 0.000001 instead --- .../io/lbry/browser/ui/channel/ChannelCommentsFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/lbry/browser/ui/channel/ChannelCommentsFragment.java b/app/src/main/java/io/lbry/browser/ui/channel/ChannelCommentsFragment.java index 10dea146..d0b0fbd2 100644 --- a/app/src/main/java/io/lbry/browser/ui/channel/ChannelCommentsFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/channel/ChannelCommentsFragment.java @@ -634,8 +634,8 @@ public class ChannelCommentsFragment extends Fragment implements SdkStatusListen showError(getString(R.string.please_enter_valid_deposit)); return; } - if (depositAmount == 0) { - String error = getResources().getQuantityString(R.plurals.min_deposit_required, depositAmount == 1 ? 1 : 2, String.valueOf(Helper.MIN_DEPOSIT)); + if (depositAmount <= 0.000001) { + String error = getResources().getQuantityString(R.plurals.min_deposit_required, Math.abs(depositAmount-1.0) <= 0.000001 ? 1 : 2, String.valueOf(Helper.MIN_DEPOSIT)); showError(error); return; } -- 2.43.4 From e8f78baca0b5a3852624554f97308b1e9d6858c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 16:19:07 +0100 Subject: [PATCH 28/31] Add TODO --- .../main/java/io/lbry/browser/ui/channel/ChannelFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java b/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java index 41626b96..b5408422 100644 --- a/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java @@ -623,6 +623,7 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen return commentsFragment; } + // TODO: createFragment is defined as a @NonNull and should never be able to return null. return null; } -- 2.43.4 From 722438ba41ee28b01759ce2e4ac288cf5e7b8925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 16:20:47 +0100 Subject: [PATCH 29/31] Add missing null check --- .../java/io/lbry/browser/ui/channel/ChannelFragment.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java b/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java index b5408422..fd1581e0 100644 --- a/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/channel/ChannelFragment.java @@ -393,7 +393,12 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen } } if (params.containsKey("url")) { - LbryUri newLbryUri = LbryUri.tryParse(params.get("url").toString()); + Object o = params.get("url"); + String urlString = ""; + if (o != null) { + urlString = o.toString(); + } + LbryUri newLbryUri = LbryUri.tryParse(urlString); if (newLbryUri != null) { newUrl = newLbryUri.toString(); String qs = newLbryUri.getQueryString(); -- 2.43.4 From 09d5db287d63c4dfb28eb03cc6d0182458f0a929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= Date: Wed, 13 Jan 2021 16:26:43 +0100 Subject: [PATCH 30/31] Simplify code --- app/src/main/java/io/lbry/browser/MainActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/lbry/browser/MainActivity.java b/app/src/main/java/io/lbry/browser/MainActivity.java index 4947efc5..4eb4ae20 100644 --- a/app/src/main/java/io/lbry/browser/MainActivity.java +++ b/app/src/main/java/io/lbry/browser/MainActivity.java @@ -2988,10 +2988,11 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener } else { try { LbryUri uri = LbryUri.parse(url); + String checkedURL = url.startsWith(LbryUri.PROTO_DEFAULT) ? url : uri.toString(); if (uri.isChannel()) { - openChannelUrl(url.startsWith(LbryUri.PROTO_DEFAULT) ? url : uri.toString()); + openChannelUrl(checkedURL); } else { - openFileUrl(url.startsWith(LbryUri.PROTO_DEFAULT) ? url : uri.toString()); + openFileUrl(checkedURL); } } catch (LbryUriException ex) { // pass -- 2.43.4 From 37f4b6b2734e94f85d62ebe7e08e415efd67d9a8 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Mon, 8 Mar 2021 20:12:36 +0100 Subject: [PATCH 31/31] update build.gradle --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 13a09ded..ccc38f9d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ import com.google.gms.googleservices.GoogleServicesPlugin apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 29 buildToolsVersion "29.0.2" flavorDimensions "default" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3d14f1be..d5aacbb8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,7 +12,6 @@ -