display debug info for received notifications

2020-08-25 14:25:24 +01:00
268 changed files with 3847 additions and 7129 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@ -1 +0,0 @@
-
--- a/.gitignore
+++ b/.gitignore
@ -66,4 +66,3 @@ app/twitter.properties
 *.hprof
 app/build
 bin
-app/debuglib
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -9,8 +9,8 @@ build apk:
  image: lbry/android-base:platform-28
  before_script:
    - echo "$PGP_PRIVATE_KEY" | gpg --batch --import
-    - echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list
-    - wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add -
+    - echo "deb https://dl.bintray.com/sobolevn/deb git-secret main" | tee -a /etc/apt/sources.list
+    - wget -O - https://api.bintray.com/users/sobolevn/keys/gpg/public.key | apt-key add -
    - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret
    - git secret reveal
    - chmod u+x $CI_PROJECT_DIR/gradlew
@ -36,8 +36,8 @@ deploy build.lbry.io:
  before_script:
    - apt-get -y update && apt-get -y install apt-transport-https
    - echo "$PGP_PRIVATE_KEY" | gpg --batch --import
-    - echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list
-    - wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add -
+    - echo "deb https://dl.bintray.com/sobolevn/deb git-secret main" | tee -a /etc/apt/sources.list
+    - wget -O - https://api.bintray.com/users/sobolevn/keys/gpg/public.key | apt-key add -
    - apt-get -y update && apt-get -y install openjdk-8-jdk git git-secret
    - pip install awscli
    - chmod u+x $CI_PROJECT_DIR/gradlew
@ -60,8 +60,8 @@ release apk:
  before_script:
    - apt-get -y update && apt-get -y install apt-transport-https
    - echo "$PGP_PRIVATE_KEY" | gpg --batch --import
-    - echo 'deb https://gitsecret.jfrog.io/artifactory/git-secret-deb git-secret main' >> /etc/apt/sources.list
-    - wget -qO - 'https://gitsecret.jfrog.io/artifactory/api/gpg/key/public' | apt-key add -
+    - echo "deb https://dl.bintray.com/sobolevn/deb git-secret main" | tee -a /etc/apt/sources.list
+    - wget -O - https://api.bintray.com/users/sobolevn/keys/gpg/public.key | apt-key add -
    - apt-get -y update && apt-get -y install openjdk-8-jdk git git-secret
    - pip install awscli githubrelease
    - git secret reveal
--- a/README.md
+++ b/README.md
@ -18,19 +18,7 @@ The minimum supported Android version is 5.0 Lollipop. There are two ways to ins
 The app can be launched by opening **LBRY** from the device's app drawer or via the shortcut on the home screen if that was created upon installation.

 ## Running from Source
-Clone the repository and open the project in Android Studio. Android Studio will automatically run the initial build process.
-
-Create file 'twitter.properties' in app/ folder with the following content:
-
-```
-twitterConsumerKey=XXXXXX
-
-twitterConsumerSecret=XXXXXX
-```
-
-Copy the file 'google-services.sample.json' to 'google-services.json' in the app/ folder.
-
-Click the Sync button and when process finishes, the Run button to launch the app on your simulator or connected debugging device after the build process is complete.
+Clone the repository and open the project in Android Studio. Android Studio will automatically run the initial build process. Click the Run button to launch the app on your simulator or connected debugging device after the build process is complete.

 ## Contributing
 Contributions to this project are welcome, encouraged, and compensated. For more details, see https://lbry.io/faq/contributing
@ -39,7 +27,7 @@ Contributions to this project are welcome, encouraged, and compensated. For more
 This project is MIT licensed. For the full license, see [LICENSE](LICENSE).

 ## Security
-We take security seriously. Please contact security@lbry.com regarding any security issues. Our PGP key is [here](https://lbry.com/faq/pgp-key) if you need it.
+We take security seriously. Please contact security@lbry.com regarding any security issues. Our PGP key is [here](https://keybase.io/lbry/key.asc) if you need it.

 ## Contact
 The primary contact for this project is [@akinwale](https://github.com/akinwale) (akinwale@lbry.com)
--- a/app/build.gradle
+++ b/app/build.gradle
@ -4,7 +4,7 @@ apply plugin: 'com.android.application'

 android {
    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    buildToolsVersion "29.0.1"
    flavorDimensions "default"

    compileOptions {
@ -16,14 +16,14 @@ android {
        applicationId "io.lbry.browser"
        minSdkVersion 21
        targetSdkVersion 29
-        versionCode 1701
-        versionName "0.17.1"
+        versionCode 1600
+        versionName "0.16.0"
+
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

    packagingOptions {
        exclude 'META-INF/DEPENDENCIES'
-        exclude 'lib/x86_64/darwin/libscrypt.dylib'
    }

    productFlavors {
@ -79,35 +79,34 @@ dependencies {
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
    implementation 'com.google.android.material:material:1.3.0-alpha01'
    implementation "androidx.cardview:cardview:1.0.0"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.navigation:navigation-fragment:2.3.1'
-    implementation 'androidx.navigation:navigation-ui:2.3.1'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.navigation:navigation-fragment:2.2.2'
+    implementation 'androidx.navigation:navigation-ui:2.2.2'
    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.webkit:webkit:1.4.0-rc01'
+    implementation 'androidx.webkit:webkit:1.3.0-alpha03'
    implementation 'androidx.camera:camera-core:1.0.0-beta03'
    implementation 'androidx.camera:camera-camera2:1.0.0-beta03'
    implementation 'androidx.camera:camera-lifecycle:1.0.0-beta03'
    implementation 'androidx.camera:camera-view:1.0.0-alpha10'
    implementation 'androidx.browser:browser:1.2.0'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

    implementation 'com.github.bumptech.glide:glide:4.11.0'
    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
-    implementation 'com.google.firebase:firebase-analytics:18.0.0'
-    implementation 'com.google.android.gms:play-services-base:17.5.0'
-    implementation 'com.google.firebase:firebase-messaging:21.0.0'
+    implementation 'com.google.firebase:firebase-analytics:17.4.2'
+    implementation 'com.google.android.gms:play-services-base:17.2.1'
+    implementation 'com.google.firebase:firebase-messaging:20.2.0'
    implementation 'com.google.oauth-client:google-oauth-client:1.30.4'

-    implementation 'com.android.billingclient:billing:3.0.2'
+    implementation 'com.android.billingclient:billing:3.0.0'

    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.12.2'
-    implementation 'com.google.android.exoplayer:exoplayer-dash:2.12.2'
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.12.2'
-    implementation 'com.google.android.exoplayer:extension-cast:2.12.2'
-    implementation 'com.google.android.exoplayer:extension-mediasession:2.12.2'
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.11.4'
+    implementation 'com.google.android.exoplayer:exoplayer-dash:2.11.4'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.4'
+    implementation 'com.google.android.exoplayer:extension-cast:2.11.4'
+    implementation 'com.google.android.exoplayer:extension-mediasession:2.11.4'

    implementation 'com.google.android:flexbox:2.0.1'

@ -118,26 +117,16 @@ dependencies {

    implementation 'com.arthenica:mobile-ffmpeg-full-gpl:4.3.1.LTS'

-    implementation 'commons-codec:commons-codec:1.15'
-    implementation 'org.bitcoinj:bitcoinj-tools:0.14.7'
-    implementation 'org.java-websocket:Java-WebSocket:1.5.1'
-
-    implementation ('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false }
-    implementation 'com.google.zxing:core:3.3.0'
-
    compileOnly 'org.projectlombok:lombok:1.18.10'
    annotationProcessor 'org.projectlombok:lombok:1.18.10'
    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'

    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

-    __32bitImplementation 'io.lbry:lbrysdk32:0.102.0'
-    __64bitImplementation 'io.lbry:lbrysdk64:0.102.0'
-    //__64bitImplementation(name: 'lbrysdk', ext: 'aar')
+    __32bitImplementation 'io.lbry:lbrysdk32:0.80.0'
+    __64bitImplementation 'io.lbry:lbrysdk64:0.80.0'
 }

 apply plugin: 'com.google.gms.google-services'
--- a/app/src/androidTest/java/io/lbry/browser/utils/HelperTest.java
+++ b/app/src/androidTest/java/io/lbry/browser/utils/HelperTest.java
@ -1,12 +0,0 @@
-package io.lbry.browser.utils;
-
-import androidx.test.filters.SmallTest;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-@SmallTest
-public class HelperTest {
-
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
    package="io.lbry.browser"
    android:installLocation="auto">

@ -12,9 +11,6 @@
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="com.android.vending.BILLING" />
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-
-    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />

    <application
        android:allowBackup="true"
@ -72,18 +68,6 @@
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
                <data android:scheme="https" android:host="open.lbry.com"/>
-                <data android:scheme="https" android:host="lbry.tv" android:pathPattern="/..*/*" />
-                <data android:scheme="https" android:host="lbry.tv" android:pathPattern="/.*:.*" />
-                <data android:scheme="https" android:host="lbry.tv" android:pathPattern="/.*#.*" />
-                <data android:scheme="https" android:host="lbry.lat" android:pathPattern="/..*/*" />
-                <data android:scheme="https" android:host="lbry.lat" android:pathPattern="/.*:.*" />
-                <data android:scheme="https" android:host="lbry.lat" android:pathPattern="/.*#.*" />
-                <data android:scheme="https" android:host="lbry.fr" android:pathPattern="/..*/*" />
-                <data android:scheme="https" android:host="lbry.fr" android:pathPattern="/.*:.*" />
-                <data android:scheme="https" android:host="lbry.fr" android:pathPattern="/.*#.*" />
-                <data android:scheme="https" android:host="lbry.in" android:pathPattern="/..*/*" />
-                <data android:scheme="https" android:host="lbry.in" android:pathPattern="/.*:.*" />
-                <data android:scheme="https" android:host="lbry.in" android:pathPattern="/.*#.*" />
                <category android:name="android.intent.category.BROWSABLE" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
@ -101,11 +85,6 @@
            android:theme="@style/AppTheme.NoActionBarTranslucent"
            android:windowSoftInputMode="adjustResize" />

-        <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="fullSensor"
-            tools:replace="screenOrientation" />
-
        <service
            android:name="io.lbry.browser.LbrynetMessagingService"
            android:exported="false">
--- a/app/src/main/java/io/lbry/browser/FirstRunActivity.java
+++ b/app/src/main/java/io/lbry/browser/FirstRunActivity.java
@ -15,22 +15,12 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.text.HtmlCompat;
 import androidx.preference.PreferenceManager;

-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
 import io.lbry.browser.exceptions.AuthTokenInvalidatedException;
 import io.lbry.browser.utils.Helper;
 import io.lbry.browser.utils.Lbry;
 import io.lbry.browser.utils.LbryAnalytics;
 import io.lbry.browser.utils.Lbryio;
 import io.lbry.lbrysdk.LbrynetService;
-import io.lbry.lbrysdk.ServiceHelper;
-import io.lbry.lbrysdk.Utils;

 public class FirstRunActivity extends AppCompatActivity {

@ -54,7 +44,12 @@ public class FirstRunActivity extends AppCompatActivity {
        });

        registerAuthReceiver();
-        findViewById(R.id.welcome_wait_container).setVisibility(View.VISIBLE);
+        if (!Lbry.SDK_READY) {
+            findViewById(R.id.welcome_wait_container).setVisibility(View.VISIBLE);
+        } else {
+            authenticate();
+        }
+
        IntentFilter filter = new IntentFilter();
        filter.addAction(MainActivity.ACTION_SDK_READY);
        filter.addAction(LbrynetService.ACTION_STOP_SERVICE);
@ -67,38 +62,10 @@ public class FirstRunActivity extends AppCompatActivity {
                    authenticate();
                } else if (LbrynetService.ACTION_STOP_SERVICE.equals(action)) {
                    finish();
-                    if (MainActivity.instance != null) {
-                        MainActivity.instance.finish();
-                    }
                }
            }
        };
        registerReceiver(sdkReceiver, filter);
-
-        CheckInstallIdTask task = new CheckInstallIdTask(this, new CheckInstallIdTask.InstallIdHandler() {
-            @Override
-            public void onInstallIdChecked(boolean result) {
-                // start the sdk from FirstRun
-                boolean serviceRunning = MainActivity.isServiceRunning(MainActivity.instance, LbrynetService.class);
-                if (!serviceRunning) {
-                    Lbry.SDK_READY = false;
-                    ServiceHelper.start(MainActivity.instance, "", LbrynetService.class, "lbrynetservice");
-                }
-
-                if (result) {
-                    // install_id generated and validated, authenticate now
-                    authenticate();
-                    return;
-                }
-
-                // we weren't able to generate the install_id ourselves, depend on the sdk for that
-                if (Lbry.SDK_READY) {
-                    authenticate();
-                    return;
-                }
-            }
-        });
-        task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
    }

    public void onResume() {
@ -167,76 +134,8 @@ public class FirstRunActivity extends AppCompatActivity {
        super.onDestroy();
    }

-    private void generateIdAndAuthenticate() {
-
-    }
-
-    private static class CheckInstallIdTask extends AsyncTask<Void, Void, Boolean> {
-        private final Context context;
-        private final InstallIdHandler handler;
-        public CheckInstallIdTask(Context context, InstallIdHandler handler) {
-            this.context = context;
-            this.handler = handler;
-        }
-        protected Boolean doInBackground(Void... params) {
-            // Load the installation id from the file system
-            String lbrynetDir = String.format("%s/%s", Utils.getAppInternalStorageDir(context), "lbrynet");
-            File dir = new File(lbrynetDir);
-            boolean dirExists = dir.isDirectory();
-            if (!dirExists) {
-                dirExists = dir.mkdirs();
-            }
-
-            if (!dirExists) {
-                return false;
-            }
-
-            String installIdPath = String.format("%s/install_id", lbrynetDir);
-            File file = new File(installIdPath);
-            String installId  = null;
-            if (!file.exists()) {
-                // generate the install_id
-                installId = Lbry.generateId();
-                BufferedWriter writer = null;
-                try {
-                    writer = new BufferedWriter(new FileWriter(file));
-                    writer.write(installId);
-                } catch (IOException ex) {
-                    return false;
-                } finally {
-                    Helper.closeCloseable(writer);
-                }
-            } else {
-                // read the installation id from the file
-                BufferedReader reader = null;
-                try {
-                    reader = new BufferedReader(new InputStreamReader(new FileInputStream(installIdPath)));
-                    installId = reader.readLine();
-                } catch (IOException ex) {
-                    return false;
-                } finally {
-                    Helper.closeCloseable(reader);
-                }
-            }
-
-            if (!Helper.isNullOrEmpty(installId)) {
-                Lbry.INSTALLATION_ID = installId;
-            }
-            return !Helper.isNullOrEmpty(installId);
-        }
-        protected void onPostExecute(Boolean result) {
-            if (handler != null) {
-                handler.onInstallIdChecked(result);
-            }
-        }
-
-        public interface InstallIdHandler {
-            void onInstallIdChecked(boolean result);
-        }
-    }
-
    private static class AuthenticateTask extends AsyncTask<Void, Void, Void> {
-        private final Context context;
+        private Context context;
        public AuthenticateTask(Context context) {
            this.context = context;
        }
--- a/app/src/main/java/io/lbry/browser/LbrynetMessagingService.java
+++ b/app/src/main/java/io/lbry/browser/LbrynetMessagingService.java
@ -58,7 +58,12 @@ public class LbrynetMessagingService extends FirebaseMessagingService {
            String name = payload.get("name"); // notification name
            String hash = payload.get("hash"); // comment hash

-            if (type != null && getEnabledTypes().contains(type) && body != null && body.trim().length() > 0) {
+            Log.d(TAG, "Received notification message with payload");
+            for (Map.Entry<String, String> entry : payload.entrySet()) {
+                Log.d(TAG, String.format("%s = %s", entry.getKey(), entry.getValue()));
+            }
+
+            if (type != null && getEnabledTypes().indexOf(type) > -1 && body != null && body.trim().length() > 0) {
                // only log the receive event for valid notifications received
                if (firebaseAnalytics != null) {
                    Bundle bundle = new Bundle();
@ -100,7 +105,7 @@ public class LbrynetMessagingService extends FirebaseMessagingService {

    @Override
    public void onNewToken(String token) {
-        //Log.d(TAG, "Refreshed token: " + token);
+        Log.d(TAG, "Refreshed token: " + token);

        // If you want to send messages to this application instance or
        // manage this apps subscriptions on the server side, send the
--- a/app/src/main/java/io/lbry/browser/MainActivity.java
+++ b/app/src/main/java/io/lbry/browser/MainActivity.java
--- a/app/src/main/java/io/lbry/browser/VerificationActivity.java
+++ b/app/src/main/java/io/lbry/browser/VerificationActivity.java
@ -31,7 +31,6 @@ import java.util.Arrays;
 import java.util.List;

 import io.lbry.browser.adapter.VerificationPagerAdapter;
-import io.lbry.browser.listener.SdkStatusListener;
 import io.lbry.browser.listener.SignInListener;
 import io.lbry.browser.listener.WalletSyncListener;
 import io.lbry.browser.model.lbryinc.RewardVerified;
@ -49,14 +48,13 @@ public class VerificationActivity extends FragmentActivity implements SignInList
    public static final int VERIFICATION_FLOW_REWARDS = 2;
    public static final int VERIFICATION_FLOW_WALLET = 3;

-    private List<SdkStatusListener> sdkStatusListeners;
    private BillingClient billingClient;
    private BroadcastReceiver sdkReceiver;
    private String email;
    private boolean signedIn;
    private int flow;

-    private final PurchasesUpdatedListener purchasesUpdatedListener = new PurchasesUpdatedListener() {
+    private PurchasesUpdatedListener purchasesUpdatedListener = new PurchasesUpdatedListener() {
        @Override
        public void onPurchasesUpdated(@NonNull BillingResult billingResult, @Nullable List<Purchase> purchases) {
            int responseCode = billingResult.getResponseCode();
@ -107,8 +105,6 @@ public class VerificationActivity extends FragmentActivity implements SignInList
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        sdkStatusListeners = new ArrayList<>();
-
        signedIn = Lbryio.isSignedIn();
        Intent intent = getIntent();
        if (intent != null) {
@ -130,18 +126,11 @@ public class VerificationActivity extends FragmentActivity implements SignInList

        IntentFilter filter = new IntentFilter();
        filter.addAction(LbrynetService.ACTION_STOP_SERVICE);
-        filter.addAction(MainActivity.ACTION_SDK_READY);
        sdkReceiver = new BroadcastReceiver() {
            @Override
            public void onReceive(Context context, Intent intent) {
                String action = intent.getAction();
-                if (MainActivity.ACTION_SDK_READY.equals(action)) {
-                    for (SdkStatusListener listener : sdkStatusListeners) {
-                        if (listener != null) {
-                            listener.onSdkReady();
-                        }
-                    }
-                } else if (LbrynetService.ACTION_STOP_SERVICE.equals(action)) {
+                if (LbrynetService.ACTION_STOP_SERVICE.equals(action)) {
                    finish();
                }
            }
@ -204,16 +193,15 @@ public class VerificationActivity extends FragmentActivity implements SignInList
            } else if (flow == VERIFICATION_FLOW_REWARDS) {
                User user = Lbryio.currentUser;
                // disable phone verification for now
-                if (!user.isIdentityVerified()) {
+                /*if (!user.isIdentityVerified()) {
                    // phone number verification required
                    viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_PHONE, false);
                    flowHandled = true;
-                } else {
-                    if (!user.isRewardApproved()) {
-                        // manual verification required
-                        viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_MANUAL, false);
-                        flowHandled = true;
-                    }
+                } else */
+                if (!user.isRewardApproved()) {
+                    // manual verification required
+                    viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_MANUAL, false);
+                    flowHandled = true;
                }
            }

@ -226,11 +214,6 @@ public class VerificationActivity extends FragmentActivity implements SignInList
        }
    }

-    public void showPhoneVerification() {
-        ViewPager2 viewPager = findViewById(R.id.verification_pager);
-        viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_PHONE, false);
-    }
-
    public void showLoading() {
        findViewById(R.id.verification_loading_progress).setVisibility(View.VISIBLE);
        findViewById(R.id.verification_pager).setVisibility(View.INVISIBLE);
@ -244,12 +227,8 @@ public class VerificationActivity extends FragmentActivity implements SignInList

    @Override
    public void onBackPressed() {
-        ViewPager2 viewPager = findViewById(R.id.verification_pager);
-
-        if (viewPager.getCurrentItem() != VerificationPagerAdapter.PAGE_VERIFICATION_MANUAL)
-            viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_MANUAL);
-        else
-            super.onBackPressed();
+        // ignore back press
+        return;
    }

    public void onEmailAdded(String email) {
@ -306,18 +285,20 @@ public class VerificationActivity extends FragmentActivity implements SignInList
                    ViewPager2 viewPager = findViewById(R.id.verification_pager);
                    // for rewards, (show phone verification if not done, or manual verification if required)
                    if (flow == VERIFICATION_FLOW_REWARDS) {
-                        if (!user.isIdentityVerified()) {
+                        // skipping phone verification
+                        /*if (!user.isIdentityVerified()) {
                            // phone number verification required
                            viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_PHONE, false);
+                        } else
+                        */
+                        if (!user.isRewardApproved()) {
+
+                            // manual verification required
+                            viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_MANUAL, false);
                        } else {
-                            if (!user.isRewardApproved()) {
-                                // manual verification required
-                                viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_MANUAL, false);
-                            } else {
-                                // fully verified
-                                setResult(RESULT_OK);
-                                finish();
-                            }
+                            // fully verified
+                            setResult(RESULT_OK);
+                            finish();
                        }
                    } else if (flow == VERIFICATION_FLOW_WALLET) {
                        // for wallet sync, if password unlock is required, show password entry page
@ -355,7 +336,6 @@ public class VerificationActivity extends FragmentActivity implements SignInList
                    return;
                }

-                findViewById(R.id.verification_close_button).setVisibility(View.VISIBLE);
                // show manual verification page if the user is still not reward approved
                ViewPager2 viewPager = findViewById(R.id.verification_pager);
                viewPager.setCurrentItem(VerificationPagerAdapter.PAGE_VERIFICATION_MANUAL, false);
@ -456,14 +436,4 @@ public class VerificationActivity extends FragmentActivity implements SignInList
        Helper.unregisterReceiver(sdkReceiver, this);
        super.onDestroy();
    }
-
-    public void addSdkStatusListener(SdkStatusListener listener) {
-        if (!sdkStatusListeners.contains(listener)) {
-            sdkStatusListeners.add(listener);
-        }
-    }
-
-    public void removeSdkStatusListener(SdkStatusListener listener) {
-        sdkStatusListeners.remove(listener);
-    }
 }
--- 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<ChannelFilterListAdapter.ViewHolder> {
-    private final Context context;
+    private Context context;
    private List<Claim> items;
    @Getter
    @Setter
@ -42,12 +42,12 @@ public class ChannelFilterListAdapter extends RecyclerView.Adapter<ChannelFilter
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
-        protected final View mediaContainer;
-        protected final View alphaContainer;
-        protected final View allView;
-        protected final ImageView thumbnailView;
-        protected final TextView alphaView;
-        protected final TextView titleView;
+        protected View mediaContainer;
+        protected View alphaContainer;
+        protected View allView;
+        protected ImageView thumbnailView;
+        protected TextView alphaView;
+        protected TextView titleView;
        public ViewHolder(View v) {
            super(v);
            mediaContainer = v.findViewById(R.id.channel_filter_media_container);
@ -95,13 +95,13 @@ public class ChannelFilterListAdapter extends RecyclerView.Adapter<ChannelFilter
        vh.allView.setVisibility(claim.isPlaceholder() ? View.VISIBLE : View.GONE);

        vh.titleView.setText(Helper.isNullOrEmpty(claim.getTitle()) ? claim.getName() : claim.getTitle());
-        String thumbnailUrl = claim.getThumbnailUrl(vh.thumbnailView.getLayoutParams().width, vh.thumbnailView.getLayoutParams().height, 85);
+        String thumbnailUrl = claim.getThumbnailUrl();
        if (!Helper.isNullOrEmpty(thumbnailUrl) && context != null) {
            Glide.with(context.getApplicationContext()).load(thumbnailUrl).apply(RequestOptions.circleCropTransform()).into(vh.thumbnailView);
        }
        vh.alphaContainer.setVisibility(claim.isPlaceholder() || Helper.isNullOrEmpty(thumbnailUrl) ? View.VISIBLE : View.GONE);
        vh.thumbnailView.setVisibility(claim.isPlaceholder() || Helper.isNullOrEmpty(thumbnailUrl) ? View.GONE : View.VISIBLE);
-        vh.alphaView.setText(claim.isPlaceholder() ? null : claim.getName() != null ? claim.getName().substring(1, 2).toUpperCase() : "");
+        vh.alphaView.setText(claim.isPlaceholder() ? null : claim.getName() != null ? claim.getName().substring(1, 2) : "");

        int bgColor = Helper.generateRandomColorForValue(claim.getClaimId());
        Helper.setIconViewBackgroundColor(vh.alphaContainer, bgColor, claim.isPlaceholder(), context);
--- a/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
@ -21,6 +21,7 @@ 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;
@ -36,18 +37,18 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
    private static final int VIEW_TYPE_CHANNEL = 2;
    private static final int VIEW_TYPE_FEATURED = 3; // featured search result

-    private final Map<String, Claim> quickClaimIdMap;
-    private final Map<String, Claim> quickClaimUrlMap;
-    private final Map<String, Boolean> notFoundClaimIdMap;
-    private final Map<String, Boolean> notFoundClaimUrlMap;
+    private Map<String, Claim> quickClaimIdMap;
+    private Map<String, Claim> quickClaimUrlMap;
+    private Map<String, Boolean> notFoundClaimIdMap;
+    private Map<String, Boolean> notFoundClaimUrlMap;

    @Setter
    private boolean hideFee;
    @Setter
    private boolean canEnterSelectionMode;
-    private final Context context;
+    private Context context;
    private List<Claim> items;
-    private final List<Claim> selectedItems;
+    private List<Claim> selectedItems;
    @Setter
    private ClaimListItemListener listener;
    @Getter
@ -175,27 +176,27 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
-        protected final View feeContainer;
-        protected final TextView feeView;
-        protected final ImageView thumbnailView;
-        protected final View noThumbnailView;
-        protected final TextView alphaView;
-        protected final TextView vanityUrlView;
-        protected final TextView durationView;
-        protected final TextView titleView;
-        protected final TextView publisherView;
-        protected final TextView publishTimeView;
-        protected final TextView pendingTextView;
-        protected final View repostInfoView;
-        protected final TextView repostChannelView;
-        protected final View selectedOverlayView;
-        protected final TextView fileSizeView;
-        protected final ProgressBar downloadProgressView;
-        protected final TextView deviceView;
+        protected View feeContainer;
+        protected TextView feeView;
+        protected ImageView thumbnailView;
+        protected View noThumbnailView;
+        protected TextView alphaView;
+        protected TextView vanityUrlView;
+        protected TextView durationView;
+        protected TextView titleView;
+        protected TextView publisherView;
+        protected TextView publishTimeView;
+        protected TextView pendingTextView;
+        protected View repostInfoView;
+        protected TextView repostChannelView;
+        protected View selectedOverlayView;
+        protected TextView fileSizeView;
+        protected ProgressBar downloadProgressView;
+        protected TextView deviceView;

-        protected final View loadingImagePlaceholder;
-        protected final View loadingTextPlaceholder1;
-        protected final View loadingTextPlaceholder2;
+        protected View loadingImagePlaceholder;
+        protected View loadingTextPlaceholder1;
+        protected View loadingTextPlaceholder2;
        public ViewHolder(View v) {
            super(v);
            feeContainer = v.findViewById(R.id.claim_fee_container);
@ -322,7 +323,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
        int paddingBottom = position == getItemCount() - 1 ? 16 : 8;
        int paddingTopScaled = Helper.getScaledValue(paddingTop, scale);
        int paddingBottomScaled = Helper.getScaledValue(paddingBottom, scale);
-        vh.itemView.setPadding(vh.itemView.getPaddingStart(), paddingTopScaled, vh.itemView.getPaddingEnd(), paddingBottomScaled);
+        vh.itemView.setPadding(vh.itemView.getPaddingLeft(), paddingTopScaled, vh.itemView.getPaddingRight(), paddingBottomScaled);

        Claim original = items.get(position);
        boolean isRepost = Claim.TYPE_REPOST.equalsIgnoreCase(original.getValueType());
@ -334,8 +335,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
        if (metadata instanceof Claim.StreamMetadata) {
            streamMetadata = (Claim.StreamMetadata) metadata;
        }
-
-        String thumbnailUrl = item.getThumbnailUrl(vh.thumbnailView.getLayoutParams().width, vh.thumbnailView.getLayoutParams().height, 85);
+        String thumbnailUrl = item.getThumbnailUrl();
        long publishTime = (streamMetadata != null && streamMetadata.getReleaseTime() > 0) ? streamMetadata.getReleaseTime() * 1000 : item.getTimestamp() * 1000;
        int bgColor = Helper.generateRandomColorForValue(item.getClaimId());
        if (bgColor == 0) {
@ -404,7 +404,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
        vh.publishTimeView.setVisibility(!isPending ? View.VISIBLE : View.GONE);
        vh.pendingTextView.setVisibility(isPending && !item.isLoadingPlaceholder() ? View.VISIBLE : View.GONE);
        vh.repostInfoView.setVisibility(isRepost && type != VIEW_TYPE_FEATURED ? View.VISIBLE : View.GONE);
-        vh.repostChannelView.setText(isRepost && original.getSigningChannel() != null ? original.getSigningChannel().getName() : null);
+        vh.repostChannelView.setText(isRepost ? original.getSigningChannel().getName() : null);
        vh.repostChannelView.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
@ -430,7 +430,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
        Helper.setViewVisibility(vh.loadingTextPlaceholder2, item.isLoadingPlaceholder() ? View.VISIBLE : View.GONE);
        Helper.setViewVisibility(vh.titleView, !item.isLoadingPlaceholder() ? View.VISIBLE : View.GONE);
        Helper.setViewVisibility(vh.publisherView, !item.isLoadingPlaceholder() ? View.VISIBLE : View.GONE);
-        Helper.setViewVisibility(vh.publishTimeView, !item.isLoadingPlaceholder() && !isPending ? View.VISIBLE : View.GONE);
+        Helper.setViewVisibility(vh.publishTimeView, !item.isLoadingPlaceholder() ? View.VISIBLE : View.GONE);

        if (type == VIEW_TYPE_FEATURED && item.isUnresolved()) {
            vh.durationView.setVisibility(View.GONE);
--- a/app/src/main/java/io/lbry/browser/adapter/CommentListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/CommentListAdapter.java
@ -27,9 +27,9 @@ import io.lbry.browser.utils.LbryUri;
 import lombok.Setter;

 public class CommentListAdapter extends RecyclerView.Adapter<CommentListAdapter.ViewHolder> {
-    private final List<Comment> items;
-    private final Context context;
-    private final boolean nested;
+    private List<Comment> items;
+    private Context context;
+    private boolean nested;
    private float scale;
    @Setter
    private ClaimListAdapter.ClaimListItemListener listener;
@ -102,14 +102,14 @@ public class CommentListAdapter extends RecyclerView.Adapter<CommentListAdapter.
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
-        protected final TextView channelName;
-        protected final TextView commentText;
-        protected final ImageView thumbnailView;
-        protected final View noThumbnailView;
-        protected final TextView alphaView;
-        protected final TextView commentTimeView;
-        protected final View replyLink;
-        protected final RecyclerView repliesList;
+        protected TextView channelName;
+        protected TextView commentText;
+        protected ImageView thumbnailView;
+        protected View noThumbnailView;
+        protected TextView alphaView;
+        protected TextView commentTimeView;
+        protected View replyLink;
+        protected RecyclerView repliesList;

        public ViewHolder (View v) {
            super(v);
@ -173,9 +173,9 @@ public class CommentListAdapter extends RecyclerView.Adapter<CommentListAdapter.
    public void onBindViewHolder(ViewHolder holder, int position) {
        Comment comment = items.get(position);
        holder.itemView.setPadding(
-                nested ? Helper.getScaledValue(56, scale) : holder.itemView.getPaddingStart(),
+                nested ? Helper.getScaledValue(56, scale) : holder.itemView.getPaddingLeft(),
                holder.itemView.getPaddingTop(),
-                nested ? 0 : holder.itemView.getPaddingEnd(),
+                nested ? 0 : holder.itemView.getPaddingRight(),
                holder.itemView.getPaddingBottom());

        holder.channelName.setText(comment.getChannelName());
@ -190,7 +190,7 @@ public class CommentListAdapter extends RecyclerView.Adapter<CommentListAdapter.
        int bgColor = Helper.generateRandomColorForValue(comment.getChannelId());
        Helper.setIconViewBackgroundColor(holder.noThumbnailView, bgColor, false, context);
        if (hasThumbnail) {
-            Glide.with(context.getApplicationContext()).asBitmap().load(comment.getPoster().getThumbnailUrl(holder.thumbnailView.getLayoutParams().width, holder.thumbnailView.getLayoutParams().height, 85)).
+            Glide.with(context.getApplicationContext()).asBitmap().load(comment.getPoster().getThumbnailUrl()).
                    apply(RequestOptions.circleCropTransform()).into(holder.thumbnailView);
        }
        holder.alphaView.setText(comment.getChannelName() != null ? comment.getChannelName().substring(1, 2).toUpperCase() : null);
--- a/app/src/main/java/io/lbry/browser/adapter/EditorsChoiceItemAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/EditorsChoiceItemAdapter.java
@ -23,8 +23,8 @@ public class EditorsChoiceItemAdapter extends RecyclerView.Adapter<EditorsChoice
    private static final int VIEW_TYPE_HEADER = 1;
    private static final int VIEW_TYPE_CONTENT = 2;

-    private final Context context;
-    private final List<EditorsChoiceItem> items;
+    private Context context;
+    private List<EditorsChoiceItem> items;
    @Setter
    private EditorsChoiceItemListener listener;

@ -48,11 +48,11 @@ public class EditorsChoiceItemAdapter extends RecyclerView.Adapter<EditorsChoice
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
-        protected final ImageView thumbnailView;
-        protected final TextView descriptionView;
-        protected final TextView headerView;
-        protected final TextView titleView;
-        protected final View cardView;
+        protected ImageView thumbnailView;
+        protected TextView descriptionView;
+        protected TextView headerView;
+        protected TextView titleView;
+        protected View cardView;

        public ViewHolder(View v) {
            super(v);
--- a/app/src/main/java/io/lbry/browser/adapter/GalleryGridAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/GalleryGridAdapter.java
@ -21,8 +21,8 @@ import io.lbry.browser.utils.Helper;
 import lombok.Setter;

 public class GalleryGridAdapter extends RecyclerView.Adapter<GalleryGridAdapter.ViewHolder> {
-    private final Context context;
-    private final List<GalleryItem> items;
+    private Context context;
+    private List<GalleryItem> items;
    @Setter
    private GalleryItemClickListener listener;

@ -32,8 +32,8 @@ public class GalleryGridAdapter extends RecyclerView.Adapter<GalleryGridAdapter.
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
-        protected final ImageView thumbnailView;
-        protected final TextView durationView;
+        protected ImageView thumbnailView;
+        protected TextView durationView;
        public ViewHolder(View v) {
            super(v);
            thumbnailView = v.findViewById(R.id.gallery_item_thumbnail);
@ -96,8 +96,8 @@ public class GalleryGridAdapter extends RecyclerView.Adapter<GalleryGridAdapter.

    public static  class GalleryGridItemDecoration extends RecyclerView.ItemDecoration {

-        private final int spanCount;
-        private final int spacing;
+        private int spanCount;
+        private int spacing;

        public GalleryGridItemDecoration(int spanCount, int spacing) {
            this.spanCount = spanCount;
--- a/app/src/main/java/io/lbry/browser/adapter/InlineChannelSpinnerAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/InlineChannelSpinnerAdapter.java
@ -1,10 +1,12 @@
 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;
@ -16,9 +18,9 @@ import io.lbry.browser.model.Claim;

 public class InlineChannelSpinnerAdapter extends ArrayAdapter<Claim> {

-    private final List<Claim> channels;
-    private final int layoutResourceId;
-    private final LayoutInflater inflater;
+    private List<Claim> channels;
+    private int layoutResourceId;
+    private LayoutInflater inflater;

    public InlineChannelSpinnerAdapter(Context context, int resource, List<Claim> channels) {
        super(context, resource, 0, channels);
--- a/app/src/main/java/io/lbry/browser/adapter/InviteeListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/InviteeListAdapter.java
@ -1,7 +1,9 @@
 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;
@ -9,16 +11,21 @@ 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<InviteeListAdapter.ViewHolder> {

-    private final Context context;
-    private final List<Invitee> items;
+    private Context context;
+    private List<Invitee> items;

    public InviteeListAdapter(List<Invitee> invitees, Context context) {
        this.context = context;
@ -73,8 +80,8 @@ public class InviteeListAdapter extends RecyclerView.Adapter<InviteeListAdapter.
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
-        protected final TextView emailView;
-        protected final TextView rewardView;
+        protected TextView emailView;
+        protected TextView rewardView;

        public ViewHolder(View v) {
            super(v);
--- a/app/src/main/java/io/lbry/browser/adapter/LanguageSpinnerAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/LanguageSpinnerAdapter.java
@ -10,12 +10,13 @@ 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;

 public class LanguageSpinnerAdapter extends ArrayAdapter<Language> {
-    private final int layoutResourceId;
-    private final LayoutInflater inflater;
+    private int layoutResourceId;
+    private LayoutInflater inflater;

    public LanguageSpinnerAdapter(Context context, int resource) {
        super(context, resource, 0, Predefined.PUBLISH_LANGUAGES);
--- a/app/src/main/java/io/lbry/browser/adapter/LicenseSpinnerAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/LicenseSpinnerAdapter.java
@ -10,12 +10,13 @@ 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;

 public class LicenseSpinnerAdapter extends ArrayAdapter<License> {
-    private final int layoutResourceId;
-    private final LayoutInflater inflater;
+    private int layoutResourceId;
+    private LayoutInflater inflater;

    public LicenseSpinnerAdapter(Context context, int resource) {
        super(context, resource, 0, Predefined.LICENSES);
--- a/app/src/main/java/io/lbry/browser/adapter/NavigationMenuAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/NavigationMenuAdapter.java
@ -2,8 +2,10 @@ 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;
@ -15,14 +17,15 @@ 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<NavigationMenuAdapter.ViewHolder> {
    private static final int TYPE_GROUP = 1;
    private static final int TYPE_ITEM = 2;

-    private final Context context;
-    private final List<NavMenuItem> menuItems;
+    private Context context;
+    private List<NavMenuItem> menuItems;
    private NavMenuItem currentItem;
    @Setter
    private NavigationMenuItemClickListener listener;
@ -62,8 +65,8 @@ public class NavigationMenuAdapter extends RecyclerView.Adapter<NavigationMenuAd
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
-        protected final SolidIconView iconView;
-        protected final TextView titleView;
+        protected SolidIconView iconView;
+        protected TextView titleView;
        public ViewHolder(View v) {
            super(v);
            titleView = v.findViewById(R.id.nav_menu_title);
--- a/app/src/main/java/io/lbry/browser/adapter/NotificationListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/NotificationListAdapter.java
@ -18,12 +18,12 @@ import com.bumptech.glide.request.RequestOptions;
 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;

 import io.lbry.browser.R;
-import io.lbry.browser.listener.SelectionModeListener;
 import io.lbry.browser.model.Claim;
 import io.lbry.browser.model.lbryinc.LbryNotification;
 import io.lbry.browser.ui.controls.SolidIconView;
@ -32,6 +32,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;

@Data
@EqualsAndHashCode(callSuper = false)
@ -40,32 +41,27 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
    private static final String RULE_CREATOR_SUBSCRIBER = "creator_subscriber";
    private static final String RULE_COMMENT = "comment";

-    private final Context context;
-    private final List<LbryNotification> items;
-    private final List<LbryNotification> selectedItems;
+    private Context context;
+    private List<LbryNotification> items;
    @Setter
    private NotificationClickListener clickListener;
    @Getter
    @Setter
-    private boolean inSelectionMode;
-    @Setter
-    private SelectionModeListener selectionModeListener;
+    private int customizeMode;

    public NotificationListAdapter(List<LbryNotification> notifications, Context context) {
        this.context = context;
        this.items = new ArrayList<>(notifications);
-        this.selectedItems = new ArrayList<>();
        Collections.sort(items, Collections.reverseOrder(new LbryNotification()));
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
-        protected final View layoutView;
-        protected final TextView titleView;
-        protected final TextView bodyView;
-        protected final TextView timeView;
-        protected final SolidIconView iconView;
-        protected final ImageView thumbnailView;
-        protected final View selectedOverlayView;
+        protected View layoutView;
+        protected TextView titleView;
+        protected TextView bodyView;
+        protected TextView timeView;
+        protected SolidIconView iconView;
+        protected ImageView thumbnailView;
        public ViewHolder(View v) {
            super(v);
            layoutView = v.findViewById(R.id.notification_layout);
@ -74,25 +70,12 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
            timeView = v.findViewById(R.id.notification_time);
            iconView = v.findViewById(R.id.notification_icon);
            thumbnailView = v.findViewById(R.id.notification_author_thumbnail);
-            selectedOverlayView = v.findViewById(R.id.notification_selected_overlay);
        }
    }

    public int getItemCount() {
        return items != null ? items.size() : 0;
    }
-    public List<LbryNotification> getSelectedItems() {
-        return this.selectedItems;
-    }
-    public int getSelectedCount() {
-        return selectedItems != null ? selectedItems.size() : 0;
-    }
-    public void clearSelectedItems() {
-        this.selectedItems.clear();
-    }
-    public boolean isNotificationSelected(LbryNotification notification) {
-        return selectedItems.contains(notification);
-    }

    public void insertNotification(LbryNotification notification, int index) {
        if (!items.contains(notification)) {
@ -107,12 +90,6 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
        }
        notifyDataSetChanged();
    }
-    public void removeNotifications(List<LbryNotification> notifications) {
-        for (LbryNotification notification : notifications) {
-            items.remove(notification);
-        }
-        notifyDataSetChanged();
-    }

    public List<String> getAuthorUrls() {
        List<String> urls = new ArrayList<>();
@ -181,8 +158,8 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
    @Override
    public void onBindViewHolder(NotificationListAdapter.ViewHolder vh, int position) {
        LbryNotification notification = items.get(position);
-        vh.layoutView.setBackgroundColor(ContextCompat.getColor(context, notification.isSeen() ? android.R.color.transparent : R.color.nextLbryGreenSemiTransparent));
-        vh.selectedOverlayView.setVisibility(isNotificationSelected(notification) ? View.VISIBLE : View.GONE);
+
+        vh.layoutView.setBackgroundColor(ContextCompat.getColor(context, notification.isSeen() ? R.color.white : R.color.nextLbryGreenSemiTransparent));

        vh.titleView.setVisibility(!Helper.isNullOrEmpty(notification.getTitle()) ? View.VISIBLE : View.GONE);
        vh.titleView.setText(notification.getTitle());
@ -193,7 +170,7 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
        vh.thumbnailView.setVisibility(notification.getCommentAuthor() == null ? View.INVISIBLE : View.VISIBLE);
        if (notification.getCommentAuthor() != null) {
            Glide.with(context.getApplicationContext()).load(
-                    notification.getCommentAuthor().getThumbnailUrl(vh.thumbnailView.getLayoutParams().width, vh.thumbnailView.getLayoutParams().height, 85)).apply(RequestOptions.circleCropTransform()).into(vh.thumbnailView);
+                    notification.getCommentAuthor().getThumbnailUrl()).apply(RequestOptions.circleCropTransform()).into(vh.thumbnailView);
        }

        vh.iconView.setVisibility(notification.getCommentAuthor() != null ? View.INVISIBLE : View.VISIBLE);
@ -203,49 +180,11 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
        vh.itemView.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
-                if (inSelectionMode) {
-                    toggleSelectedNotification(notification);
-                } else {
-                    if (clickListener != null) {
-                        clickListener.onNotificationClicked(notification);
-                    }
+                if (clickListener != null) {
+                    clickListener.onNotificationClicked(notification);
                }
            }
        });
-        vh.itemView.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View view) {
-                if (!inSelectionMode) {
-                    inSelectionMode = true;
-                    if (selectionModeListener != null) {
-                        selectionModeListener.onEnterSelectionMode();
-                    }
-                }
-                toggleSelectedNotification(notification);
-                return true;
-            }
-        });
-    }
-
-    private void toggleSelectedNotification(LbryNotification notification) {
-        if (selectedItems.contains(notification)) {
-            selectedItems.remove(notification);
-        } else {
-            selectedItems.add(notification);
-        }
-
-        if (selectionModeListener != null) {
-            selectionModeListener.onItemSelectionToggled();
-        }
-
-        if (selectedItems.size() == 0) {
-            inSelectionMode = false;
-            if (selectionModeListener != null) {
-                selectionModeListener.onExitSelectionMode();
-            }
-        }
-
-        notifyDataSetChanged();
    }

    private long getLocalNotificationTime(LbryNotification notification) {
--- a/app/src/main/java/io/lbry/browser/adapter/RewardListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/RewardListAdapter.java
@ -32,7 +32,7 @@ public class RewardListAdapter extends RecyclerView.Adapter<RewardListAdapter.Vi
    public static final int DISPLAY_MODE_ALL = 1;
    public static final int DISPLAY_MODE_UNCLAIMED = 2;

-    private final Context context;
+    private Context context;
    @Setter
    private List<Reward> all;
    private List<Reward> items;
@ -85,16 +85,16 @@ public class RewardListAdapter extends RecyclerView.Adapter<RewardListAdapter.Vi
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
-        protected final View iconClaimed;
-        protected final View loading;
-        protected final View upTo;
-        protected final TextView textTitle;
-        protected final TextView textDescription;
-        protected final TextView textLbcValue;
-        protected final TextView textUsdValue;
-        protected final TextView textLinkTransaction;
-        protected final EditText inputCustomCode;
-        protected final MaterialButton buttonClaimCustom;
+        protected View iconClaimed;
+        protected View loading;
+        protected View upTo;
+        protected TextView textTitle;
+        protected TextView textDescription;
+        protected TextView textLbcValue;
+        protected TextView textUsdValue;
+        protected TextView textLinkTransaction;
+        protected EditText inputCustomCode;
+        protected MaterialButton buttonClaimCustom;
        public ViewHolder(View v) {
            super(v);
            iconClaimed = v.findViewById(R.id.reward_item_claimed_icon);
--- a/app/src/main/java/io/lbry/browser/adapter/StartupStageAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/StartupStageAdapter.java
@ -1,70 +0,0 @@
-package io.lbry.browser.adapter;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import java.util.List;
-
-import io.lbry.browser.R;
-import io.lbry.browser.model.StartupStage;
-
-public class StartupStageAdapter extends BaseAdapter {
-    private final List<StartupStage> list;
-    private final LayoutInflater inflater;
-    private final String[] stagesString;
-
-    public StartupStageAdapter(Context ctx, List<StartupStage> rows) {
-        this.list = rows;
-        this.inflater = LayoutInflater.from(ctx);
-
-        stagesString = new String[9];
-
-        stagesString[0] = ctx.getResources().getString(R.string.installation_id_loaded);
-        stagesString[1] = ctx.getResources().getString(R.string.known_tags_loaded);
-        stagesString[2] = ctx.getResources().getString(R.string.exchange_rate_loaded);
-        stagesString[3] = ctx.getResources().getString(R.string.user_authenticated);
-        stagesString[4] = ctx.getResources().getString(R.string.installation_registered);
-        stagesString[5] = ctx.getResources().getString(R.string.subscriptions_loaded);
-        stagesString[6] = ctx.getResources().getString(R.string.subscriptions_resolved);
-        stagesString[7] = ctx.getResources().getString(R.string.block_list_loaded);
-        stagesString[8] = ctx.getResources().getString(R.string.filter_list_loaded);
-    }
-    @Override
-    public int getCount() {
-        return list.size();
-    }
-
-    @Override
-    public Object getItem(int i) {
-        return list.get(i);
-    }
-
-    @Override
-    public long getItemId(int i) {
-        return i;
-    }
-
-    @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
-        if (view == null) {
-            view = inflater.inflate(R.layout.list_item_startupstage, viewGroup, false);
-
-            ImageView iconView = view.findViewById(R.id.startup_stage_icon);
-            TextView textView = view.findViewById(R.id.startup_stage_text);
-
-            StartupStage item = (StartupStage) getItem(i);
-
-            iconView.setImageResource(item.stageDone ? R.drawable.ic_check : R.drawable.ic_close);
-            iconView.setColorFilter(item.stageDone ? Color.WHITE : Color.RED);
-
-            textView.setText(stagesString[item.stage - 1]);
-        }
-        return view;
-    }
-}
--- a/app/src/main/java/io/lbry/browser/adapter/SuggestedChannelGridAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/SuggestedChannelGridAdapter.java
@ -22,9 +22,9 @@ import io.lbry.browser.utils.Helper;
 import lombok.Setter;

 public class SuggestedChannelGridAdapter extends RecyclerView.Adapter<SuggestedChannelGridAdapter.ViewHolder> {
-    private final Context context;
-    private final List<Claim> items;
-    private final List<Claim> selectedItems;
+    private Context context;
+    private List<Claim> items;
+    private List<Claim> selectedItems;
    @Setter
    private ChannelItemSelectionListener listener;

@ -35,11 +35,11 @@ public class SuggestedChannelGridAdapter extends RecyclerView.Adapter<SuggestedC
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
-        protected final View noThumbnailView;
-        protected final ImageView thumbnailView;
-        protected final TextView alphaView;
-        protected final TextView titleView;
-        protected final TextView tagView;
+        protected View noThumbnailView;
+        protected ImageView thumbnailView;
+        protected TextView alphaView;
+        protected TextView titleView;
+        protected TextView tagView;
        public ViewHolder(View v) {
            super(v);
            noThumbnailView = v.findViewById(R.id.suggested_channel_no_thumbnail);
@ -89,8 +89,7 @@ public class SuggestedChannelGridAdapter extends RecyclerView.Adapter<SuggestedC
    @Override
    public void onBindViewHolder(SuggestedChannelGridAdapter.ViewHolder vh, int position) {
        Claim claim = items.get(position);
-        ViewGroup.LayoutParams lp = vh.thumbnailView.getLayoutParams();
-        String thumbnailUrl = claim.getThumbnailUrl(lp.width, lp.height, 85);
+        String thumbnailUrl = claim.getThumbnailUrl();

        int bgColor = Helper.generateRandomColorForValue(claim.getClaimId());
        Helper.setIconViewBackgroundColor(vh.noThumbnailView, bgColor, false, context);
--- a/app/src/main/java/io/lbry/browser/adapter/TagListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/TagListAdapter.java
@ -23,13 +23,12 @@ public class TagListAdapter extends RecyclerView.Adapter<TagListAdapter.ViewHold
    public static final int CUSTOMIZE_MODE_ADD = 1;
    public static final int CUSTOMIZE_MODE_REMOVE = 2;

-    private final Context context;
+    private Context context;
    private List<Tag> items;
    @Setter
    private TagClickListener clickListener;
-
-    @Setter
    @Getter
+    @Setter
    private int customizeMode;

    public TagListAdapter(List<Tag> tags, Context context) {
@ -39,8 +38,8 @@ public class TagListAdapter extends RecyclerView.Adapter<TagListAdapter.ViewHold
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
-        protected final ImageView iconView;
-        protected final TextView nameView;
+        protected ImageView iconView;
+        protected TextView nameView;
        public ViewHolder(View v) {
            super(v);
            iconView = v.findViewById(R.id.tag_action);
--- a/app/src/main/java/io/lbry/browser/adapter/TransactionListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/TransactionListAdapter.java
@ -26,8 +26,8 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionList
    private static final DecimalFormat TX_LIST_AMOUNT_FORMAT = new DecimalFormat("#,##0.0000");
    private static final SimpleDateFormat TX_LIST_DATE_FORMAT = new SimpleDateFormat("MMM d");

-    private final Context context;
-    private final List<Transaction> items;
+    private Context context;
+    private List<Transaction> items;
    @Setter
    private TransactionClickListener listener;

@ -107,14 +107,14 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionList
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
-        protected final TextView descView;
-        protected final TextView amountView;
-        protected final TextView claimView;
-        protected final TextView feeView;
-        protected final TextView txidLinkView;
-        protected final TextView dateView;
-        protected final TextView pendingView;
-        protected final View infoFeeContainer;
+        protected TextView descView;
+        protected TextView amountView;
+        protected TextView claimView;
+        protected TextView feeView;
+        protected TextView txidLinkView;
+        protected TextView dateView;
+        protected TextView pendingView;
+        protected View infoFeeContainer;

        public ViewHolder(View v) {
            super(v);
--- a/app/src/main/java/io/lbry/browser/adapter/UrlSuggestionListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/UrlSuggestionListAdapter.java
@ -21,8 +21,8 @@ import io.lbry.browser.utils.LbryUri;
 import lombok.Setter;

 public class UrlSuggestionListAdapter extends RecyclerView.Adapter<UrlSuggestionListAdapter.ViewHolder> {
-    private final Context context;
-    private final List<UrlSuggestion> items;
+    private Context context;
+    private List<UrlSuggestion> items;
    @Setter
    private UrlSuggestionClickListener listener;

@ -130,9 +130,9 @@ public class UrlSuggestionListAdapter extends RecyclerView.Adapter<UrlSuggestion
    }

    public static class ViewHolder extends RecyclerView.ViewHolder {
-        protected final SolidIconView iconView;
-        protected final TextView titleView;
-        protected final TextView descView;
+        protected SolidIconView iconView;
+        protected TextView titleView;
+        protected TextView descView;
        public ViewHolder(View v) {
            super(v);
            iconView = v.findViewById(R.id.url_suggestion_icon);
--- a/app/src/main/java/io/lbry/browser/adapter/VerificationPagerAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/VerificationPagerAdapter.java
@ -25,7 +25,7 @@ public class VerificationPagerAdapter extends FragmentStateAdapter {
    public static final int PAGE_VERIFICATION_WALLET = 2;
    public static final int PAGE_VERIFICATION_MANUAL = 3;

-    private final FragmentActivity activity;
+    private FragmentActivity activity;

    public VerificationPagerAdapter(FragmentActivity activity) {
        super(activity);
--- a/app/src/main/java/io/lbry/browser/adapter/WalletDetailAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/WalletDetailAdapter.java
@ -1,100 +0,0 @@
-package io.lbry.browser.adapter;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageButton;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AlertDialog;
-
-import java.util.List;
-
-import io.lbry.browser.MainActivity;
-import io.lbry.browser.R;
-import io.lbry.browser.model.WalletDetailItem;
-import io.lbry.browser.utils.Helper;
-import io.lbry.browser.views.CreditsBalanceView;
-
-public class WalletDetailAdapter extends BaseAdapter {
-    private final List<WalletDetailItem> list;
-    private final LayoutInflater inflater;
-
-    public WalletDetailAdapter(Context ctx, List<WalletDetailItem> rows) {
-        this.list = rows;
-        this.inflater = LayoutInflater.from(ctx);
-    }
-    @Override
-    public int getCount() {
-        return list.size();
-    }
-
-    @Override
-    public Object getItem(int i) {
-        return list.get(i);
-    }
-
-    @Override
-    public long getItemId(int i) {
-        return i;
-    }
-
-    @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
-        if (view == null) {
-            view = inflater.inflate(R.layout.list_item_boosting_balance, viewGroup, false);
-
-            CreditsBalanceView balanceView = view.findViewById(R.id.wallet_supporting_balance);
-            TextView detailTextView = view.findViewById(R.id.detail);
-            TextView detailExplanationTextView = view.findViewById(R.id.detail_explanation);
-
-            WalletDetailItem item = (WalletDetailItem) getItem(i);
-
-            detailTextView.setText(item.detail);
-            detailExplanationTextView.setText(item.detailDesc);
-
-            Helper.setViewText(balanceView, item.detailAmount);
-
-            ProgressBar progressUnlockTips = view.findViewById(R.id.wallet_unlock_tips_progress);
-            progressUnlockTips.setVisibility(item.isInProgress ? View.VISIBLE : View.GONE);
-
-            ImageButton buttonLock = view.findViewById(R.id.lock_button);
-            buttonLock.setVisibility((item.isUnlockable && !item.isInProgress) ? View.VISIBLE : View.GONE);
-
-            if (item.isUnlockable) {
-                buttonLock.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        if (view.getContext() != null) {
-                            AlertDialog.Builder builder = new AlertDialog.Builder(view.getContext()).
-                                    setTitle(R.string.unlock_tips).
-                                    setMessage(R.string.confirm_unlock_tips)
-                                    .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialogInterface, int i) {
-                                            unlockTips(view);
-                                        }
-                                    }).setNegativeButton(R.string.no, null);
-                            builder.show();
-                        }
-                    }
-                });
-            }
-        }
-        return view;
-    }
-
-    private void unlockTips(View v) {
-        Context ctx = v.getContext();
-        if (ctx instanceof MainActivity) {
-            v.setVisibility(View.GONE);
-            View progress = v.getRootView().findViewById(R.id.wallet_unlock_tips_progress);
-            progress.setVisibility(View.VISIBLE);
-            ((MainActivity) ctx).unlockTips();
-        }
-    }
-}
--- a/app/src/main/java/io/lbry/browser/data/DatabaseHelper.java
+++ b/app/src/main/java/io/lbry/browser/data/DatabaseHelper.java
@ -21,13 +21,13 @@ import io.lbry.browser.utils.Helper;
 import io.lbry.browser.utils.LbryUri;

 public class DatabaseHelper extends SQLiteOpenHelper {
-    public static final int DATABASE_VERSION = 8;
+    public static final int DATABASE_VERSION = 6;
    public static final String DATABASE_NAME = "LbryApp.db";
    private static DatabaseHelper instance;

    private static final String[] SQL_CREATE_TABLES = {
            // local subscription store
-            "CREATE TABLE subscriptions (url TEXT PRIMARY KEY NOT NULL, channel_name TEXT NOT NULL, is_notifications_disabled INTEGER DEFAULT 0 NOT NULL)",
+            "CREATE TABLE subscriptions (url TEXT PRIMARY KEY NOT NULL, channel_name TEXT NOT NULL)",
            // url entry / suggestion history
            "CREATE TABLE url_history (id INTEGER PRIMARY KEY NOT NULL, value TEXT NOT NULL, url TEXT, type INTEGER NOT NULL, timestamp TEXT NOT NULL)",
            // tags (known and followed)
@ -60,7 +60,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                    ", is_read INTEGER DEFAULT 0 NOT NULL" +
                    ", is_seen INTEGER DEFAULT 0 NOT NULL " +
                    ", timestamp TEXT NOT NULL)",
-            "CREATE TABLE shuffle_watched (id INTEGER PRIMARY KEY NOT NULL, claim_id TEXT NOT NULL)"
    };
    private static final String[] SQL_CREATE_INDEXES = {
            "CREATE UNIQUE INDEX idx_subscription_url ON subscriptions (url)",
@ -70,8 +69,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
            "CREATE UNIQUE INDEX idx_view_history_url_device ON view_history (url, device)",
            "CREATE INDEX idx_view_history_device ON view_history (device)",
            "CREATE UNIQUE INDEX idx_notification_remote_id ON notifications (remote_id)",
-            "CREATE INDEX idx_notification_timestamp ON notifications (timestamp)",
-            "CREATE UNIQUE INDEX idx_shuffle_watched_claim ON shuffle_watched (claim_id)",
+            "CREATE INDEX idx_notification_timestamp ON notifications (timestamp)"
    };

    private static final String[] SQL_V1_V2_UPGRADE = {
@ -101,19 +99,11 @@ public class DatabaseHelper extends SQLiteOpenHelper {
    private static final String[] SQL_V5_V6_UPGRADE = {
            "ALTER TABLE notifications ADD COLUMN author_url TEXT"
    };
-    private static final String[] SQL_V6_V7_UPGRADE = {
-            "CREATE TABLE shuffle_watched (id INTEGER PRIMARY KEY NOT NULL, claim_id TEXT NOT NULL)",
-            "CREATE UNIQUE INDEX idx_shuffle_watched_claim ON shuffle_watched (claim_id)"
-    };
-    private static final String[] SQL_V7_V8_UPGRADE = {
-            "AlTER TABLE subscriptions ADD COLUMN is_notifications_disabled INTEGER DEFAULT 0 NOT NULL"
-    };

-    private static final String SQL_INSERT_SUBSCRIPTION = "REPLACE INTO subscriptions (channel_name, url, is_notifications_disabled) VALUES (?, ?, ?)";
-    private static final String SQL_UPDATE_SUBSCRIPTION_NOTIFICATION = "UPDATE subscriptions SET is_notification_disabled = ? WHERE url = ?";
+    private static final String SQL_INSERT_SUBSCRIPTION = "REPLACE INTO subscriptions (channel_name, url) VALUES (?, ?)";
    private static final String SQL_CLEAR_SUBSCRIPTIONS = "DELETE FROM subscriptions";
    private static final String SQL_DELETE_SUBSCRIPTION = "DELETE FROM subscriptions WHERE url = ?";
-    private static final String SQL_GET_SUBSCRIPTIONS = "SELECT channel_name, url, is_notifications_disabled FROM subscriptions";
+    private static final String SQL_GET_SUBSCRIPTIONS = "SELECT channel_name, url FROM subscriptions";

    private static final String SQL_INSERT_URL_HISTORY = "REPLACE INTO url_history (value, url, type, timestamp) VALUES (?, ?, ?, ?)";
    private static final String SQL_CLEAR_URL_HISTORY = "DELETE FROM url_history";
@ -123,14 +113,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
    private static final String SQL_INSERT_NOTIFICATION = "REPLACE INTO notifications (remote_id, author_url, title, description, rule, target_url, is_read, is_seen, timestamp) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
    private static final String SQL_GET_NOTIFICATIONS = "SELECT id, remote_id, author_url, title, description, rule, target_url, is_read, is_seen, timestamp FROM notifications ORDER BY timestamp DESC LIMIT 500";
    private static final String SQL_GET_UNREAD_NOTIFICATIONS_COUNT = "SELECT COUNT(id) FROM notifications WHERE is_read <> 1";
-    private static final String SQL_GET_UNSEEN_NOTIFICATIONS_COUNT = "SELECT COUNT(id) FROM notifications WHERE is_seen <> 1";
    private static final String SQL_MARK_NOTIFICATIONS_READ = "UPDATE notifications SET is_read = 1 WHERE is_read = 0";
-    private static final String SQL_MARK_NOTIFICATIONS_SEEN = "UPDATE notifications SET is_seen = 1 WHERE is_seen = 0";
    private static final String SQL_MARK_NOTIFICATION_READ_AND_SEEN = "UPDATE notifications SET is_read = 1, is_seen = 1 WHERE id = ?";

-    private static final String SQL_INSERT_SHUFFLE_WATCHED = "REPLACE INTO shuffle_watched (claim_id) VALUES (?)";
-    private static final String SQL_GET_SHUFFLE_WATCHED_CLAIMS = "SELECT claim_id FROM shuffle_watched";
-
    private static final String SQL_INSERT_VIEW_HISTORY =
            "REPLACE INTO view_history (url, claim_id, claim_name, cost, currency, title, publisher_claim_id, publisher_name, publisher_title, thumbnail_url, device, release_time, timestamp) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
    private static final String SQL_GET_VIEW_HISTORY =
@ -189,16 +174,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                db.execSQL(sql);
            }
        }
-        if (oldVersion < 7) {
-            for (String sql : SQL_V6_V7_UPGRADE) {
-                db.execSQL(sql);
-            }
-        }
-        if (oldVersion < 8) {
-            for (String sql : SQL_V7_V8_UPGRADE) {
-                db.execSQL(sql);
-            }
-        }
    }
    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {

@ -215,7 +190,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
    public static void clearUrlHistoryBefore(Date date, SQLiteDatabase db) {
        db.execSQL(SQL_CLEAR_URL_HISTORY_BEFORE_TIME, new Object[] { new SimpleDateFormat(Helper.ISO_DATE_FORMAT_PATTERN).format(new Date()) });
    }
-
    // History items are essentially url suggestions
    public static List<UrlSuggestion> getRecentHistory(SQLiteDatabase db) {
        List<UrlSuggestion> suggestions = new ArrayList<>();
@ -315,14 +289,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
    }

    public static void createOrUpdateSubscription(Subscription subscription, SQLiteDatabase db) {
-        db.execSQL(SQL_INSERT_SUBSCRIPTION, new Object[] {
-                subscription.getChannelName(),
-                subscription.getUrl(),
-                subscription.isNotificationsDisabled() ? 1 : 0
-        });
-    }
-    public static void setSubscriptionNotificationDisabled(boolean flag, String url, SQLiteDatabase db) {
-        db.execSQL(SQL_UPDATE_SUBSCRIPTION_NOTIFICATION, new Object[] { flag ? 1 : 0, url });
+        db.execSQL(SQL_INSERT_SUBSCRIPTION, new Object[] { subscription.getChannelName(), subscription.getUrl() });
    }
    public static void deleteSubscription(Subscription subscription, SQLiteDatabase db) {
        db.execSQL(SQL_DELETE_SUBSCRIPTION, new Object[] { subscription.getUrl() });
@ -339,7 +306,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                Subscription subscription = new Subscription();
                subscription.setChannelName(cursor.getString(0));
                subscription.setUrl(cursor.getString(1));
-                subscription.setNotificationsDisabled(cursor.getInt(2) == 1);
                subscriptions.add(subscription);
            }
        } finally {
@ -391,20 +357,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
        }
        return notifications;
    }
-    public static void deleteNotifications(List<LbryNotification> notifications, SQLiteDatabase db) {
-        StringBuilder sb = new StringBuilder("DELETE FROM notifications WHERE remote_id IN (");
-        List<Object> remoteIds = new ArrayList<>();
-        String delim = "";
-        for (int i = 0; i < notifications.size(); i++) {
-            remoteIds.add(String.valueOf(notifications.get(i).getRemoteId()));
-            sb.append(delim).append("?");
-            delim = ",";
-        }
-        sb.append(")");
-
-        String sql = sb.toString();
-        db.execSQL(sql, remoteIds.toArray());
-    }
    public static int getUnreadNotificationsCount(SQLiteDatabase db) {
        int count = 0;
        Cursor cursor = null;
@ -418,42 +370,10 @@ public class DatabaseHelper extends SQLiteOpenHelper {
        }
        return count;
    }
-    public static int getUnseenNotificationsCount(SQLiteDatabase db) {
-        int count = 0;
-        Cursor cursor = null;
-        try {
-            cursor = db.rawQuery(SQL_GET_UNSEEN_NOTIFICATIONS_COUNT, null);
-            if (cursor.moveToNext()) {
-                count = cursor.getInt(0);
-            }
-        } finally {
-            Helper.closeCursor(cursor);
-        }
-        return count;
-    }
-    public static void markNotificationsSeen(SQLiteDatabase db) {
-        db.execSQL(SQL_MARK_NOTIFICATIONS_SEEN);
-    }
    public static void markNotificationsRead(SQLiteDatabase db) {
        db.execSQL(SQL_MARK_NOTIFICATIONS_READ);
    }
    public static void markNotificationReadAndSeen(long notificationId, SQLiteDatabase db) {
        db.execSQL(SQL_MARK_NOTIFICATION_READ_AND_SEEN, new Object[] { notificationId });
    }
-    public static void createOrUpdateShuffleWatched(String claimId, SQLiteDatabase db) {
-        db.execSQL(SQL_INSERT_SHUFFLE_WATCHED, new Object[] { claimId });
-    }
-    public static List<String> getShuffleWatchedClaims(SQLiteDatabase db) {
-        List<String> claimIds = new ArrayList<>();
-        Cursor cursor = null;
-        try {
-            cursor = db.rawQuery(SQL_GET_SHUFFLE_WATCHED_CLAIMS, null);
-            while (cursor.moveToNext()) {
-                claimIds.add(cursor.getString(0));
-            }
-        } finally {
-            Helper.closeCursor(cursor);
-        }
-        return claimIds;
-    }
 }
--- a/app/src/main/java/io/lbry/browser/dialog/ContentFromDialogFragment.java
+++ b/app/src/main/java/io/lbry/browser/dialog/ContentFromDialogFragment.java
@ -67,8 +67,8 @@ public class ContentFromDialogFragment extends BottomSheetDialogFragment {
                R.id.content_from_past_year_item,
                R.id.content_from_all_time_item
        };
-        private final BottomSheetDialogFragment dialog;
-        private final ContentFromListener listener;
+        private BottomSheetDialogFragment dialog;
+        private ContentFromListener listener;

        public ContentFromItemClickListener(BottomSheetDialogFragment dialog, ContentFromListener listener) {
            this.dialog = dialog;
--- a/app/src/main/java/io/lbry/browser/dialog/ContentScopeDialogFragment.java
+++ b/app/src/main/java/io/lbry/browser/dialog/ContentScopeDialogFragment.java
@ -54,8 +54,8 @@ public class ContentScopeDialogFragment extends BottomSheetDialogFragment {
        private final int[] checkViewIds = {
                R.id.content_scope_everyone_item_selected, R.id.content_scope_tags_item_selected
        };
-        private final BottomSheetDialogFragment dialog;
-        private final ContentScopeListener listener;
+        private BottomSheetDialogFragment dialog;
+        private ContentScopeListener listener;

        public ContentScopeItemClickListener(BottomSheetDialogFragment dialog, ContentScopeListener listener) {
            this.dialog = dialog;
--- a/app/src/main/java/io/lbry/browser/dialog/ContentSortDialogFragment.java
+++ b/app/src/main/java/io/lbry/browser/dialog/ContentSortDialogFragment.java
@ -57,8 +57,8 @@ public class ContentSortDialogFragment extends BottomSheetDialogFragment {
        private final int[] checkViewIds = {
                R.id.sort_by_trending_item_selected, R.id.sort_by_new_item_selected, R.id.sort_by_top_item_selected
        };
-        private final BottomSheetDialogFragment dialog;
-        private final SortByListener listener;
+        private BottomSheetDialogFragment dialog;
+        private SortByListener listener;

        public SortByItemClickListener(BottomSheetDialogFragment dialog, SortByListener listener) {
            this.dialog = dialog;
--- a/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java
+++ b/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java
@ -13,6 +13,7 @@ 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;
@ -40,6 +41,7 @@ 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";
@ -59,17 +61,13 @@ public class CreateSupportDialogFragment extends BottomSheetDialogFragment imple
    private ProgressBar progressLoadingChannels;


-    private final CreateSupportListener listener;
-    private final Claim claim;
+    @Setter
+    private CreateSupportListener listener;
+    @Setter
+    private Claim claim;

-    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);
+    public static CreateSupportDialogFragment newInstance() {
+        return new CreateSupportDialogFragment();
    }

    private void disableControls() {
@ -227,10 +225,9 @@ public class CreateSupportDialogFragment extends BottomSheetDialogFragment imple
        if (!isTip) {
            sendButton.setText(R.string.send_revocable_support);
        } else {
-            String amountString = Helper.getValue(inputAmount.getText(), "0");
+            String amountString = Helper.getValue(inputAmount.getText());
            double parsedAmount = Helper.parseDouble(amountString, 0);
-            String text = getResources().getQuantityString(R.plurals.send_lbc_tip, parsedAmount == 1.0 ? 1 : 2, amountString);
-            sendButton.setText(text);
+            sendButton.setText(parsedAmount == 0 ? getString(R.string.send_a_tip) : getString(R.string.send_lbc_tip, amountString));
        }
    }

--- a/app/src/main/java/io/lbry/browser/dialog/CustomizeTagsDialogFragment.java
+++ b/app/src/main/java/io/lbry/browser/dialog/CustomizeTagsDialogFragment.java
@ -142,7 +142,7 @@ public class CustomizeTagsDialogFragment extends BottomSheetDialogFragment {
        return view;
    }

-    private final TagListAdapter.TagClickListener customizeTagClickListener = new TagListAdapter.TagClickListener() {
+    private TagListAdapter.TagClickListener customizeTagClickListener = new TagListAdapter.TagClickListener() {
        @Override
        public void onTagClicked(Tag tag, int customizeMode) {
            if (customizeMode == TagListAdapter.CUSTOMIZE_MODE_ADD) {
--- a/app/src/main/java/io/lbry/browser/dialog/DiscoverDialogFragment.java
+++ b/app/src/main/java/io/lbry/browser/dialog/DiscoverDialogFragment.java
@ -5,6 +5,7 @@ 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;
--- a/app/src/main/java/io/lbry/browser/dialog/RepostClaimDialogFragment.java
+++ b/app/src/main/java/io/lbry/browser/dialog/RepostClaimDialogFragment.java
@ -37,6 +37,7 @@ 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";
@ -56,17 +57,13 @@ public class RepostClaimDialogFragment extends BottomSheetDialogFragment impleme
    private TextView linkToggleAdvanced;
    private View advancedContainer;

-    private final RepostClaimListener listener;
-    private final Claim claim;
+    @Setter
+    private RepostClaimListener listener;
+    @Setter
+    private Claim claim;

-    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);
+    public static RepostClaimDialogFragment newInstance() {
+        return new RepostClaimDialogFragment();
    }

    @Override
--- a/app/src/main/java/io/lbry/browser/model/Claim.java
+++ b/app/src/main/java/io/lbry/browser/model/Claim.java
@ -1,7 +1,5 @@
 package io.lbry.browser.model;

-import androidx.annotation.Nullable;
-
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@ -17,6 +15,7 @@ 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;
@ -139,14 +138,6 @@ public class Claim {
        return null;
    }

-    public boolean hasSource() {
-        if (value instanceof StreamMetadata) {
-            StreamMetadata metadata = (StreamMetadata) value;
-            return metadata.getSource() != null;
-        }
-        return false;
-    }
-
    public boolean isPlayable() {
        if (value instanceof StreamMetadata) {
            StreamMetadata metadata = (StreamMetadata) value;
@ -186,21 +177,6 @@ public class Claim {
        return null;
    }

-    /**
-     * Gets the URL from the CDN where getting the image file
-     * @param width Pass zero for width and height for the full size image file
-     * @param height Pass zero for width and height for the full size image file
-     * @param q Desired quality for the image to be retrieved
-     * @return URL from the CDN from where image can be retrieved
-     */
-    public String getThumbnailUrl(int width, int height, int q) {
-        if (value != null && value.getThumbnail() != null) {
-            ImageCDNUrl imageCDNUrl = new ImageCDNUrl(Math.max(width, 0), Math.max(height, 0), q, null, value.getThumbnail().getUrl());
-            return imageCDNUrl.toString();
-        }
-        return null;
-    }
-
    public String getCoverUrl() {
        if (TYPE_CHANNEL.equals(valueType) && value != null && value instanceof ChannelMetadata && ((ChannelMetadata) value).getCover() != null) {
            return ((ChannelMetadata) value).getCover().getUrl();
@ -508,30 +484,6 @@ public class Claim {
        private String url;
    }

-    /**
-     * Object to be instantiated. In order to get the URLto the CDN, call toString() on it
-     */
-    static class ImageCDNUrl {
-        private String appendedPath = "";
-
-        public ImageCDNUrl(int width, int height, int quality, @Nullable String format, String thumbnailUrl) {
-            if (width != 0 && height != 0)
-                appendedPath = "s:".concat(String.valueOf(width)).concat(":").concat(String.valueOf(height)).concat("/");
-
-            appendedPath = appendedPath.concat("quality:").concat(String.valueOf(quality)).concat("/");
-
-            appendedPath = appendedPath.concat("plain/").concat(thumbnailUrl);
-
-            if (format != null)
-                appendedPath = appendedPath.concat("@").concat(format);
-        }
-
-        @Override
-        public String toString() {
-            String url = "https://image-processor.vanwanet.com/optimize/";
-            return url.concat(appendedPath);
-        }
-    }
    @Data
    public static class StreamInfo {
        private long duration; // video / audio
--- 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 instanceof ClaimCacheKey)) {
+        if (obj == null || !(obj instanceof ClaimCacheKey)) {
            return false;
        }
        ClaimCacheKey key = (ClaimCacheKey) obj;
--- a/app/src/main/java/io/lbry/browser/model/ClaimSearchCacheValue.java
+++ b/app/src/main/java/io/lbry/browser/model/ClaimSearchCacheValue.java
@ -1,15 +1,19 @@
 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
-    private final List<Claim> claims;
+    @Setter
+    private List<Claim> claims;
    @Getter
-    private final long timestamp;
+    @Setter
+    private long timestamp;

    public ClaimSearchCacheValue(List<Claim> claims, long timestamp) {
        this.claims = new ArrayList<>(claims);
--- a/app/src/main/java/io/lbry/browser/model/Comment.java
+++ b/app/src/main/java/io/lbry/browser/model/Comment.java
@ -3,6 +3,7 @@ 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;

@ -10,7 +11,8 @@ import io.lbry.browser.utils.Helper;
 import lombok.Data;

@Data
-public class Comment implements Comparable<Comment> {
+public class Comment {
+    public static final double LBC_COST = 1;
    public static final int MAX_LENGTH = 2000;

    private Claim poster;
@ -64,9 +66,4 @@ public class Comment implements Comparable<Comment> {
            return null;
        }
    }
-
-    @Override
-    public int compareTo(Comment comment) {
-        return (int)(this.getTimestamp() - comment.getTimestamp());
-    }
 }
--- 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 final String code;
-    private final String name;
-    private final int stringResourceId;
+    private String code;
+    private String name;
+    private int stringResourceId;

    public Language(String code, String name, int stringResourceId) {
        this.code = code;
--- 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 final String name;
+    private String name;
    private String url;
-    private final int stringResourceId;
+    private int stringResourceId;

    public License(String name, int stringResourceId) {
        this.name = name;
--- a/app/src/main/java/io/lbry/browser/model/NavMenuItem.java
+++ b/app/src/main/java/io/lbry/browser/model/NavMenuItem.java
@ -2,6 +2,8 @@ package io.lbry.browser.model;

 import android.content.Context;

+import androidx.core.content.res.ResourcesCompat;
+
 import java.util.ArrayList;
 import java.util.List;

@ -18,7 +20,6 @@ public class NavMenuItem {
    public static final int ID_ITEM_FOLLOWING = 101;
    public static final int ID_ITEM_EDITORS_CHOICE = 102;
    public static final int ID_ITEM_ALL_CONTENT = 103;
-    public static final int ID_ITEM_SHUFFLE = 104;

    // Your Content
    public static final int ID_ITEM_CHANNELS = 201;
@ -35,8 +36,8 @@ public class NavMenuItem {
    public static final int ID_ITEM_SETTINGS = 401;
    public static final int ID_ITEM_ABOUT = 402;

-    private final Context context;
-    private final int id;
+    private Context context;
+    private int id;
    private boolean group;
    private int icon;
    private String title;
--- a/app/src/main/java/io/lbry/browser/model/StartupStage.java
+++ b/app/src/main/java/io/lbry/browser/model/StartupStage.java
@ -1,11 +0,0 @@
-package io.lbry.browser.model;
-
-public class StartupStage {
-    public final Integer stage;
-    public final Boolean stageDone;
-
-    public StartupStage(Integer stage, Boolean stageDone) {
-        this.stage = stage;
-        this.stageDone = stageDone;
-    }
-}
--- a/app/src/main/java/io/lbry/browser/model/ViewHistory.java
+++ b/app/src/main/java/io/lbry/browser/model/ViewHistory.java
@ -3,7 +3,9 @@ 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
--- a/app/src/main/java/io/lbry/browser/model/WalletBalance.java
+++ b/app/src/main/java/io/lbry/browser/model/WalletBalance.java
@ -6,28 +6,14 @@ 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() {
--- a/app/src/main/java/io/lbry/browser/model/WalletDetailItem.java
+++ b/app/src/main/java/io/lbry/browser/model/WalletDetailItem.java
@ -1,17 +0,0 @@
-package io.lbry.browser.model;
-
-public class WalletDetailItem {
-    public String detail;
-    public String detailDesc;
-    public String detailAmount;
-    public boolean isUnlockable;
-    public boolean isInProgress;
-
-    public WalletDetailItem(String detail, String detailDesc, String detailAmount, boolean isUnlockable, boolean isInProgress) {
-        this.detail = detail;
-        this.detailDesc = detailDesc;
-        this.detailAmount = detailAmount;
-        this.isUnlockable = isUnlockable;
-        this.isInProgress = isInProgress;
-    }
-}
--- a/app/src/main/java/io/lbry/browser/model/WalletSync.java
+++ b/app/src/main/java/io/lbry/browser/model/WalletSync.java
@ -1,15 +1,11 @@
 package io.lbry.browser.model;

 import lombok.Data;
-import lombok.Getter;

@Data
 public class WalletSync {
-    @Getter
-    private final String hash;
-    @Getter
-    private final String data;
-    @Getter
+    private String hash;
+    private String data;
    private boolean changed;

    public WalletSync(String hash, String data) {
@ -21,5 +17,4 @@ public class WalletSync {
        this(hash, data);
        this.changed = changed;
    }
-
 }
--- 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,6 +9,7 @@ import org.json.JSONObject;

 import java.lang.reflect.Type;

+import io.lbry.browser.model.Claim;
 import io.lbry.browser.utils.Helper;
 import lombok.Data;

--- a/app/src/main/java/io/lbry/browser/model/lbryinc/Subscription.java
+++ b/app/src/main/java/io/lbry/browser/model/lbryinc/Subscription.java
@ -11,21 +11,17 @@ public class Subscription {
    @Getter
    @Setter
    private String url;
-    @Getter
-    @Setter
-    private boolean isNotificationsDisabled;

    public Subscription() {

    }
-    public Subscription(String channelName, String url, boolean isNotificationsDisabled) {
+    public Subscription(String channelName, String url) {
        this.channelName = channelName;
        this.url = url;
-        this.isNotificationsDisabled = isNotificationsDisabled;
    }

    public static Subscription fromClaim(Claim claim) {
-        return new Subscription(claim.getName(), claim.getPermanentUrl(), false);
+        return new Subscription(claim.getName(), claim.getPermanentUrl());
    }
    public String toString() {
        return url;
--- a/app/src/main/java/io/lbry/browser/tasks/BufferEventTask.java
+++ b/app/src/main/java/io/lbry/browser/tasks/BufferEventTask.java
@ -12,17 +12,16 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import okhttp3.ResponseBody;

 public class BufferEventTask extends AsyncTask<Void, Void, Void> {
    private static final String TAG = "LbryBufferEvent";
    private static final String ENDPOINT = "https://collector-service.api.lbry.tv/api/v1/events/video";

-    private final String streamUrl;
-    private final String userIdHash;
-    private final long streamDuration;
-    private final long streamPosition;
-    private final long bufferDuration;
+    private String streamUrl;
+    private String userIdHash;
+    private long streamDuration;
+    private long streamPosition;
+    private long bufferDuration;

    public BufferEventTask(String streamUrl, long streamDuration, long streamPosition, long bufferDuration, String userIdHash) {
        this.streamUrl = streamUrl;
@ -54,11 +53,7 @@ public class BufferEventTask extends AsyncTask<Void, Void, Void> {
                    build();

            Response response = client.newCall(request).execute();
-            ResponseBody resBody = response.body();
-            String responseString = "";
-            if (resBody != null) {
-                responseString = response.body().string();
-            }
+            String 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
--- a/app/src/main/java/io/lbry/browser/tasks/CommentCreateTask.java
+++ b/app/src/main/java/io/lbry/browser/tasks/CommentCreateTask.java
@ -1,85 +0,0 @@
-package io.lbry.browser.tasks;
-
-import android.os.AsyncTask;
-import android.view.View;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.util.Objects;
-
-import io.lbry.browser.exceptions.ApiCallException;
-import io.lbry.browser.model.Comment;
-import io.lbry.browser.utils.Comments;
-import io.lbry.browser.utils.Helper;
-import okhttp3.Response;
-
-public class CommentCreateTask extends AsyncTask<Void, Void, Comment> {
-    private final Comment comment;
-    private final View progressView;
-    private final CommentCreateWithTipHandler handler;
-    private Exception error;
-
-    public CommentCreateTask(Comment comment, View progressView, CommentCreateWithTipHandler handler) {
-        this.comment = comment;
-        this.progressView = progressView;
-        this.handler = handler;
-    }
-
-    protected void onPreExecute() {
-        Helper.setViewVisibility(progressView, View.VISIBLE);
-    }
-
-    public Comment doInBackground(Void... params) {
-        Comment createdComment = null;
-        try {
-            // check comments status endpoint
-            Comments.checkCommentsEndpointStatus();
-
-            JSONObject comment_body = new JSONObject();
-            comment_body.put("comment", comment.getText());
-            comment_body.put("claim_id", comment.getClaimId());
-            if (!Helper.isNullOrEmpty(comment.getParentId())) {
-                comment_body.put("parent_id", comment.getParentId());
-            }
-            comment_body.put("channel_id", comment.getChannelId());
-            comment_body.put("channel_name", comment.getChannelName());
-
-            JSONObject jsonChannelSign = Comments.channelSign(comment_body, comment.getChannelId(), comment.getChannelName());
-
-            if (jsonChannelSign.has("signature") && jsonChannelSign.has("signing_ts")) {
-                comment_body.put("signature", jsonChannelSign.getString("signature"));
-                comment_body.put("signing_ts", jsonChannelSign.getString("signing_ts"));
-            }
-
-            Response resp = Comments.performRequest(comment_body, "comment.Create");
-            String responseString = Objects.requireNonNull(resp.body()).string();
-            resp.close();
-            JSONObject jsonResponse = new JSONObject(responseString);
-
-            if (jsonResponse.has("result"))
-                createdComment = Comment.fromJSONObject(jsonResponse.getJSONObject("result"));
-        } catch (ApiCallException | ClassCastException | IOException | JSONException ex) {
-            error = ex;
-        }
-
-        return createdComment;
-    }
-
-    protected void onPostExecute(Comment createdComment) {
-        Helper.setViewVisibility(progressView, View.GONE);
-        if (handler != null) {
-            if (createdComment != null) {
-                handler.onSuccess(createdComment);
-            } else {
-                handler.onError(error);
-            }
-        }
-    }
-
-    public interface CommentCreateWithTipHandler {
-        void onSuccess(Comment createdComment);
-        void onError(Exception error);
-    }
-}
--- a/app/src/main/java/io/lbry/browser/tasks/CommentCreateWithTipTask.java
+++ b/app/src/main/java/io/lbry/browser/tasks/CommentCreateWithTipTask.java
@ -0,0 +1,103 @@
+package io.lbry.browser.tasks;
+
+import android.os.AsyncTask;
+import android.view.View;
+
+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;
+
+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;
+
+public class CommentCreateWithTipTask extends AsyncTask<Void, Void, Comment> {
+    private static final String STATUS_ENDPOINT = "https://comments.lbry.com";
+
+    private Comment comment;
+    private BigDecimal amount;
+    private View progressView;
+    private CommentCreateWithTipHandler handler;
+    private Exception error;
+
+    public CommentCreateWithTipTask(Comment comment, BigDecimal amount, View progressView, CommentCreateWithTipHandler handler) {
+        this.comment = comment;
+        this.amount = amount;
+        this.progressView = progressView;
+        this.handler = handler;
+    }
+
+    protected void onPreExecute() {
+        Helper.setViewVisibility(progressView, View.VISIBLE);
+    }
+
+    public Comment doInBackground(Void... params) {
+        Comment createdComment = null;
+        try {
+            // check comments status endpoint
+            Request request = new Request.Builder().url(STATUS_ENDPOINT).build();
+            OkHttpClient client = new OkHttpClient.Builder().
+                    writeTimeout(30, TimeUnit.SECONDS).
+                    readTimeout(30, TimeUnit.SECONDS).
+                    build();
+            Response response = client.newCall(request).execute();
+            JSONObject status = new JSONObject(response.body().string());
+            String statusText = Helper.getJSONString("text", null, status);
+            boolean isRunning = Helper.getJSONBoolean("is_running", false, status);
+            if (!"ok".equalsIgnoreCase(statusText) || !isRunning) {
+                throw new ApiCallException("The comment server is not available at this time. Please try again later.");
+            }
+
+            Map<String, Object> options = new HashMap<>();
+            options.put("blocking", true);
+            options.put("claim_id", comment.getClaimId());
+            options.put("amount", new DecimalFormat(Helper.SDK_AMOUNT_FORMAT, new DecimalFormatSymbols(Locale.US)).format(amount.doubleValue()));
+            options.put("tip", true);
+            Lbry.genericApiCall(Lbry.METHOD_SUPPORT_CREATE, options);
+
+            options = new HashMap<>();
+            options.put("comment", comment.getText());
+            options.put("claim_id", comment.getClaimId());
+            options.put("channel_id", comment.getChannelId());
+            options.put("channel_name", comment.getChannelName());
+            if (!Helper.isNullOrEmpty(comment.getParentId())) {
+                options.put("parent_id", comment.getParentId());
+            }
+            JSONObject jsonObject = (JSONObject) Lbry.genericApiCall(Lbry.METHOD_COMMENT_CREATE, options);
+            createdComment = Comment.fromJSONObject(jsonObject);
+        } catch (ApiCallException | ClassCastException | IOException | JSONException ex) {
+            error = ex;
+        }
+
+        return createdComment;
+    }
+
+    protected void onPostExecute(Comment createdComment) {
+        Helper.setViewVisibility(progressView, View.GONE);
+        if (handler != null) {
+            if (createdComment != null) {
+                handler.onSuccess(createdComment);
+            } else {
+                handler.onError(error);
+            }
+        }
+    }
+
+    public interface CommentCreateWithTipHandler {
+        void onSuccess(Comment createdComment);
+        void onError(Exception error);
+    }
+}
--- a/app/src/main/java/io/lbry/browser/tasks/CommentListTask.java
+++ b/app/src/main/java/io/lbry/browser/tasks/CommentListTask.java
@ -8,13 +8,11 @@ import org.json.JSONArray;
 import org.json.JSONObject;

 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

 import io.lbry.browser.model.Comment;
-import io.lbry.browser.utils.Comments;
 import io.lbry.browser.utils.Helper;
 import io.lbry.browser.utils.Lbry;

@ -22,8 +20,8 @@ public class CommentListTask extends AsyncTask<Void, Void, List<Comment>> {
    private final int page;
    private final int pageSize;
    private final String claim;
-    private final ProgressBar progressBar;
-    private final CommentListHandler handler;
+    private ProgressBar progressBar;
+    private CommentListHandler handler;
    private Exception error;

    public CommentListTask(int page, int pageSize, String claim, ProgressBar progressBar, CommentListHandler handler) {
@ -53,7 +51,8 @@ public class CommentListTask extends AsyncTask<Void, Void, List<Comment>> {
            options.put("skip_validation", true);
            options.put("visible", true);

-            JSONObject result = (JSONObject) Lbry.parseResponse(Comments.performRequest(Lbry.buildJsonParams(options), "comment.List"));
+
+            JSONObject result = (JSONObject) Lbry.genericApiCall(Lbry.METHOD_COMMENT_LIST, options);
            JSONArray items = result.getJSONArray("items");

            List<Comment> children = new ArrayList<>();
@ -69,9 +68,6 @@ public class CommentListTask extends AsyncTask<Void, Void, List<Comment>> {
                }
            }

-            // Sort all replies from oldest to newest at once
-            Collections.sort(children);
-
            for (Comment child : children) {
                for (Comment parent : comments) {
                    if (parent.getId().equalsIgnoreCase(child.getParentId())) {
--- 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<Void, Void, Boolean> {
-    private final Tag tag;
-    private final boolean unfollowing;
-    private final Context context;
-    private final FollowUnfollowTagHandler handler;
+    private Tag tag;
+    private boolean unfollowing;
+    private Context context;
+    private FollowUnfollowTagHandler handler;
    private Exception error;

    public FollowUnfollowTagTask(Tag tag, boolean unfollowing, Context context, FollowUnfollowTagHandler handler) {
--- 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<Void, Void, List<UrlSuggestion>> {
-    private final String text;
-    private final AutoCompleteResultHandler handler;
-    private final View progressView;
+    private String text;
+    private AutoCompleteResultHandler handler;
+    private View progressView;
    private Exception error;

    public LighthouseAutoCompleteTask(String text, View progressView, AutoCompleteResultHandler handler) {
--- 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<Void, Void, List<Claim>> {
-    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 String rawQuery;
+    private int size;
+    private int from;
+    private boolean nsfw;
+    private String relatedTo;
+    private ClaimSearchResultHandler handler;
+    private ProgressBar progressBar;
    private Exception error;

    public LighthouseSearchTask(String rawQuery, int size, int from, boolean nsfw, String relatedTo, ProgressBar progressBar, ClaimSearchResultHandler handler) {
--- a/app/src/main/java/io/lbry/browser/tasks/LoadTagsTask.java
+++ b/app/src/main/java/io/lbry/browser/tasks/LoadTagsTask.java
@ -4,16 +4,22 @@ 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<Void, Void, List<Tag>> {
-    private final Context context;
-    private final LoadTagsHandler handler;
+    private Context context;
+    private LoadTagsHandler handler;
    private Exception error;

    public LoadTagsTask(Context context, LoadTagsHandler handler) {
--- a/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java
+++ b/app/src/main/java/io/lbry/browser/tasks/MergeSubscriptionsTask.java
@ -4,6 +4,7 @@ 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;
@ -16,21 +17,24 @@ 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<Void, Void, List<Subscription>> {
    private static final String TAG = "MergeSubscriptionsTask";
-    private final Context context;
-    private final List<Subscription> base;
+    private Context context;
+    private List<Subscription> base;
    private List<Subscription> diff;
-    private final MergeSubscriptionsHandler handler;
+    private MergeSubscriptionsHandler handler;
    private Exception error;
-    private final boolean replaceLocal;
+    private boolean replaceLocal;

    public MergeSubscriptionsTask(List<Subscription> base, boolean replaceLocal, Context context, MergeSubscriptionsHandler handler) {
        this.base = base;
@ -72,15 +76,13 @@ public class MergeSubscriptionsTask extends AsyncTask<Void, Void, List<Subscript
                // check for any remote subs that may have been removed, and unsubscribe from them
                for (int i = 0; i < array.length(); i++) {
                    JSONObject item = array.getJSONObject(i);
-                    // TODO: Refactor by creating static Subscription.fromJSON method
                    String claimId = item.getString("claim_id");
                    String channelName = item.getString("channel_name");
-                    boolean isNotificationsDisabled  = item.getBoolean("is_notifications_disabled");

                    LbryUri url = new LbryUri();
                    url.setChannelName(channelName);
                    url.setClaimId(claimId);
-                    Subscription subscription = new Subscription(channelName, url.toString(), isNotificationsDisabled);
+                    Subscription subscription = new Subscription(channelName, url.toString());
                    remoteSubs.add(subscription);
                }
            }
--- a/app/src/main/java/io/lbry/browser/tasks/ReadTextFileTask.java
+++ b/app/src/main/java/io/lbry/browser/tasks/ReadTextFileTask.java
@ -4,15 +4,18 @@ 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;

 public class ReadTextFileTask extends AsyncTask<Void, Void, String> {
-    private final String filePath;
+    private String filePath;
    private Exception error;
-    private final ReadTextFileHandler handler;
+    private ReadTextFileHandler handler;
    public ReadTextFileTask(String filePath, ReadTextFileHandler handler) {
        this.filePath = filePath;
        this.handler = handler;
--- 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<Void, Void, Boolean> {
-    private final String key;
-    private final String value;
-    private final GenericTaskHandler handler;
+    private String key;
+    private String value;
+    private GenericTaskHandler handler;
    private Exception error;
    public SetSdkSettingTask(String key, String value, GenericTaskHandler handler) {
        this.key = key;
--- 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<Void, Void, List<Tag>> {

-    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;
+    private boolean clearPrevious;
+    private boolean excludeMature;
+    private int limit;
+    private String filter;
+    private TagListAdapter addedTagsAdapter;
+    private TagListAdapter suggestedTagsAdapter;
+    private KnownTagsHandler handler;

    public UpdateSuggestedTagsTask(
            String filter,
--- 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<Void, Void, String> {
-    private final String filePath;
-    private final View progressView;
-    private final UploadThumbnailHandler handler;
+    private String filePath;
+    private View progressView;
+    private UploadThumbnailHandler handler;
    private Exception error;

    public UploadImageTask(String filePath, View progressView, UploadThumbnailHandler handler) {
--- 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,16 +11,17 @@ 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;

 public class AbandonChannelTask extends AsyncTask<Void, Void, Boolean> {
-    private final List<String> claimIds;
+    private List<String> claimIds;
    private List<String> successfulClaimIds;
    private List<String> failedClaimIds;
    private List<Exception> failedExceptions;
-    private final View progressView;
-    private final AbandonHandler handler;
+    private View progressView;
+    private AbandonHandler handler;

    public AbandonChannelTask(List<String> claimIds, View progressView, AbandonHandler handler) {
        this.claimIds = claimIds;
--- 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,16 +11,17 @@ 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;

 public class AbandonStreamTask extends AsyncTask<Void, Void, Boolean> {
-    private final List<String> claimIds;
+    private List<String> claimIds;
    private List<String> successfulClaimIds;
    private List<String> failedClaimIds;
    private List<Exception> failedExceptions;
-    private final View progressView;
-    private final AbandonHandler handler;
+    private View progressView;
+    private AbandonHandler handler;

    public AbandonStreamTask(List<String> claimIds, View progressView, AbandonHandler handler) {
        this.claimIds = claimIds;
--- 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<Void, Void, Claim> {
-    private final Claim claim;
-    private final BigDecimal deposit;
-    private final boolean update;
+    private Claim claim;
+    private BigDecimal deposit;
+    private boolean update;
    private Exception error;
-    private final ClaimResultHandler handler;
-    private final View progressView;
+    private ClaimResultHandler handler;
+    private View progressView;

    public ChannelCreateUpdateTask(Claim claim, BigDecimal deposit, boolean update, View progressView, ClaimResultHandler handler) {
        this.claim = claim;
--- 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<Void, Void, List<Claim>> {
-    private final List<String> types;
-    private final View progressView;
-    private final ClaimListResultHandler handler;
+    private List<String> types;
+    private View progressView;
+    private ClaimListResultHandler handler;
    private Exception error;

    public ClaimListTask(String type, View progressView, ClaimListResultHandler handler) {
--- 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<Void, Void, List<Claim>> {
-    private final Map<String, Object> options;
-    private final String connectionString;
-    private final ClaimSearchResultHandler handler;
-    private final View progressView;
+    private Map<String, Object> options;
+    private String connectionString;
+    private ClaimSearchResultHandler handler;
+    private View progressView;
    private ApiCallException error;

    public ClaimSearchTask(Map<String, Object> options, String connectionString, View progressView, ClaimSearchResultHandler handler) {
--- 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<Void, Void, Claim> {
-    private final Claim claim;
-    private final String filePath;
-    private final View progressView;
-    private final ClaimResultHandler handler;
+    private Claim claim;
+    private String filePath;
+    private View progressView;
+    private ClaimResultHandler handler;
    private Exception error;
    public PublishClaimTask(Claim claim, String filePath, View progressView, ClaimResultHandler handler) {
        this.claim = claim;
--- 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<Void, Void, List<Claim>> {
    private String claimId;
    private int page;
    private int pageSize;
-    private final ClaimSearchResultHandler handler;
-    private final View progressView;
+    private ClaimSearchResultHandler handler;
+    private View progressView;
    private Exception error;

    public PurchaseListTask(String claimId, View progressView, ClaimSearchResultHandler handler) {
--- 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<Void, Void, List<Claim>> {
-    private final List<String> urls;
-    private final String connectionString;
-    private final ClaimListResultHandler handler;
-    private final View progressView;
+    private List<String> urls;
+    private String connectionString;
+    private ClaimListResultHandler handler;
+    private View progressView;
    private ApiCallException error;

    public ResolveTask(String url, String connectionString, View progressView, ClaimListResultHandler handler) {
--- 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<Void, Void, Claim> {
-    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 String name;
+    private BigDecimal bid;
+    private String claimId;
+    private String channelId;
+    private View progressView;
+    private ClaimResultHandler handler;
    private Exception error;

    public StreamRepostTask(String name, BigDecimal bid, String claimId, String channelId, View progressView, ClaimResultHandler handler) {
--- 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,11 +7,12 @@ 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)
 public class BulkDeleteFilesTask extends AsyncTask<Void, Void, Boolean> {
-    private final List<String> claimIds;
+    private List<String> claimIds;
    public BulkDeleteFilesTask(List<String> claimIds) {
        this.claimIds = claimIds;
    }
--- 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<Void, Void, Boolean> {
-    private final String claimId;
+    private String claimId;
    private Exception error;
-    private final GenericTaskHandler handler;
+    private GenericTaskHandler handler;

    public DeleteFileTask(String claimId, GenericTaskHandler handler) {
        this.claimId = claimId;
--- 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<Void, Void, List<LbryFile>> {
-    private final String claimId;
+    private String claimId;
    private boolean downloads;
    private int page;
    private int pageSize;
-    private final FileListResultHandler handler;
-    private final View progressView;
+    private FileListResultHandler handler;
+    private View progressView;
    private ApiCallException error;

    public FileListTask(int page, int pageSize, boolean downloads, View progressView, FileListResultHandler handler) {
--- 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<Void, Void, LbryFile> {
-    private final String uri;
-    private final boolean saveFile;
-    private final View progressView;
-    private final GetFileHandler handler;
+    private String uri;
+    private boolean saveFile;
+    private View progressView;
+    private GetFileHandler handler;
    private Exception error;

    public GetFileTask(String uri, boolean saveFile, View progressView, GetFileHandler handler) {
--- 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,16 +15,18 @@ 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<Void, Void, RewardVerified> {
-    private final Context context;
-    private final View progressView;
-    private final String purchaseToken;
-    private final RewardVerifiedHandler handler;
+    private Context context;
+    private View progressView;
+    private String purchaseToken;
+    private RewardVerifiedHandler handler;
    private Exception error;

    public AndroidPurchaseTask(String purchaseToken, View progressView, Context context, RewardVerifiedHandler handler) {
--- 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,15 +13,16 @@ 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<Void, Void, Boolean> {
-    private final Context context;
-    private final String channelClaimId;
-    private final Subscription subscription;
-    private final ChannelSubscribeHandler handler;
+    private Context context;
+    private String channelClaimId;
+    private Subscription subscription;
+    private ChannelSubscribeHandler handler;
    private Exception error;
-    private final boolean isUnsubscribing;
+    private boolean isUnsubscribing;

    public ChannelSubscribeTask(Context context, String channelClaimId, Subscription subscription, boolean isUnsubscribing, ChannelSubscribeHandler handler) {
        this.context = context;
@ -50,11 +51,11 @@ public class ChannelSubscribeTask extends AsyncTask<Void, Void, Boolean> {
            options.put("claim_id", channelClaimId);
            if (!isUnsubscribing) {
                options.put("channel_name", subscription.getChannelName());
-                options.put("notifications_disabled", String.valueOf(subscription.isNotificationsDisabled()).toLowerCase());
            }

            String action = isUnsubscribing ? "delete" : "new";
-            Object response = Lbryio.parseResponse(Lbryio.call("subscription", action, options, context));
+            Lbryio.call("subscription", action, options, context);
+
            if (!isUnsubscribing) {
                Lbryio.addSubscription(subscription);
            } else {
--- 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,6 +9,7 @@ import org.json.JSONException;
 import org.json.JSONObject;

 import java.text.DecimalFormat;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;

@ -24,12 +25,12 @@ import io.lbry.browser.utils.Lbryio;

 public class ClaimRewardTask extends AsyncTask<Void, Void, String> {

-    private final Context context;
-    private final String type;
-    private final String rewardCode;
-    private final View progressView;
+    private Context context;
+    private String type;
+    private String rewardCode;
+    private View progressView;
    private double amountClaimed;
-    private final ClaimRewardHandler handler;
+    private ClaimRewardHandler handler;
    private Exception error;

    public ClaimRewardTask(String type, String rewardCode, View progressView, Context context, ClaimRewardHandler handler) {
--- 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<Void, Void, User> {
-    private final Context context;
+    private Context context;
    private Exception error;
-    private final FetchUserTaskHandler handler;
+    private FetchUserTaskHandler handler;

    public FetchCurrentUserTask(Context context, FetchUserTaskHandler handler) {
        this.context = context;
--- 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<Void, Void, List<Invitee>> {
-    private final FetchInviteStatusHandler handler;
-    private final View progressView;
+    private FetchInviteStatusHandler handler;
+    private View progressView;
    private Exception error;

    public FetchInviteStatusTask(View progressView, FetchInviteStatusHandler handler) {
--- 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<Void, Void, String> {
-    private final FetchReferralCodeHandler handler;
-    private final View progressView;
+    private FetchReferralCodeHandler handler;
+    private View progressView;
    private Exception error;

    public FetchReferralCodeTask(View progressView, FetchReferralCodeHandler handler) {
--- 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<Void, Void, List<Reward>> {
-    private final FetchRewardsHandler handler;
-    private final View progressView;
+    private FetchRewardsHandler handler;
+    private View progressView;
    private Exception error;

    public FetchRewardsTask(View progressView, FetchRewardsHandler handler) {
--- 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<Void, Void, Integer> {
    public static final int STAT_VIEW_COUNT = 1;
    public static final int STAT_SUB_COUNT = 2;

-    private final String claimId;
-    private final int stat;
-    private final FetchStatCountHandler handler;
-    private final View progressView;
+    private String claimId;
+    private int stat;
+    private FetchStatCountHandler handler;
+    private View progressView;
    private Exception error;

    public FetchStatCountTask(int stat, String claimId, View progressView, FetchStatCountHandler handler) {
--- 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<Void, Void, List<Subscription>> {
-    private final Context context;
-    private final FetchSubscriptionsHandler handler;
-    private final ProgressBar progressBar;
+    private Context context;
+    private FetchSubscriptionsHandler handler;
+    private ProgressBar progressBar;
    private Exception error;

    public FetchSubscriptionsTask(Context context, ProgressBar progressBar, FetchSubscriptionsHandler handler) {
@ -49,12 +49,11 @@ public class FetchSubscriptionsTask extends AsyncTask<Void, Void, List<Subscript
                    JSONObject item = array.getJSONObject(i);
                    String claimId = item.getString("claim_id");
                    String channelName = item.getString("channel_name");
-                    boolean isNotificationsDisabled = item.getBoolean("is_notifications_disabled");

                    LbryUri url = new LbryUri();
                    url.setChannelName(channelName);
                    url.setClaimId(claimId);
-                    Subscription subscription = new Subscription(channelName, url.toString(), isNotificationsDisabled);
+                    Subscription subscription = new Subscription(channelName, url.toString());
                    subscriptions.add(subscription);
                    // Persist the subscription locally if it doesn't exist
                    if (db != null) {
--- 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<Void, Void, Boolean> {
-    private final String email;
-    private final View progressView;
-    private final GenericTaskHandler handler;
+    private String email;
+    private View progressView;
+    private GenericTaskHandler handler;
    private Exception error;

    public InviteByEmailTask(String email, View progressView, GenericTaskHandler handler) {
--- 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,21 +2,24 @@ 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<Void, Void, Boolean> {
-    private final String uri;
-    private final Claim claim;
+    private String uri;
+    private Claim claim;
    private Exception error;
-    private final GenericTaskHandler handler;
-    private final long timeToStart;
+    private GenericTaskHandler handler;
+    private long timeToStart;

    public LogFileViewTask(String uri, Claim claim, long timeToStart, GenericTaskHandler handler) {
        this.uri = uri;
--- 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,6 +2,7 @@ package io.lbry.browser.tasks.lbryinc;

 import android.os.AsyncTask;

+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

@ -9,9 +10,10 @@ 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<Void, Void, Void> {
-    private final Claim claimResult;
+    private Claim claimResult;
    public LogPublishTask(Claim claimResult) {
        this.claimResult = claimResult;
    }
--- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationDeleteTask.java
+++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationDeleteTask.java
@ -1,33 +0,0 @@
-package io.lbry.browser.tasks.lbryinc;
-
-import android.os.AsyncTask;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import io.lbry.browser.exceptions.LbryioRequestException;
-import io.lbry.browser.exceptions.LbryioResponseException;
-import io.lbry.browser.utils.Helper;
-import io.lbry.browser.utils.Lbryio;
-
-public class NotificationDeleteTask extends AsyncTask<Void, Void, Boolean> {
-    private final List<Long> ids;
-
-    public NotificationDeleteTask(List<Long> ids) {
-        this.ids = ids;
-    }
-
-    protected Boolean doInBackground(Void... params) {
-        Map<String, String> options = new HashMap<>();
-        options.put("notification_ids", Helper.joinL(ids, ","));
-
-        try {
-            Object result = Lbryio.parseResponse(Lbryio.call("notification", "delete", options, null));
-            return "ok".equalsIgnoreCase(result.toString());
-        } catch (LbryioResponseException | LbryioRequestException ex) {
-            // pass
-        }
-        return false;
-    }
-}
--- a/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationListTask.java
+++ b/app/src/main/java/io/lbry/browser/tasks/lbryinc/NotificationListTask.java
@ -16,10 +16,8 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;

 import io.lbry.browser.MainActivity;
 import io.lbry.browser.data.DatabaseHelper;
@ -32,9 +30,9 @@ import io.lbry.browser.utils.Lbryio;
 public class NotificationListTask extends AsyncTask<Void, Void, List<LbryNotification>> {
    private static final String TAG = "Notifications";

-    private final Context context;
-    private final ListNotificationsHandler handler;
-    private final ProgressBar progressBar;
+    private Context context;
+    private ListNotificationsHandler handler;
+    private ProgressBar progressBar;
    private Exception error;

    public NotificationListTask(Context context, ProgressBar progressBar, ListNotificationsHandler handler) {
@ -49,9 +47,7 @@ public class NotificationListTask extends AsyncTask<Void, Void, List<LbryNotific
        List<LbryNotification> notifications = new ArrayList<>();
        SQLiteDatabase db = null;
        try {
-            Map<String, String> parameters = new HashMap<>(1);
-            parameters.put("is_app_readable", "true");
-            JSONArray array = (JSONArray) Lbryio.parseResponse(Lbryio.call("notification", "list", parameters, context));
+            JSONArray array = (JSONArray) Lbryio.parseResponse(Lbryio.call("notification", "list", context));
            if (array != null) {
                for (int i = 0; i < array.length(); i++) {
                    JSONObject item = array.getJSONObject(i);
--- 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,28 +12,28 @@ import io.lbry.browser.utils.Helper;
 import io.lbry.browser.utils.Lbryio;

 public class NotificationUpdateTask extends AsyncTask<Void, Void, Boolean> {
-    private final List<Long> ids;
-    private final boolean seen;
-    private final boolean read;
-    private final boolean updateRead;
+    private List<Long> ids;
+    private boolean seen;
+    private boolean read;
+    private boolean updateSeen;

-    public NotificationUpdateTask(List<Long> ids, boolean seen) {
-        this(ids, false, true, false);
+    public NotificationUpdateTask(List<Long> ids, boolean read) {
+        this(ids, read, false, false);
    }

-    public NotificationUpdateTask(List<Long> ids, boolean read, boolean seen, boolean updateRead) {
+    public NotificationUpdateTask(List<Long> ids, boolean read, boolean seen, boolean updateSeen) {
        this.ids = ids;
        this.read = read;
        this.seen = seen;
-        this.updateRead = updateRead;
+        this.updateSeen = updateSeen;
    }

    protected Boolean doInBackground(Void... params) {
        Map<String, String> options = new HashMap<>();
        options.put("notification_ids", Helper.joinL(ids, ","));
-        options.put("is_seen", String.valueOf(seen));
-        if (updateRead) {
-            options.put("is_read", String.valueOf(read));
+        options.put("is_read", String.valueOf(read));
+        if (updateSeen) {
+            options.put("is_seen", String.valueOf(seen));
        }

        try {
--- 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<Void, Void, RewardVerified> {
-    private final Context context;
-    private final View progressView;
-    private final TwitterOauth twitterOauth;
-    private final RewardVerifiedHandler handler;
+    private Context context;
+    private View progressView;
+    private TwitterOauth twitterOauth;
+    private RewardVerifiedHandler handler;
    private Exception error;

    public TwitterVerifyTask(TwitterOauth twitterOauth, View progressView, Context context, RewardVerifiedHandler handler) {
--- 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<Void, Void, List<UrlSuggestion>> {
-    private final DatabaseHelper dbHelper;
-    private final FetchRecentUrlHistoryHandler handler;
+    private DatabaseHelper dbHelper;
+    private FetchRecentUrlHistoryHandler handler;
    public FetchRecentUrlHistoryTask(DatabaseHelper dbHelper, FetchRecentUrlHistoryHandler handler) {
        this.dbHelper = dbHelper;
        this.handler = handler;
--- 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,14 +10,15 @@ 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;

 public class FetchViewHistoryTask extends AsyncTask<Void, Void, List<ViewHistory>> {
-    private final DatabaseHelper dbHelper;
-    private final FetchViewHistoryHandler handler;
-    private final int pageSize;
-    private final Date lastDate;
+    private DatabaseHelper dbHelper;
+    private FetchViewHistoryHandler handler;
+    private int pageSize;
+    private Date lastDate;
    public FetchViewHistoryTask(Date lastDate, int pageSize, DatabaseHelper dbHelper, FetchViewHistoryHandler handler) {
        this.lastDate = lastDate;
        this.pageSize = pageSize;
--- 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,6 +6,7 @@ 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;
@ -22,9 +23,9 @@ import io.lbry.browser.utils.Helper;

 public class LoadGalleryItemsTask extends AsyncTask<Void, GalleryItem, List<GalleryItem>> {
    private static final String TAG = "LoadGalleryItemsTask";
-    private final LoadGalleryHandler handler;
-    private final View progressView;
-    private final Context context;
+    private LoadGalleryHandler handler;
+    private View progressView;
+    private Context context;

    public LoadGalleryItemsTask(View progressView, Context context, LoadGalleryHandler handler) {
        this.progressView = progressView;
@ -43,7 +44,6 @@ public class LoadGalleryItemsTask extends AsyncTask<Void, GalleryItem, List<Gall
        if (context != null) {
            ContentResolver resolver = context.getContentResolver();
            try {
-                // TODO: MediaStore.Video.Media.DURATION requires API level 29
                String[] projection = {
                        MediaStore.MediaColumns._ID,
                        MediaStore.MediaColumns.DATA,
@ -61,7 +61,6 @@ public class LoadGalleryItemsTask extends AsyncTask<Void, GalleryItem, List<Gall
                        int nameColumn = cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
                        int typeColumn = cursor.getColumnIndex(MediaStore.MediaColumns.MIME_TYPE);
                        int pathColumn = cursor.getColumnIndex(MediaStore.MediaColumns.DATA);
-                        // TODO: MediaStore.Video.Media.DURATION requires API level 29
                        int durationColumn = cursor.getColumnIndex(MediaStore.Video.Media.DURATION);

                        GalleryItem item = new GalleryItem();
--- 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,15 +1,18 @@
 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<Void, Void, Boolean> {
-    private final DatabaseHelper dbHelper;
-    private final UrlSuggestion suggestion;
-    private final SaveUrlHistoryHandler handler;
+    private DatabaseHelper dbHelper;
+    private UrlSuggestion suggestion;
+    private SaveUrlHistoryHandler handler;
    private Exception error;

    public SaveUrlHistoryTask(UrlSuggestion suggestion, DatabaseHelper dbHelper, SaveUrlHistoryHandler handler) {
--- 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<Void, Void, Boolean> {
-    private final DatabaseHelper dbHelper;
-    private final ViewHistory history;
-    private final SaveViewHistoryHandler handler;
+    private DatabaseHelper dbHelper;
+    private ViewHistory history;
+    private SaveViewHistoryHandler handler;
    private Exception error;

    public SaveViewHistoryTask(ViewHistory history, DatabaseHelper dbHelper, SaveViewHistoryHandler handler) {
--- 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<Void, Void, Boolean> {
-    private final Context context;
-    private final CheckUserEmailVerifiedHandler handler;
+    private Context context;
+    private CheckUserEmailVerifiedHandler handler;

    public CheckUserEmailVerifiedTask(Context context, CheckUserEmailVerifiedHandler handler) {
        this.context = context;
--- a/Show more
+++ b/Show more