Show images in comments and post

Replace image links in posts and comments with actual images.

.gitea/issue_template/bug_report.md

@@ -1,49 +0,0 @@
----
-
-name: "Bug Report"
-about: "Report a Bug!"
-title: " [Bug] "
-ref: "master"
-labels:
-
-- Kind/Bug
-
---- 
-### Description of the Issue:
-
-<!-- Provide a clear and concise description of what the issue is about. -->
-
-### Steps to Reproduce:
-
-<!-- Explain the steps to reproduce the issue, if applicable. -->
-
-1. 
-2. 
-3. 
-
-### Expected Behavior:
-
-<!-- Describe what you expected to happen. -->
-
-### Actual Behavior:
-
-<!-- Describe what actually happened. Include screenshots if applicable. -->
-
-### App Information:
-
-- **Version:** <!-- e.g. 1.0.0 -->
-- **Device:** <!-- e.g. Samsung Galaxy S10 -->
-- **Android Version:** <!-- e.g. Android 11 -->
-- **Installation Source:** <!-- e.g. Google Play Store, APK -->
-
-### Log Files:
-
-<!-- If applicable, include log files or error messages related to this issue. -->
-
-### Additional Context:
-
-<!-- Add any other context about the problem here, such as relevant system configuration or screenshots. -->
-
-### Potential Solutions or Workarounds:
-
-<!-- If you know of any potential solutions or workarounds for this issue, please describe them here. -->

.gitea/issue_template/feature_request.md

@@ -1,28 +0,0 @@
----
-
-name: "Feature request"
-about: "Request a feature!"
-title: "[Feature] "
-ref: "master"
-labels:
-
-- Kind/Feature
-
----
-
-### Description
-<!-- A clear and concise description of what the feature is and what problem it solves. -->
-
-### Background
-<!-- Any background information or context that would be helpful. -->
-
-### Proposed Solution
-<!--
-- Describe the solution you'd like.
-- A clear and concise description of what you want to happen.
-- Include any alternative solutions or features you've considered.
-- Add any technical details, mockups, or examples if available.
--->
-
-### Additional Context
-<!-- Add any other context, screenshots, or links to existing issues/discussions about the feature here. -->

.gitignore

@@ -56,8 +56,6 @@ gen-external-apklibs
 
 # NDK
 obj/
-**/ndkHelperBin
-**/.cxx
 
 # IntelliJ IDEA
 *.iml

.woodpecker/build.yaml

@@ -1,15 +1,14 @@
-steps:
+pipeline:
   build:
-    image: alvrme/alpine-android:android-34-jdk11
+    image: alvrme/alpine-android:android-33-jdk11
     commands:
-      - apk add --no-cache python3
       - ./gradlew :app:assembleRelease
     when:
       path: [ app/**, build.gradle ]
   sign:
-    image: alvrme/alpine-android:android-34-jdk11
+    image: alvrme/alpine-android:android-33-jdk11
     commands:
-      - ./scripts/apk-sign.sh Eternity-signed.apk app/build/outputs/apk/release/app-release-unsigned.apk
+      - ./scripts/apk-sign.sh LemmInfinity-signed.apk app/build/outputs/apk/release/app-release-unsigned.apk
     secrets: [ APK_KS_PASS, APK_KS, APK_KS_ALIAS ]
     when:
       event: [ tag ]
@@ -18,13 +17,11 @@ steps:
     settings:
       base_url: https://codeberg.org
       files:
-        - Eternity-signed.apk
+        - LemmInfinity-signed.apk
       api_key:
         from_secret: GITEA_ACCESS_TOKEN
       target: main
       prerelease: true
-      note: "Pending release notes..."
+      note: "This is an alpha release. Expect many bugs and unfinished features!"
     when:
-      event: [ tag ]
-when:
-  event: [ push, tag, pull_request ]
+      event: [ tag ]

.woodpecker/nightly.yaml

@@ -1,77 +0,0 @@
-clone:
-  git:
-    image: woodpeckerci/plugin-git
-    settings:
-      partial: false
-
-steps:
-  build:
-    image: alvrme/alpine-android:android-34-jdk11
-    commands:
-      - apk add --no-cache python3
-      - ./gradlew :app:assembleNightly
-  sign:
-    image: alvrme/alpine-android:android-34-jdk11
-    commands:
-      - ./scripts/apk-sign.sh eu.toldi.infinityforlemmy.nightly.apk app/build/outputs/apk/nightly/eu.toldi.infinityforlemmy.nightly.apk
-    secrets: [ APK_KS_PASS, APK_KS, APK_KS_ALIAS ]
-  pull-repo-config:
-    image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
-    commands:
-      - cd ..
-      - pwd
-      - mkdir repoconfig
-      - cd repoconfig
-      - pwd
-      - git clone --depth 1 https://codeberg.org/Bazsalanszky/fdroid-repo-config
-      - cp /woodpecker/src/codeberg.org/Bazsalanszky/Eternity/eu.toldi.infinityforlemmy.nightly.apk fdroid-repo-config/repo/
-
-  pull-pages:
-    image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
-    commands:
-      - cd ..
-      - pwd
-      - mkdir pages
-      - cd pages
-      - pwd
-      - git clone --depth 2 https://codeberg.org/Bazsalanszky/pages
-      - cd pages
-      - git config user.name "CODEBERG CI"
-      - git config user.email "noreply@nodomain.nodomain"
-      # reset and remove, later force push, to keep repo size small
-      - git reset --soft HEAD~1
-      - git status
-
-  update-fdroid-data:
-    image: cs8898/android-fdroid-sdk:33.0.0
-    commands:
-      - pwd
-      - cd ../repoconfig/fdroid-repo-config/
-      - echo -n "$${FDROID_KS}" | base64 -d > keystore.p12
-      - cat keystore.p12 | sha256sum
-      - sed -i "s|KS_PASS|$${FDROID_KS_PASS}|g" config.yml
-      - sed -i "s|KEY_PASS|$${FDROID_KEY_PASS}|g" config.yml
-      - fdroid update
-      - fdroid deploy
-      - ls -laR repo
-    secrets: [ FDROID_KS_PASS, FDROID_KEY_PASS, FDROID_KS ]
-  push-pages-update-repo:
-    image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
-    commands:
-      - if [ -f .do_not_build ]; then return 0; fi
-      - cd ../pages/pages/
-      - git add -A
-      - git status
-      - git diff
-      - ls -lsR fdroid/repo
-      - git commit -m "autodeploy"
-      - git remote remove origin
-      - git remote add origin https://Bazsalanszky:"$${GITEA_ACCESS_TOKEN}"@codeberg.org/Bazsalanszky/pages.git
-      # force push as we removed all data
-      - git push -f origin main
-      - cd ../../
-      - pwd
-      - ls -la
-    secrets: [ GITEA_ACCESS_TOKEN ]
-when:
-  event: cron

README.md

@@ -1,98 +1,53 @@
 <h1 align="center">
-  Eternity for Lemmy
+  Infinity for Lemmy
 </h1>
 
 <div align="center">
 
 A Lemmy client for Android written in Java. It's a fork of the [Infinity for Reddit](https://github.com/Docile-Alligator/Infinity-For-Reddit) project, currenty in early development.
 
+<img align="right" src="https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy/raw/branch/master/fastlane/metadata/android/en-US/images/icon.png" width=200>
+
 </div>
 
 <br>
+
+
 <div align="center">
-<img src="https://codeberg.org/Bazsalanszky/Eternity/raw/branch/master/fastlane/metadata/android/en-US/images/icon.png" width=256>
 
-[![status-badge](https://ci.codeberg.org/api/badges/12474/status.svg)](https://ci.codeberg.org/repos/12474)
-[![Liberapay patrons](https://img.shields.io/liberapay/patrons/bazsalanszky)](https://liberapay.com/Bazsalanszky)
-[![Lemmy Community](https://img.shields.io/lemmy/eternityapp@lemdro.id?style=flat-square&logo=lemmy&label=lemmy)](https://lemdro.id/c/eternityapp)
+[![status-badge](https://ci.codeberg.org/api/badges/12474/status.svg)](https://ci.codeberg.org/12474)
 
-<a href="https://codeberg.org/Bazsalanszky/Eternity/issues">Report a Bug</a>
+<a href="https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy/issues">Report a Bug</a>
 
 </div>
 
+
+
+<br>
+
 <div align="center">
-<a href="https://f-droid.org/packages/eu.toldi.infinityforlemmy/">
-    <img src="./.assets/fdroid-badge.png" height="80">
-</a>
-<a href="https://play.google.com/store/apps/details?id=eu.toldi.infinityforlemmy">
-    <img src="./.assets/google-play-badge.png" height="80">
-</a>
-
-<a href="https://codeberg.org/Bazsalanszky/Eternity/releases/">
-    <img src="./.assets/codeberg.png" height="80">
-</a>
-
-
 
 </div>
 
+
+
 ---
 
-## Features
+## Action Items for Infinity for Lemmy
 
-Eternity is currently in the early stages of development. Expect many unfinished features and bugs!
+Infinity for Lemmy is currently in the early stages of development. Expect many unfinished features and bugs!
 
-### Browsing Lemmy
-
- - Explore various feeds (Subscribed/Local/All) and communities
- - Subscribe or unsubscribe from specific communities, with the option to block
- - Discover communities federated with the current instance
- - Favorite a community for quick access
- - Manage your subscriptions and blocked communities
-
-### Content Engagement
-
-- Engage with content by voting, saving, sharing, and creating posts or comments
-- Enjoy endless scrolling through feeds and posts
-- Tailor the view settings for posts (card,compact, gallery)
-- Set default preferences for post and comment sorting
-- Stay updated with notifications for replies
-
-### Account Management
-
-- Sign in to multiple accounts or instances, and effortlessly switch between them
-- Use the inbox features to view replies, mentions, and private messages
-- Access your profile to view your posts, comments, and saved content
-
-### Customization
-
-- Choose between various theme options including Light, Dark, OLED
-- Support Material You theming
-- Explore user-created themes
-- Customize font settings
-- Optional bottom navigation bar
-- Discover a plethora of other customization features
-
-<img 
-  src="https://codeberg.org/Bazsalanszky/Eternity/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" 
-  alt="Screenshot 1"
-  height="200" >
-<img 
-  src="https://codeberg.org/Bazsalanszky/Eternity/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" 
-  alt="Screenshot 2"
-  height="200" >
-<img 
-  src="https://codeberg.org/Bazsalanszky/Eternity/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" 
-  alt="Screenshot 3"
-  height="200" >
-<img 
-  src="https://codeberg.org/Bazsalanszky/Eternity/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" 
-  alt="Screenshot 4"
-  height="200" >
-<img 
-  src="https://codeberg.org/Bazsalanszky/Eternity/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png" 
-  alt="Screenshot 5"
-  height="200" >
+- [x] Implementation of basic post browsing feature
+- [x] Support for multiple account handling
+- [x] Functionality for post upvotes/downvotes
+- [x] Functionality to browse comments
+- [ ] Capability for creating a new post
+- [x] Ability to create comments
+- [ ] Elimination of code/string references specific to Reddit
+- [ ] Incorporation of private messaging feature
+- [ ] Feature for saving posts
+- [ ] Account editing function
+- [ ] Multi community view?
 
 
 ## Contributing
@@ -110,21 +65,16 @@ Don't forget to give the project a star! Thanks again!
 4. Push to the Branch (`git push origin feature/AmazingFeature`)
 5. Open a Pull Request
 
-### Translation
+Here are other ways you can help:
 
-You can also help Eternity by translating it to your native langugage! Translations are done via [Weblate](https://translate.codeberg.org/projects/infinity-for-lemmy/app/)!
+- [Report Bugs](https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy/issues)
 
-[![Translation](https://translate.codeberg.org/widgets/infinity-for-lemmy/-/app/multi-auto.svg)](https://translate.codeberg.org/engage/Eternity/)
-
-### Reporting bugs
-
-You can also contribute by [reporting bugs](https://codeberg.org/Bazsalanszky/Eternity/issues)
 
 <p align="right">(<a href="#top">back to top</a>)</p>
 
 ## License
 
-Distributed under the AGPL-3.0 License. See <a href="https://codeberg.org/Bazsalanszky/Eternity/src/branch/master/LICENSE">LICENSE</a> for more information.
+Distributed under the AGPL-3.0 License. See <a href="https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy/src/branch/master/LICENSE">LICENSE</a> for more information.
 
 <p align="right">(<a href="#top">back to top</a>)</p>
 
@@ -132,6 +82,7 @@ Distributed under the AGPL-3.0 License. See <a href="https://codeberg.org/Bazsal
 
 [@bazsalanszky@lemmy.toldi.eu](https://lemmy.toldi.eu/u/bazsalanszky) - (Owner)
 
-Project Link: [https://codeberg.org/Bazsalanszky/Eternity](https://codeberg.org/Bazsalanszky/Eternity)
+
+Project Link: [https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy](https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy)
 
 <p align="right">(<a href="#top">back to top</a>)</p>

app/build.gradle

@@ -1,28 +1,15 @@
 plugins {
     id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-}
-def getCommitVersionCode = { ->
-    try {
-        def stdout = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'rev-list', 'HEAD', '--count'
-            standardOutput = stdout
-        }
-        return Integer.valueOf(stdout.toString().trim())
-    } catch (ignored) {
-        return null
-    }
 }
 
 android {
-    compileSdk 34
+    compileSdk 33
     defaultConfig {
         applicationId "eu.toldi.infinityforlemmy"
         minSdk 21
-        targetSdk 34
-        versionCode 135
-        versionName "0.2.0"
+        targetSdk 33
+        versionCode 128
+        versionName "0.0.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
@@ -31,13 +18,10 @@ android {
         }
     }
     buildTypes {
-
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-
         minifiedRelease {
             initWith buildTypes.release
             zipAlignEnabled true
@@ -49,33 +33,7 @@ android {
             applicationIdSuffix '.debug'
             versionNameSuffix ' (DEBUG)'
         }
-
-        nightly {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            applicationIdSuffix '.nightly'
-            versionNameSuffix ' (NIGHTLY)'
-        }
-        applicationVariants.all { variant ->
-            variant.resValue "string", "applicationId", variant.applicationId
-
-
-            if (variant.buildType.name == 'nightly') {
-                variant.outputs.all {
-                    setVersionCodeOverride(getCommitVersionCode())
-
-                    setVersionNameOverride(variant.versionName)
-                    outputFileName = "${applicationId}.apk"
-                }
-            }
-        }
-
     }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
@@ -98,37 +56,7 @@ android {
     packagingOptions {
         doNotStrip '**/*.so'
     }
-
-    // Kotlin jvm target
-    kotlinOptions {
-        jvmTarget = '11'
-    }
-
     namespace 'eu.toldi.infinityforlemmy'
-
-
-    task rearrangeClass(type: Exec) {
-        commandLine 'python3', '../scripts/fixEventBus.py'
-    }
-
-    applicationVariants.all { variant ->
-        if (variant.name == 'release') {
-            task("compileSingleFile${variant.name.capitalize()}", type: JavaCompile, dependsOn: rearrangeClass) {
-                def filePath = project.rootDir.absolutePath + '/app/build/generated/ap_generated_sources/release/out/eu/toldi/infinityforlemmy/'
-                source = files(filePath)
-                includes = ["**/EventBusIndex.java"]
-                classpath = variant.getCompileClasspath() + files(project.rootDir.absolutePath + '/app/build/intermediates/javac/release/classes')
-                destinationDir = file("$buildDir/intermediates/javac/release/classes")
-            }
-
-            tasks.withType(JavaCompile).all { task ->
-                if (task.name == 'compileReleaseJavaWithJavac') {
-                    task.finalizedBy "compileSingleFile${variant.name.capitalize()}"
-                }
-            }
-        }
-    }
-
 }
 
 dependencies {
@@ -139,7 +67,6 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-
     def lifecycleVersion = "2.5.1"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-livedata:$lifecycleVersion"
@@ -185,7 +112,6 @@ dependencies {
     implementation "com.google.dagger:dagger:$daggerVersion"
     annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
 
-
     // Binding
     // NOTE: Deprecated in favor of viewbinding
     def butterknifeVersion = "10.2.3"
@@ -227,12 +153,11 @@ dependencies {
     def glideVersion = "4.12.0"
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
-    implementation "com.github.bumptech.glide:okhttp-integration:$glideVersion"
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
     implementation 'com.github.santalu:aspect-ratio-imageview:1.0.9'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.23'
     def bivVersion = "1.8.1"
-    implementation "com.github.piasy:BigImageViewer:$bivVersion"
+    implementation "com.github.piasy:BigImageViewer:bivVersion"
     implementation "com.github.piasy:GlideImageLoader:$bivVersion"
     implementation "com.github.piasy:GlideImageViewFactory:$bivVersion"
 
@@ -271,42 +196,8 @@ dependencies {
 
     implementation 'com.otaliastudios:zoomlayout:1.9.0'
 
-    implementation 'androidx.core:core-splashscreen:1.0.1'
-
 
 /**** Builds and flavors ****/
     // debugImplementation because LeakCanary should only run in debug builds.
     //debugImplementation 'com.squareup.leakcanary:leakcanary-android:x.y'
 }
-
-// NB: Android Studio can't find the imports; this does not affect the
-// actual build since Gradle can find them just fine.
-
-import com.android.tools.profgen.ArtProfileKt
-import com.android.tools.profgen.ArtProfileSerializer
-import com.android.tools.profgen.DexFile
-
-project.afterEvaluate {
-    tasks.each { task ->
-        if (task.name.startsWith("compile") && task.name.endsWith("ReleaseArtProfile")) {
-            task.doLast {
-                outputs.files.each { file ->
-                    if (file.name.endsWith(".profm")) {
-                        println("Sorting ${file} ...")
-                        def version = ArtProfileSerializer.valueOf("METADATA_0_0_2")
-                        def profile = ArtProfileKt.ArtProfile(file)
-                        def keys = new ArrayList(profile.profileData.keySet())
-                        def sortedData = new LinkedHashMap()
-                        Collections.sort keys, new DexFile.Companion()
-                        keys.each { key -> sortedData[key] = profile.profileData[key] }
-                        new FileOutputStream(file).with {
-                            write(version.magicBytes$profgen)
-                            write(version.versionBytes$profgen)
-                            version.write$profgen(it, sortedData, "")
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

app/proguard-rules.pro

@@ -5,8 +5,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--dontobfuscate
--keepattributes SourceFile,LineNumberTable
 
 ## Preferences reflection
 -keep class * extends androidx.preference.PreferenceFragmentCompat

app/src/debug/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-   <string name="application_name" translatable="false">Eternity (Debug)</string>
+   <string name="application_name" translatable="false">Infinity for Lemmy (Debug)</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?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="eu.toldi.infinityforlemmy">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <queries>
         <intent>
@@ -17,7 +16,6 @@
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="22" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
 
     <uses-permission-sdk-23
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
@@ -25,7 +23,7 @@
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
         android:name=".Infinity"
@@ -38,32 +36,9 @@
         android:usesCleartextTraffic="true"
         tools:replace="android:label">
         <activity
-            android:name=".activities.InstanceInfoActivity"
-            android:label="@string/instance_info"
-            android:configChanges="orientation|screenLayout|screenSize|layoutDirection"
-            android:parentActivityName=".activities.MainActivity"
-            android:theme="@style/AppTheme.Slidable" />
-        <activity
-            android:name=".activities.CommentFilterUsageListingActivity"
-            android:parentActivityName=".activities.SettingsActivity"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:exported="false" />
-        <activity
-            android:name=".activities.CustomizeCommentFilterActivity"
-            android:label="@string/customize_comment_filter_activity_label"
-            android:parentActivityName=".activities.SettingsActivity"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:exported="false" />
-        <activity
-            android:name=".activities.CommentFilterPreferenceActivity"
-            android:label="@string/comment_filter_preference_activity_label"
-            android:parentActivityName=".activities.SettingsActivity"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:exported="false" />
-
-        <activity
-            android:name=".activities.BlockedThingListingActivity"
-            android:label="@string/blocks"
+            android:name=".activities.HistoryActivity"
+            android:exported="false"
+            android:label="@string/history_activity_label"
             android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
         <activity
@@ -159,7 +134,6 @@
         <service
             android:name=".services.DownloadMediaService"
             android:enabled="true"
-            android:foregroundServiceType="dataSync"
             android:exported="false" />
 
         <activity
@@ -177,7 +151,6 @@
         <service
             android:name=".services.DownloadRedditVideoService"
             android:enabled="true"
-            android:foregroundServiceType="dataSync"
             android:exported="false" />
 
         <activity
@@ -326,7 +299,7 @@
                 <data android:host="feddit.de" />
                 <data android:host="lemmy.fmhy.ml" />
                 <data android:host="lemmy.ca" />
-                <data android:host="hexbear.net" />
+                <data android:host="www.hexbear.net" />
                 <data android:host="programming.dev" />
                 <data android:host="lemmy.dbzer0.com" />
                 <data android:host="lemmy.blahaj.zone" />
@@ -458,37 +431,11 @@
             android:theme="@style/AppTheme.Launcher"
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <activity-alias
-            android:name=".DefaultIcon"
-            android:targetActivity=".activities.MainActivity"
-            android:label="@string/application_name"
-            android:enabled="true"
-            android:icon="@mipmap/ic_launcher"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity-alias>
-
-        <activity-alias
-            android:name=".OriginalIcon"
-            android:targetActivity=".activities.MainActivity"
-            android:label="@string/application_name"
-            android:enabled="false"
-            android:icon="@mipmap/original_ic_launcher"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity-alias>
-
         <activity
             android:name=".activities.LoginActivity"
             android:configChanges="orientation|screenLayout|screenSize|layoutDirection"
@@ -540,12 +487,10 @@
         <service
             android:name=".services.SubmitPostService"
             android:enabled="true"
-            android:foregroundServiceType="dataSync"
             android:exported="false" />
         <service
             android:name=".services.EditProfileService"
             android:enabled="true"
-            android:foregroundServiceType="dataSync"
             android:exported="false" />
 
         <receiver android:name=".broadcastreceivers.DownloadedMediaDeleteActionBroadcastReceiver" />

app/src/main/java/eu/toldi/infinityforlemmy/AppComponent.java

@@ -2,22 +2,16 @@ package eu.toldi.infinityforlemmy;
 
 import android.app.Application;
 
-import org.jetbrains.annotations.NotNull;
-
 import javax.inject.Singleton;
 
 import dagger.BindsInstance;
 import dagger.Component;
 import eu.toldi.infinityforlemmy.activities.AccountPostsActivity;
 import eu.toldi.infinityforlemmy.activities.AccountSavedThingActivity;
-import eu.toldi.infinityforlemmy.activities.BlockedThingListingActivity;
 import eu.toldi.infinityforlemmy.activities.CommentActivity;
-import eu.toldi.infinityforlemmy.activities.CommentFilterPreferenceActivity;
-import eu.toldi.infinityforlemmy.activities.CommentFilterUsageListingActivity;
 import eu.toldi.infinityforlemmy.activities.CreateMultiRedditActivity;
 import eu.toldi.infinityforlemmy.activities.CustomThemeListingActivity;
 import eu.toldi.infinityforlemmy.activities.CustomThemePreviewActivity;
-import eu.toldi.infinityforlemmy.activities.CustomizeCommentFilterActivity;
 import eu.toldi.infinityforlemmy.activities.CustomizePostFilterActivity;
 import eu.toldi.infinityforlemmy.activities.CustomizeThemeActivity;
 import eu.toldi.infinityforlemmy.activities.EditCommentActivity;
@@ -28,8 +22,8 @@ import eu.toldi.infinityforlemmy.activities.FetchRandomSubredditOrPostActivity;
 import eu.toldi.infinityforlemmy.activities.FilteredPostsActivity;
 import eu.toldi.infinityforlemmy.activities.FullMarkdownActivity;
 import eu.toldi.infinityforlemmy.activities.GiveAwardActivity;
+import eu.toldi.infinityforlemmy.activities.HistoryActivity;
 import eu.toldi.infinityforlemmy.activities.InboxActivity;
-import eu.toldi.infinityforlemmy.activities.InstanceInfoActivity;
 import eu.toldi.infinityforlemmy.activities.LinkResolverActivity;
 import eu.toldi.infinityforlemmy.activities.LockScreenActivity;
 import eu.toldi.infinityforlemmy.activities.LoginActivity;
@@ -71,18 +65,14 @@ import eu.toldi.infinityforlemmy.activities.ViewVideoActivity;
 import eu.toldi.infinityforlemmy.activities.WebViewActivity;
 import eu.toldi.infinityforlemmy.activities.WikiActivity;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.AccountChooserBottomSheetFragment;
-import eu.toldi.infinityforlemmy.bottomsheetfragments.CommentMoreBottomSheetFragment;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.FlairBottomSheetFragment;
-import eu.toldi.infinityforlemmy.fragments.BlockedCommunitiesListingFragment;
-import eu.toldi.infinityforlemmy.fragments.BlockedInstancesListingFragment;
-import eu.toldi.infinityforlemmy.fragments.BlockedUsersListingFragment;
 import eu.toldi.infinityforlemmy.fragments.CommentsListingFragment;
 import eu.toldi.infinityforlemmy.fragments.FollowedUsersListingFragment;
+import eu.toldi.infinityforlemmy.fragments.HistoryPostFragment;
 import eu.toldi.infinityforlemmy.fragments.InboxFragment;
 import eu.toldi.infinityforlemmy.fragments.MorePostsInfoFragment;
 import eu.toldi.infinityforlemmy.fragments.MultiRedditListingFragment;
 import eu.toldi.infinityforlemmy.fragments.PostFragment;
-import eu.toldi.infinityforlemmy.fragments.PrivateMessageFragment;
 import eu.toldi.infinityforlemmy.fragments.SidebarFragment;
 import eu.toldi.infinityforlemmy.fragments.SubredditListingFragment;
 import eu.toldi.infinityforlemmy.fragments.SubscribedSubredditsListingFragment;
@@ -115,7 +105,7 @@ import eu.toldi.infinityforlemmy.settings.TranslationFragment;
 import eu.toldi.infinityforlemmy.settings.VideoPreferenceFragment;
 
 @Singleton
-@Component(modules = {AppModule.class, NetworkModule.class, PostEnricherModule.class})
+@Component(modules = {AppModule.class, NetworkModule.class})
 public interface AppComponent {
     void inject(MainActivity mainActivity);
 
@@ -311,27 +301,12 @@ public interface AppComponent {
 
     void inject(MaterialYouWorker materialYouWorker);
 
+    void inject(HistoryPostFragment historyPostFragment);
+
+    void inject(HistoryActivity historyActivity);
+
     void inject(MorePostsInfoFragment morePostsInfoFragment);
 
-    void inject(BlockedThingListingActivity blockedThingListingActivity);
-
-    void inject(BlockedCommunitiesListingFragment blockedCommunitiesListingFragment);
-
-    void inject(BlockedUsersListingFragment blockedUsersListingFragment);
-
-    void inject(BlockedInstancesListingFragment blockedInstancesListingFragment);
-
-    void inject(CommentMoreBottomSheetFragment commentMoreBottomSheetFragment);
-
-    void inject(PrivateMessageFragment privateMessageFragment);
-
-    void inject(@NotNull InstanceInfoActivity instanceInfoActivity);
-
-    void inject(CommentFilterPreferenceActivity commentFilterPreferenceActivity);
-
-    void inject(CustomizeCommentFilterActivity customizeCommentFilterActivity);
-
-    void inject(CommentFilterUsageListingActivity commentFilterUsageListingActivity);
 
     @Component.Factory
     interface Factory {

app/src/main/java/eu/toldi/infinityforlemmy/DualBadgeDrawable.java

@@ -1,78 +0,0 @@
-package eu.toldi.infinityforlemmy;
-
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-
-import androidx.annotation.Nullable;
-
-
-public class DualBadgeDrawable extends Drawable {
-    private Drawable leftBadge;
-    private Drawable rightBadge;
-
-    public DualBadgeDrawable(Drawable leftBadge, Drawable rightBadge) {
-        this.leftBadge = leftBadge;
-        this.rightBadge = rightBadge;
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        if (leftBadge == null || rightBadge == null) {
-            return;
-        }
-
-        int width = getBounds().width();
-        int height = getBounds().height();
-
-        // Draw the left badge on the left half of the canvas
-        Rect leftRect = new Rect(0, 0, width / 2, height);
-        leftBadge.setBounds(leftRect);
-        leftBadge.draw(canvas);
-
-        // Draw the right badge on the right half of the canvas
-        Rect rightRect = new Rect(width / 2, 0, width, height);
-        rightBadge.setBounds(rightRect);
-        rightBadge.draw(canvas);
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        if (leftBadge != null) {
-            leftBadge.setAlpha(alpha);
-        }
-        if (rightBadge != null) {
-            rightBadge.setAlpha(alpha);
-        }
-    }
-
-    @Override
-    public void setColorFilter(@Nullable ColorFilter colorFilter) {
-        if (leftBadge != null) {
-            leftBadge.setColorFilter(colorFilter);
-        }
-        if (rightBadge != null) {
-            rightBadge.setColorFilter(colorFilter);
-        }
-    }
-
-    @Override
-    public int getOpacity() {
-        return leftBadge != null ? leftBadge.getOpacity() : rightBadge.getOpacity();
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
-        int leftWidth = leftBadge != null ? leftBadge.getIntrinsicWidth() : 0;
-        int rightWidth = rightBadge != null ? rightBadge.getIntrinsicWidth() : 0;
-        return leftWidth + rightWidth;
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-        int leftHeight = leftBadge != null ? leftBadge.getIntrinsicHeight() : 0;
-        int rightHeight = rightBadge != null ? rightBadge.getIntrinsicHeight() : 0;
-        return Math.max(leftHeight, rightHeight);
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/FetchGfycatOrRedgifsVideoLinks.java

@@ -0,0 +1,135 @@
+package eu.toldi.infinityforlemmy;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Handler;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.concurrent.Executor;
+
+import eu.toldi.infinityforlemmy.apis.GfycatAPI;
+import eu.toldi.infinityforlemmy.apis.RedgifsAPI;
+import eu.toldi.infinityforlemmy.utils.APIUtils;
+import eu.toldi.infinityforlemmy.utils.JSONUtils;
+import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
+import retrofit2.Call;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+
+public class FetchGfycatOrRedgifsVideoLinks {
+
+    public interface FetchGfycatOrRedgifsVideoLinksListener {
+        void success(String webm, String mp4);
+        void failed(int errorCode);
+    }
+
+    public static void fetchGfycatVideoLinks(Executor executor, Handler handler, Retrofit gfycatRetrofit,
+                                             String gfycatId,
+                                             FetchGfycatOrRedgifsVideoLinksListener fetchGfycatOrRedgifsVideoLinksListener) {
+        executor.execute(() -> {
+            try {
+                Response<String> response = gfycatRetrofit.create(GfycatAPI.class).getGfycatData(gfycatId).execute();
+                if (response.isSuccessful()) {
+                    parseGfycatVideoLinks(handler, response.body(), fetchGfycatOrRedgifsVideoLinksListener);
+                } else {
+                    handler.post(() -> fetchGfycatOrRedgifsVideoLinksListener.failed(response.code()));
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+                handler.post(() -> fetchGfycatOrRedgifsVideoLinksListener.failed(-1));
+            }
+        });
+    }
+
+    public static void fetchRedgifsVideoLinks(Context context, Executor executor, Handler handler, Retrofit redgifsRetrofit,
+                                              SharedPreferences currentAccountSharedPreferences,
+                                              String gfycatId,
+                                              FetchGfycatOrRedgifsVideoLinksListener fetchGfycatOrRedgifsVideoLinksListener) {
+        executor.execute(() -> {
+            try {
+                Response<String> response = redgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(APIUtils.getRedgifsOAuthHeader(currentAccountSharedPreferences.getString(SharedPreferencesUtils.REDGIFS_ACCESS_TOKEN, "")),
+                         gfycatId, APIUtils.USER_AGENT).execute();
+                if (response.isSuccessful()) {
+                    parseRedgifsVideoLinks(handler, response.body(), fetchGfycatOrRedgifsVideoLinksListener);
+                } else {
+                    handler.post(() -> fetchGfycatOrRedgifsVideoLinksListener.failed(response.code()));
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+                handler.post(() -> fetchGfycatOrRedgifsVideoLinksListener.failed(-1));
+            }
+        });
+    }
+
+    public static void fetchGfycatOrRedgifsVideoLinksInRecyclerViewAdapter(Executor executor, Handler handler,
+                                                                           Call<String> gfycatCall,
+                                                                           boolean isGfycatVideo,
+                                                                           boolean automaticallyTryRedgifs,
+                                                                           FetchGfycatOrRedgifsVideoLinksListener fetchGfycatOrRedgifsVideoLinksListener) {
+        executor.execute(() -> {
+            try {
+                Response<String> response = gfycatCall.execute();
+                if (response.isSuccessful()) {
+                    if (isGfycatVideo) {
+                        parseGfycatVideoLinks(handler, response.body(), fetchGfycatOrRedgifsVideoLinksListener);
+                    } else {
+                        parseRedgifsVideoLinks(handler, response.body(), fetchGfycatOrRedgifsVideoLinksListener);
+                    }
+                } else {
+                    if (response.code() == 404 && isGfycatVideo && automaticallyTryRedgifs) {
+                        fetchGfycatOrRedgifsVideoLinksInRecyclerViewAdapter(executor, handler, gfycatCall.clone(),
+                                false, false, fetchGfycatOrRedgifsVideoLinksListener);
+                    } else {
+                        handler.post(() -> fetchGfycatOrRedgifsVideoLinksListener.failed(response.code()));
+                    }
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+                handler.post(() -> fetchGfycatOrRedgifsVideoLinksListener.failed(-1));
+            }
+        });
+    }
+
+    private static void parseGfycatVideoLinks(Handler handler, String response,
+                                              FetchGfycatOrRedgifsVideoLinksListener fetchGfycatOrRedgifsVideoLinksListener) {
+        try {
+            JSONObject jsonObject = new JSONObject(response);
+            String mp4 = jsonObject.getJSONObject(JSONUtils.GFY_ITEM_KEY).has(JSONUtils.MP4_URL_KEY) ?
+                    jsonObject.getJSONObject(JSONUtils.GFY_ITEM_KEY).getString(JSONUtils.MP4_URL_KEY)
+                    : jsonObject.getJSONObject(JSONUtils.GFY_ITEM_KEY)
+                    .getJSONObject(JSONUtils.CONTENT_URLS_KEY)
+                    .getJSONObject(JSONUtils.MP4_KEY)
+                    .getString(JSONUtils.URL_KEY);
+            String webm;
+            if (jsonObject.getJSONObject(JSONUtils.GFY_ITEM_KEY).has(JSONUtils.WEBM_URL_KEY)) {
+                webm = jsonObject.getJSONObject(JSONUtils.GFY_ITEM_KEY).getString(JSONUtils.WEBM_URL_KEY);
+            } else if (jsonObject.getJSONObject(JSONUtils.GFY_ITEM_KEY).getJSONObject(JSONUtils.CONTENT_URLS_KEY).has(JSONUtils.WEBM_KEY)) {
+                webm = jsonObject.getJSONObject(JSONUtils.GFY_ITEM_KEY)
+                        .getJSONObject(JSONUtils.CONTENT_URLS_KEY)
+                        .getJSONObject(JSONUtils.WEBM_KEY)
+                        .getString(JSONUtils.URL_KEY);
+            } else {
+                webm = mp4;
+            }
+            handler.post(() -> fetchGfycatOrRedgifsVideoLinksListener.success(webm, mp4));
+        } catch (JSONException e) {
+            e.printStackTrace();
+            handler.post(() -> fetchGfycatOrRedgifsVideoLinksListener.failed(-1));
+        }
+    }
+
+    private static void parseRedgifsVideoLinks(Handler handler, String response,
+                                              FetchGfycatOrRedgifsVideoLinksListener fetchGfycatOrRedgifsVideoLinksListener) {
+        try {
+            String mp4 = new JSONObject(response).getJSONObject(JSONUtils.GIF_KEY).getJSONObject(JSONUtils.URLS_KEY)
+                    .getString(JSONUtils.HD_KEY);
+            handler.post(() -> fetchGfycatOrRedgifsVideoLinksListener.success(mp4, mp4));
+        } catch (JSONException e) {
+            e.printStackTrace();
+            handler.post(() -> fetchGfycatOrRedgifsVideoLinksListener.failed(-1));
+        }
+    }
+}

app/src/main/java/eu/toldi/infinityforlemmy/FetchMyInfo.java

@@ -0,0 +1,103 @@
+package eu.toldi.infinityforlemmy;
+
+import android.os.AsyncTask;
+import android.text.Html;
+
+import androidx.annotation.NonNull;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import eu.toldi.infinityforlemmy.apis.LemmyAPI;
+import eu.toldi.infinityforlemmy.apis.RedditAPI;
+import eu.toldi.infinityforlemmy.utils.APIUtils;
+import eu.toldi.infinityforlemmy.utils.JSONUtils;
+import eu.toldi.infinityforlemmy.utils.LemmyUtils;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Retrofit;
+
+public class FetchMyInfo {
+
+    public static void fetchAccountInfo(final Retrofit retrofit, RedditDataRoomDatabase redditDataRoomDatabase,
+                                        String username,String accessToken, final FetchMyInfoListener fetchMyInfoListener) {
+        LemmyAPI api = retrofit.create(LemmyAPI.class);
+
+        Call<String> userInfo = api.userInfo(username,accessToken);
+        userInfo.enqueue(new Callback<String>() {
+            @Override
+            public void onResponse(@NonNull Call<String> call, @NonNull retrofit2.Response<String> response) {
+                if (response.isSuccessful()) {
+                    new ParseAndSaveAccountInfoAsyncTask(response.body(), redditDataRoomDatabase, fetchMyInfoListener).execute();
+                } else {
+                    fetchMyInfoListener.onFetchMyInfoFailed(false);
+                }
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
+                fetchMyInfoListener.onFetchMyInfoFailed(false);
+            }
+        });
+    }
+
+    public interface FetchMyInfoListener {
+        void onFetchMyInfoSuccess(String name, String display_name,String profileImageUrl, String bannerImageUrl);
+
+        void onFetchMyInfoFailed(boolean parseFailed);
+    }
+
+    private static class ParseAndSaveAccountInfoAsyncTask extends AsyncTask<Void, Void, Void> {
+        private JSONObject jsonResponse;
+        private RedditDataRoomDatabase redditDataRoomDatabase;
+        private FetchMyInfoListener fetchMyInfoListener;
+        private boolean parseFailed;
+
+        private String name;
+        private String profileImageUrl;
+        private String bannerImageUrl;
+
+        private String display_name;
+
+        ParseAndSaveAccountInfoAsyncTask(String response, RedditDataRoomDatabase redditDataRoomDatabase,
+                                         FetchMyInfoListener fetchMyInfoListener) {
+            try {
+                jsonResponse = new JSONObject(response);
+                this.redditDataRoomDatabase = redditDataRoomDatabase;
+                this.fetchMyInfoListener = fetchMyInfoListener;
+                parseFailed = false;
+            } catch (JSONException e) {
+                fetchMyInfoListener.onFetchMyInfoFailed(true);
+            }
+        }
+
+        @Override
+        protected Void doInBackground(Void... voids) {
+            try {
+                JSONObject person = jsonResponse.getJSONObject("person_view").getJSONObject("person");
+
+                name = LemmyUtils.actorID2FullName(person.getString("actor_id"));
+                if (!person.isNull("avatar")) {
+                    profileImageUrl = person.getString("avatar");
+                }
+                if (!person.isNull("banner")) {
+                    bannerImageUrl = person.getString("banner");
+                }
+                display_name = person.getString("name");
+                redditDataRoomDatabase.accountDao().updateAccountInfo(name, profileImageUrl, bannerImageUrl);
+            } catch (JSONException e) {
+                parseFailed = true;
+            }
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void aVoid) {
+            if (!parseFailed) {
+                fetchMyInfoListener.onFetchMyInfoSuccess(name,display_name, profileImageUrl, bannerImageUrl);
+            } else {
+                fetchMyInfoListener.onFetchMyInfoFailed(true);
+            }
+        }
+    }
+}

app/src/main/java/eu/toldi/infinityforlemmy/FetchPostFilterReadPostsAndConcatenatedSubredditNames.java

@@ -49,7 +49,7 @@ public class FetchPostFilterReadPostsAndConcatenatedSubredditNames {
             if (anonymousSubscribedSubreddits != null && !anonymousSubscribedSubreddits.isEmpty()) {
                 StringBuilder stringBuilder = new StringBuilder();
                 for (SubscribedSubredditData s : anonymousSubscribedSubreddits) {
-                    stringBuilder.append(s.getQualified_name()).append(",");
+                    stringBuilder.append(s.getName()).append("+");
                 }
                 if (stringBuilder.length() > 0) {
                     stringBuilder.deleteCharAt(stringBuilder.length() - 1);

app/src/main/java/eu/toldi/infinityforlemmy/FetchRedgifsVideoLinks.java

@@ -1,71 +0,0 @@
-package eu.toldi.infinityforlemmy;
-
-import android.os.Handler;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.util.concurrent.Executor;
-
-import eu.toldi.infinityforlemmy.apis.RedgifsAPI;
-import eu.toldi.infinityforlemmy.utils.JSONUtils;
-import retrofit2.Call;
-import retrofit2.Response;
-import retrofit2.Retrofit;
-
-public class FetchRedgifsVideoLinks {
-
-    public interface FetchRedgifsVideoLinksListener {
-        void success(String webm, String mp4);
-        void failed(int errorCode);
-    }
-
-    public static void fetchRedgifsVideoLinks(Executor executor, Handler handler, Retrofit redgifsRetrofit,
-                                              String redgifsId,
-                                              FetchRedgifsVideoLinksListener fetchRedgifsVideoLinksListener) {
-        executor.execute(() -> {
-            try {
-                Response<String> response = redgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(redgifsId).execute();
-                if (response.isSuccessful()) {
-                    parseRedgifsVideoLinks(handler, response.body(), fetchRedgifsVideoLinksListener);
-                } else {
-                    handler.post(() -> fetchRedgifsVideoLinksListener.failed(response.code()));
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-                handler.post(() -> fetchRedgifsVideoLinksListener.failed(-1));
-            }
-        });
-    }
-
-    public static void fetchRedgifsVideoLinksInRecyclerViewAdapter(Executor executor, Handler handler,
-                                                                   Call<String> redgifsCall,
-                                                                   FetchRedgifsVideoLinksListener fetchRedgifsVideoLinksListener) {
-        executor.execute(() -> {
-            try {
-                Response<String> response = redgifsCall.execute();
-                if (response.isSuccessful()) {
-                    parseRedgifsVideoLinks(handler, response.body(), fetchRedgifsVideoLinksListener);
-                } else {
-                    handler.post(() -> fetchRedgifsVideoLinksListener.failed(response.code()));
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-                handler.post(() -> fetchRedgifsVideoLinksListener.failed(-1));
-            }
-        });
-    }
-
-    private static void parseRedgifsVideoLinks(Handler handler, String response,
-                                              FetchRedgifsVideoLinksListener fetchRedgifsVideoLinksListener) {
-        try {
-            String mp4 = new JSONObject(response).getJSONObject(JSONUtils.GIF_KEY).getJSONObject(JSONUtils.URLS_KEY)
-                    .getString(JSONUtils.HD_KEY);
-            handler.post(() -> fetchRedgifsVideoLinksListener.success(mp4, mp4));
-        } catch (JSONException e) {
-            e.printStackTrace();
-            handler.post(() -> fetchRedgifsVideoLinksListener.failed(-1));
-        }
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/FetchStreamableVideo.java

@@ -20,7 +20,6 @@ import retrofit2.Response;
 public class FetchStreamableVideo {
     public interface FetchStreamableVideoListener {
         void success(StreamableVideo streamableVideo);
-
         void failed();
     }
 
@@ -34,12 +33,7 @@ public class FetchStreamableVideo {
                     String title = jsonObject.getString(JSONUtils.TITLE_KEY);
                     JSONObject filesObject = jsonObject.getJSONObject(JSONUtils.FILES_KEY);
                     StreamableVideo.Media mp4 = parseMedia(filesObject.getJSONObject(JSONUtils.MP4_KEY));
-                    StreamableVideo.Media mp4MobileTemp = null;
-                    try {
-                        mp4MobileTemp = parseMedia(filesObject.getJSONObject(JSONUtils.MP4_MOBILE_KEY));
-                    } catch (JSONException e) {
-                    }
-                    StreamableVideo.Media mp4Mobile = mp4MobileTemp;
+                    StreamableVideo.Media mp4Mobile = parseMedia(filesObject.getJSONObject(JSONUtils.MP4_MOBILE_KEY));
                     handler.post(() -> fetchStreamableVideoListener.success(new StreamableVideo(title, mp4, mp4Mobile)));
                 } else {
                     handler.post(fetchStreamableVideoListener::failed);
@@ -61,12 +55,7 @@ public class FetchStreamableVideo {
                     String title = jsonObject.getString(JSONUtils.TITLE_KEY);
                     JSONObject filesObject = jsonObject.getJSONObject(JSONUtils.FILES_KEY);
                     StreamableVideo.Media mp4 = parseMedia(filesObject.getJSONObject(JSONUtils.MP4_KEY));
-                    StreamableVideo.Media mp4MobileTemp = null;
-                    try {
-                        mp4MobileTemp = parseMedia(filesObject.getJSONObject(JSONUtils.MP4_MOBILE_KEY));
-                    } catch (JSONException e) {
-                    }
-                    StreamableVideo.Media mp4Mobile = mp4MobileTemp;
+                    StreamableVideo.Media mp4Mobile = parseMedia(filesObject.getJSONObject(JSONUtils.MP4_MOBILE_KEY));
                     if (mp4 == null && mp4Mobile == null) {
                         handler.post(fetchStreamableVideoListener::failed);
                         return;

app/src/main/java/eu/toldi/infinityforlemmy/Infinity.java

@@ -11,16 +11,6 @@ import android.os.Bundle;
 import android.view.WindowManager;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
-import androidx.lifecycle.ProcessLifecycleOwner;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader;
-import com.bumptech.glide.load.model.GlideUrl;
 import com.evernote.android.state.StateSaver;
 import com.livefront.bridge.Bridge;
 import com.livefront.bridge.SavedStateHandler;
@@ -28,11 +18,15 @@ import com.livefront.bridge.SavedStateHandler;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.io.InputStream;
-
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import eu.toldi.infinityforlemmy.activities.LockScreenActivity;
 import eu.toldi.infinityforlemmy.broadcastreceivers.NetworkWifiStatusReceiver;
 import eu.toldi.infinityforlemmy.broadcastreceivers.WallpaperChangeReceiver;
@@ -44,8 +38,6 @@ import eu.toldi.infinityforlemmy.font.FontFamily;
 import eu.toldi.infinityforlemmy.font.TitleFontFamily;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
-import okhttp3.Call;
-import okhttp3.OkHttpClient;
 
 public class Infinity extends Application implements LifecycleObserver {
     public Typeface typeface;
@@ -63,9 +55,6 @@ public class Infinity extends Application implements LifecycleObserver {
     @Inject
     @Named("security")
     SharedPreferences mSecuritySharedPreferences;
-    @Inject
-    @Named("glide")
-    OkHttpClient glideOkHttpClient;
 
     @Override
     public void onCreate() {
@@ -170,9 +159,6 @@ public class Infinity extends Application implements LifecycleObserver {
         registerReceiver(mNetworkWifiStatusReceiver, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
 
         registerReceiver(new WallpaperChangeReceiver(mSharedPreferences), new IntentFilter(Intent.ACTION_WALLPAPER_CHANGED));
-
-        OkHttpUrlLoader.Factory factory = new OkHttpUrlLoader.Factory((Call.Factory) glideOkHttpClient);
-        Glide.get(this).getRegistry().replace(GlideUrl.class, InputStream.class, factory);
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_START)

app/src/main/java/eu/toldi/infinityforlemmy/NetworkModule.java

@@ -9,16 +9,16 @@ import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
-import eu.toldi.infinityforlemmy.apis.RedgifsAPI;
 import eu.toldi.infinityforlemmy.apis.StreamableAPI;
-import eu.toldi.infinityforlemmy.comment.LemmyCommentAPI;
-import eu.toldi.infinityforlemmy.post.LemmyPostAPI;
-import eu.toldi.infinityforlemmy.privatemessage.LemmyPrivateMessageAPI;
+import eu.toldi.infinityforlemmy.network.SortTypeConverterFactory;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
 import okhttp3.ConnectionPool;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
+import retrofit2.adapter.guava.GuavaCallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.converter.scalars.ScalarsConverterFactory;
 
 @Module(includes = AppModule.class)
 abstract class NetworkModule {
@@ -35,21 +35,6 @@ abstract class NetworkModule {
                 .build();
     }
 
-    @Provides
-    @Named("glide")
-    @Singleton
-    static OkHttpClient provideGlideOkHttp(@Named("base") OkHttpClient baseOkHttp,
-                                           @Named("RedgifsAccessTokenAuthenticator") Interceptor redGifsAuthenticator) {
-        return baseOkHttp.newBuilder()
-                .addInterceptor(chain -> chain.proceed(
-                        chain.request()
-                                .newBuilder()
-                                .header("User-Agent", APIUtils.USER_AGENT)
-                                .build()
-                ))
-                .addInterceptor(redGifsAuthenticator)
-                .build();
-    }
 
     @Provides
     @Named("base")
@@ -143,6 +128,15 @@ abstract class NetworkModule {
                 .build();
     }
 
+    @Provides
+    @Named("gfycat")
+    @Singleton
+    static Retrofit provideGfycatRetrofit(@Named("base") RetrofitHolder retrofit) {
+        return retrofit.getRetrofit().newBuilder()
+                .baseUrl(APIUtils.GFYCAT_API_BASE_URI)
+                .build();
+    }
+
     @Provides
     @Named("RedgifsAccessTokenAuthenticator")
     static Interceptor redgifsAccessTokenAuthenticator(@Named("current_account") SharedPreferences currentAccountSharedPreferences) {
@@ -172,12 +166,6 @@ abstract class NetworkModule {
                 .build();
     }
 
-    @Provides
-    @Singleton
-    static RedgifsAPI provideRedgifsAPI(@Named("redgifs") Retrofit redgifsRetrofit) {
-        return redgifsRetrofit.create(RedgifsAPI.class);
-    }
-
     @Provides
     @Named("imgur")
     @Singleton
@@ -228,31 +216,4 @@ abstract class NetworkModule {
     static StreamableAPI provideStreamableApi(@Named("streamable") Retrofit streamableRetrofit) {
         return streamableRetrofit.create(StreamableAPI.class);
     }
-
-    @Provides
-    @Singleton
-    static LemmyPostAPI providePostAPI(@Named("no_oauth") RetrofitHolder retrofitHolder) {
-        return new LemmyPostAPI(retrofitHolder);
-    }
-
-    @Provides
-    @Singleton
-    static LemmyCommentAPI provideCommentAPI(@Named("no_oauth") RetrofitHolder retrofitHolder) {
-        return new LemmyCommentAPI(retrofitHolder);
-    }
-
-    @Provides
-    @Singleton
-    static LemmyPrivateMessageAPI provideLemmyPrivateMessageAPI(@Named("base") RetrofitHolder retrofit) {
-        return new LemmyPrivateMessageAPI(retrofit);
-    }
-
-    @Provides
-    @Named("lemmyVerse")
-    @Singleton
-    static Retrofit provideLemmyVerseRetrofit(@Named("base") RetrofitHolder retrofit) {
-        return retrofit.getRetrofit().newBuilder()
-                .baseUrl(APIUtils.LEMMYVERSE_API_BASE_URI)
-                .build();
-    }
 }

app/src/main/java/eu/toldi/infinityforlemmy/ParseSubscribedThing.java

@@ -110,9 +110,9 @@ class ParseSubscribedThing {
                     boolean postingRestrictedToMods = community.getBoolean("posting_restricted_to_mods");
                     int instanceId = community.getInt("instance_id");
                     int subscribers = data.getJSONObject("counts").getInt("subscribers");
-                    boolean isBlocked = data.getBoolean("blocked");
-                    newSubscribedSubredditData.add(new SubscribedSubredditData(id, title, LemmyUtils.actorID2FullName(actorId), iconUrl, accountName, false));
-                    newSubredditData.add(new SubredditData(id, name, title, description, removed, published, updated, deleted, nsfw, actorId, local, iconUrl, bannerImageUrl, hidden, postingRestrictedToMods, instanceId, subscribers, isBlocked));
+
+                    newSubscribedSubredditData.add(new SubscribedSubredditData(id, title, LemmyUtils.actorID2FullName(actorId), iconUrl, accountName));
+                    newSubredditData.add(new SubredditData(id,name,title,description,removed,published,updated,deleted,nsfw,actorId,local,iconUrl,bannerImageUrl,hidden,postingRestrictedToMods,instanceId,subscribers));
 
                 }
             } catch (JSONException e) {

app/src/main/java/eu/toldi/infinityforlemmy/PostEnricherModule.java

@@ -1,27 +0,0 @@
-package eu.toldi.infinityforlemmy;
-
-import java.util.Set;
-
-import dagger.Module;
-import dagger.Provides;
-import dagger.multibindings.IntoSet;
-import eu.toldi.infinityforlemmy.apis.RedgifsAPI;
-import eu.toldi.infinityforlemmy.post.enrich.CompositePostEnricher;
-import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
-import eu.toldi.infinityforlemmy.post.enrich.RedGifsPostEnricher;
-
-
-@Module
-abstract class PostEnricherModule {
-
-    @Provides
-    @IntoSet
-    static PostEnricher provideRedGifsPostEnricher(RedgifsAPI redgifsAPI) {
-        return new RedGifsPostEnricher(redgifsAPI);
-    }
-
-    @Provides
-    static PostEnricher providePostEnricher(Set<PostEnricher> postEnrichers) {
-        return new CompositePostEnricher(postEnrichers);
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/RedditDataRoomDatabase.java

@@ -13,16 +13,6 @@ import androidx.sqlite.db.SupportSQLiteDatabase;
 
 import eu.toldi.infinityforlemmy.account.Account;
 import eu.toldi.infinityforlemmy.account.AccountDao;
-import eu.toldi.infinityforlemmy.blockedcommunity.BlockedCommunityDao;
-import eu.toldi.infinityforlemmy.blockedcommunity.BlockedCommunityData;
-import eu.toldi.infinityforlemmy.blockedinstances.BlockedInstanceDao;
-import eu.toldi.infinityforlemmy.blockedinstances.BlockedInstanceData;
-import eu.toldi.infinityforlemmy.blockeduser.BlockedUserDao;
-import eu.toldi.infinityforlemmy.blockeduser.BlockedUserData;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilter;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilterDao;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilterUsage;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilterUsageDao;
 import eu.toldi.infinityforlemmy.customtheme.CustomTheme;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeDao;
 import eu.toldi.infinityforlemmy.multireddit.AnonymousMultiredditSubreddit;
@@ -48,8 +38,7 @@ import eu.toldi.infinityforlemmy.user.UserData;
 
 @Database(entities = {Account.class, SubredditData.class, SubscribedSubredditData.class, UserData.class,
         SubscribedUserData.class, MultiReddit.class, CustomTheme.class, RecentSearchQuery.class,
-        ReadPost.class, PostFilter.class, PostFilterUsage.class, AnonymousMultiredditSubreddit.class,
-        BlockedUserData.class, BlockedCommunityData.class, BlockedInstanceData.class, CommentFilter.class, CommentFilterUsage.class}, version = 30)
+        ReadPost.class, PostFilter.class, PostFilterUsage.class, AnonymousMultiredditSubreddit.class}, version = 23)
 public abstract class RedditDataRoomDatabase extends RoomDatabase {
 
     public static RedditDataRoomDatabase create(final Context context) {
@@ -60,9 +49,7 @@ public abstract class RedditDataRoomDatabase extends RoomDatabase {
                         MIGRATION_9_10, MIGRATION_10_11, MIGRATION_11_12, MIGRATION_12_13,
                         MIGRATION_13_14, MIGRATION_14_15, MIGRATION_15_16, MIGRATION_16_17,
                         MIGRATION_17_18, MIGRATION_18_19, MIGRATION_19_20, MIGRATION_20_21,
-                        MIGRATION_21_22, MIGRATION_22_23, MIGRATION_23_24, MIGRATION_24_25,
-                        MIGRATION_25_26, MIGRATION_26_27, MIGRATION_27_28, MIGRATION_28_29,
-                        MIGRATION_29_30)
+                        MIGRATION_21_22, MIGRATION_22_23)
                 .build();
     }
 
@@ -72,12 +59,6 @@ public abstract class RedditDataRoomDatabase extends RoomDatabase {
 
     public abstract SubscribedSubredditDao subscribedSubredditDao();
 
-    public abstract BlockedUserDao blockedUserDao();
-
-    public abstract BlockedCommunityDao blockedCommunityDao();
-
-    public abstract BlockedInstanceDao blockedInstanceDao();
-
     public abstract UserDao userDao();
 
     public abstract SubscribedUserDao subscribedUserDao();
@@ -96,10 +77,6 @@ public abstract class RedditDataRoomDatabase extends RoomDatabase {
 
     public abstract AnonymousMultiredditSubredditDao anonymousMultiredditSubredditDao();
 
-    public abstract CommentFilterDao commentFilterDao();
-
-    public abstract CommentFilterUsageDao commentFilterUsageDao();
-
     private static final Migration MIGRATION_1_2 = new Migration(1, 2) {
         @Override
         public void migrate(SupportSQLiteDatabase database) {
@@ -406,68 +383,4 @@ public abstract class RedditDataRoomDatabase extends RoomDatabase {
             }
         }
     };
-
-    private static final Migration MIGRATION_23_24 = new Migration(23, 24) {
-        @Override
-        public void migrate(@NonNull SupportSQLiteDatabase database) {
-            database.execSQL("ALTER TABLE accounts ADD COLUMN can_downvote INTEGER DEFAULT 1 NOT NULL");
-        }
-    };
-
-    private static final Migration MIGRATION_24_25 = new Migration(24, 25) {
-        @Override
-        public void migrate(@NonNull SupportSQLiteDatabase database) {
-            database.execSQL("ALTER TABLE subreddits ADD COLUMN blocked INTEGER DEFAULT 1 NOT NULL");
-        }
-    };
-
-    private static final Migration MIGRATION_25_26 = new Migration(25, 26) {
-        @Override
-        public void migrate(@NonNull SupportSQLiteDatabase database) {
-            database.execSQL("CREATE TABLE blocked_users" +
-                    "(name TEXT, id INTEGER NOT NULL, avatar TEXT, qualified_name TEXT, account_name TEXT NOT NULL, PRIMARY KEY( id, account_name))");
-            database.execSQL("CREATE TABLE blocked_communities" +
-                    "(name TEXT, icon TEXT, id INTEGER NOT NULL, qualified_name TEXT, account_name TEXT NOT NULL, PRIMARY KEY( id, account_name))");
-
-        }
-    };
-
-    private static final Migration MIGRATION_26_27 = new Migration(26, 27) {
-        @Override
-        public void migrate(@NonNull SupportSQLiteDatabase database) {
-            database.execSQL("ALTER TABLE subscribed_subreddits"
-                    + " ADD COLUMN is_favorite INTEGER DEFAULT 0 NOT NULL");
-        }
-    };
-
-    private static final Migration MIGRATION_27_28 = new Migration(27, 28) {
-        @Override
-        public void migrate(@NonNull SupportSQLiteDatabase database) {
-            database.execSQL("ALTER TABLE custom_themes ADD COLUMN filled_card_view_background_color INTEGER DEFAULT " + Color.parseColor("#E6F4FF") + " NOT NULL");
-            database.execSQL("ALTER TABLE custom_themes ADD COLUMN read_post_filled_card_view_background_color INTEGER DEFAULT " + Color.parseColor("#F5F5F5") + " NOT NULL");
-            database.execSQL("CREATE TABLE comment_filter " +
-                    "(name TEXT NOT NULL PRIMARY KEY, max_vote INTEGER NOT NULL, min_vote INTEGER NOT NULL, exclude_strings TEXT, exclude_users TEXT)");
-            database.execSQL("CREATE TABLE comment_filter_usage (name TEXT NOT NULL, usage INTEGER NOT NULL, " +
-                    "name_of_usage TEXT NOT NULL, PRIMARY KEY(name, usage, name_of_usage), FOREIGN KEY(name) REFERENCES comment_filter(name) ON DELETE CASCADE)");
-        }
-    };
-
-    private static final Migration MIGRATION_28_29 = new Migration(28, 29) {
-        @Override
-        public void migrate(@NonNull SupportSQLiteDatabase database) {
-            database.execSQL("CREATE TABLE blocked_instances" +
-                    "(domain TEXT, id INTEGER NOT NULL, account_name TEXT NOT NULL, PRIMARY KEY( id, account_name))");
-
-        }
-    };
-
-    private static final Migration MIGRATION_29_30 = new Migration(29, 30) {
-        @Override
-        public void migrate(@NonNull SupportSQLiteDatabase database) {
-            // Alter table "blocked_instances" to add new columns "instance_name" and "icon"
-            database.execSQL("ALTER TABLE blocked_instances ADD COLUMN instance_name TEXT");
-            database.execSQL("ALTER TABLE blocked_instances ADD COLUMN icon TEXT");
-
-        }
-    };
 }

app/src/main/java/eu/toldi/infinityforlemmy/RedgifsAccessTokenAuthenticator.java

@@ -14,6 +14,7 @@ import java.util.Map;
 import eu.toldi.infinityforlemmy.apis.RedgifsAPI;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
+import okhttp3.Headers;
 import okhttp3.Interceptor;
 import okhttp3.Response;
 import retrofit2.Call;
@@ -21,8 +22,6 @@ import retrofit2.Retrofit;
 import retrofit2.converter.scalars.ScalarsConverterFactory;
 
 public class RedgifsAccessTokenAuthenticator implements Interceptor {
-    private static final String REDGIFS_HOST = "redgifs.com";
-
     private SharedPreferences mCurrentAccountSharedPreferences;
 
     public RedgifsAccessTokenAuthenticator(SharedPreferences currentAccountSharedPreferences) {
@@ -61,17 +60,7 @@ public class RedgifsAccessTokenAuthenticator implements Interceptor {
     @NonNull
     @Override
     public Response intercept(@NonNull Chain chain) throws IOException {
-        if (!chain.request().url().host().endsWith(REDGIFS_HOST)) {
-            return chain.proceed(chain.request());
-        }
-
-        String currentAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.REDGIFS_ACCESS_TOKEN, "");
-        Response response = chain.proceed(
-                chain.request().newBuilder()
-                        .addHeader(APIUtils.AUTHORIZATION_KEY, APIUtils.AUTHORIZATION_BASE + currentAccessToken)
-                        .build()
-        );
-
+        Response response = chain.proceed(chain.request());
         if (response.code() == 401 || response.code() == 400) {
             String accessTokenHeader = response.request().header(APIUtils.AUTHORIZATION_KEY);
             if (accessTokenHeader == null) {
@@ -85,21 +74,13 @@ public class RedgifsAccessTokenAuthenticator implements Interceptor {
                     String newAccessToken = refreshAccessToken();
                     if (!newAccessToken.equals("")) {
                         response.close();
-                        return chain.proceed(
-                                chain.request().newBuilder()
-                                        .addHeader(APIUtils.AUTHORIZATION_KEY, APIUtils.AUTHORIZATION_BASE + newAccessToken)
-                                        .build()
-                        );
+                        return chain.proceed(response.request().newBuilder().headers(Headers.of(APIUtils.getRedgifsOAuthHeader(newAccessToken))).build());
                     } else {
                         return response;
                     }
                 } else {
                     response.close();
-                    return chain.proceed(
-                            chain.request().newBuilder()
-                                    .addHeader(APIUtils.AUTHORIZATION_KEY, APIUtils.AUTHORIZATION_BASE + accessTokenFromSharedPreferences)
-                                    .build()
-                    );
+                    return chain.proceed(response.request().newBuilder().headers(Headers.of(APIUtils.getRedgifsOAuthHeader(accessTokenFromSharedPreferences))).build());
                 }
             }
         }

app/src/main/java/eu/toldi/infinityforlemmy/RetrofitHolder.java

@@ -1,10 +1,7 @@
 package eu.toldi.infinityforlemmy;
 
-import android.util.Log;
-
 import eu.toldi.infinityforlemmy.network.SortTypeConverterFactory;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
-import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
 import retrofit2.adapter.guava.GuavaCallAdapterFactory;
@@ -15,14 +12,8 @@ public class RetrofitHolder {
 
     private Retrofit retrofit;
     private OkHttpClient okHttpClient;
-
-    private OkHttpClient okHttpClientBase;
     private String baseURL = APIUtils.API_BASE_URI;
 
-    private String accessToken = null;
-
-    private Interceptor oAuthInterceptor;
-
     public Retrofit getRetrofit() {
         return retrofit;
     }
@@ -33,16 +24,11 @@ public class RetrofitHolder {
     }
 
     public String getBaseURL() {
-        String result = baseURL;
-        if (baseURL.endsWith("/")) {
-            result = baseURL.substring(0, baseURL.length() - 1);
-        }
-        return result;
+        return baseURL;
     }
 
     public RetrofitHolder(OkHttpClient okHttpClient) {
         this.okHttpClient = okHttpClient;
-        this.okHttpClientBase = okHttpClient;
         this.retrofit = createRetrofit(okHttpClient, APIUtils.API_BASE_URI);
     }
 
@@ -56,18 +42,4 @@ public class RetrofitHolder {
                 .addConverterFactory(GsonConverterFactory.create())
                 .build();
     }
-
-    public void setAccessToken(String accessToken) {
-        this.accessToken = accessToken;
-        OkHttpClient.Builder builder = okHttpClientBase.newBuilder();
-        Log.d("RetrofitHolder", "Access token changed");
-        if (accessToken != null && !accessToken.equals("")) {
-            Log.i("RetrofitHolder", "Setting access token interceptor");
-            oAuthInterceptor = APIUtils.getOAuthInterceptor(accessToken);
-            builder.addInterceptor(oAuthInterceptor);
-        }
-        okHttpClient = builder.build();
-        retrofit = createRetrofit(okHttpClient, baseURL);
-    }
-
 }

app/src/main/java/eu/toldi/infinityforlemmy/SortType.java

@@ -35,23 +35,20 @@ public class SortType {
         NEW("New", "New"),
         OLD("Old", "Old"),
         TOP("Top", "Top"),
-        MOST_COMMENTS("MostComments", "Most Comments"),
-        NEW_COMMENTS("NewComments", "New Comments"),
+        MOST_COMMENTS("MostCommentes", "Most Commentes"),
+        NEW_COMMENTS("NewCommentes", "New Commentes"),
 
         TOP_HOUR("TopHour", "Top"),
         TOP_SIX_HOURS("TopSixHour", "Top"),
         TOP_TWELVE_HOURS("TopTwelveHour", "Top"),
         TOP_DAY("TopDay", "Top"),
         TOP_WEEK("TopWeek", "Top"),
-        TOP_MONTH("TopMonth", "Top"),
+        TOP_MONTH("month", "Top"),
         TOP_THREE_MONTHS("TopThreeMonths", "Top"),
         TOP_SIX_MONTHS("TopSixMonths", "Top"),
         TOP_NINE_MONTHS("TopNineMonths", "Top"),
         TOP_YEAR("TopYear", "Top"),
-        TOP_ALL("TopAll", "Top"),
-
-        SCALED("Scaled", "Scaled"),
-        CONTROVERSIAL("Controversial", "Controversial");
+        TOP_ALL("TopAll", "Top");
 
         public final String value;
         public final String fullName;
@@ -72,15 +69,15 @@ public class SortType {
     }
 
     public enum Time {
-        HOUR("hour", "Hour"),
-        SIX_HOURS("SixHour", "Six Hours"),
-        TWELVE_HOURS("TwelveHour", "Twelve Hours"),
+        HOUR("TopHour", "Top Hour"),
+        SIX_HOURS("TopSixHour", "Top Six Hours"),
+        TWELVE_HOURS("TopTwelveHour", "Top Twelve Hours"),
         DAY("day", "Day"),
         WEEK("week", "Week"),
         MONTH("month", "Month"),
-        THREE_MONTHS("ThreeMonths", "Three Months"),
-        SIX_MONTHS("SixMonths", "Six Months"),
-        NINE_MONTHS("NineMonths", "Nine Months"),
+        THREE_MONTHS("TopThreeMonth", "Top Three Months"),
+        SIX_MONTHS("TopSixMonth", "Top Six Months"),
+        NINE_MONTHS("TopNineMonth", "Top Nine Months"),
         YEAR("year", "Year"),
         ALL("all", "All Time");
 
@@ -91,14 +88,5 @@ public class SortType {
             this.value = value;
             this.fullName = fullName;
         }
-
-        public static Time fromValue(String value) {
-            for (Time time : values()) {
-                if (time.value.equalsIgnoreCase(value)) {
-                    return time;
-                }
-            }
-            return null;
-        }
     }
 }

app/src/main/java/eu/toldi/infinityforlemmy/account/Account.java

@@ -32,9 +32,6 @@ public class Account implements Parcelable {
     @ColumnInfo(name = "instance_url")
     private String instance_url;
 
-    @ColumnInfo(name = "can_downvote")
-    private boolean canDownvote = true;
-
     @Ignore
     protected Account(Parcel in) {
         accountName = in.readString();
@@ -45,7 +42,6 @@ public class Account implements Parcelable {
         code = in.readString();
         isCurrentUser = in.readByte() != 0;
         instance_url = in.readString();
-        canDownvote = in.readByte() != 0;
     }
 
     public static final Creator<Account> CREATOR = new Creator<Account>() {
@@ -62,11 +58,11 @@ public class Account implements Parcelable {
 
     @Ignore
     public static Account getAnonymousAccount() {
-        return new Account("-",null, null, null, null, null, false,null,true);
+        return new Account("-",null, null, null, null, null, false,null);
     }
 
     public Account(@NonNull String accountName, String display_name, String accessToken, String code,
-                   String profileImageUrl, String bannerImageUrl, boolean isCurrentUser,String instance_url, boolean canDownvote) {
+                   String profileImageUrl, String bannerImageUrl, boolean isCurrentUser,String instance_url) {
         this.accountName = accountName;
         this.display_name = display_name;
         this.accessToken = accessToken;
@@ -75,7 +71,6 @@ public class Account implements Parcelable {
         this.bannerImageUrl = bannerImageUrl;
         this.isCurrentUser = isCurrentUser;
         this.instance_url = instance_url;
-        this.canDownvote = canDownvote;
     }
 
     @NonNull
@@ -121,10 +116,6 @@ public class Account implements Parcelable {
         return instance_url;
     }
 
-    public boolean canDownvote() {
-        return canDownvote;
-    }
-
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(accountName);
@@ -135,6 +126,5 @@ public class Account implements Parcelable {
         dest.writeString(code);
         dest.writeByte((byte) (isCurrentUser ? 1 : 0));
         dest.writeString(instance_url);
-        dest.writeByte((byte) (canDownvote ? 1 : 0));
     }
 }

app/src/main/java/eu/toldi/infinityforlemmy/account/FetchBlockedThings.java

@@ -1,111 +0,0 @@
-package eu.toldi.infinityforlemmy.account;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import eu.toldi.infinityforlemmy.apis.LemmyAPI;
-import eu.toldi.infinityforlemmy.blockedcommunity.BlockedCommunityData;
-import eu.toldi.infinityforlemmy.blockedinstances.BlockedInstanceData;
-import eu.toldi.infinityforlemmy.blockeduser.BlockedUserData;
-import eu.toldi.infinityforlemmy.subreddit.ParseSubredditData;
-import eu.toldi.infinityforlemmy.subreddit.SubredditData;
-import eu.toldi.infinityforlemmy.utils.LemmyUtils;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Retrofit;
-
-public class FetchBlockedThings {
-
-    public static void fetchBlockedThings(Retrofit mRetrofit, String accessToken, String accountName, FetchBlockedThingsListener fetchBlockedThingsListener) {
-        LemmyAPI lemmyAPI = mRetrofit.create(LemmyAPI.class);
-
-        Call<String> call = lemmyAPI.getSiteInfo(accessToken);
-        call.enqueue(new Callback<String>() {
-            @Override
-            public void onResponse(Call<String> call, retrofit2.Response<String> response) {
-                if (response.isSuccessful()) {
-                    String siteInfo = response.body();
-                    if (siteInfo != null) {
-                        List<BlockedUserData> blockedUsers = new ArrayList<>();
-                        List<BlockedCommunityData> blockedCommunities = new ArrayList<>();
-                        List<BlockedInstanceData> blockedInstances = new ArrayList<>();
-
-                        try {
-                            JSONObject siteInfoJson = new JSONObject(siteInfo).getJSONObject("my_user");
-                            JSONArray blockedUsersJson = (siteInfoJson.has("person_blocks")) ? siteInfoJson.getJSONArray("person_blocks") : null;
-                            JSONArray blockedCommunitiesJson = (siteInfoJson.has("community_blocks")) ? siteInfoJson.getJSONArray("community_blocks") : null;
-                            JSONArray blockedInstancesJson = (siteInfoJson.has("instance_blocks")) ? siteInfoJson.getJSONArray("instance_blocks") : null;
-                            if (blockedUsersJson != null) {
-                                for (int i = 0; i < blockedUsersJson.length(); i++) {
-                                    JSONObject blockedUserJson = blockedUsersJson.getJSONObject(i).getJSONObject("target");
-                                    int id = blockedUserJson.getInt("id");
-                                    String name = blockedUserJson.getString("name");
-                                    String avatar = "";
-                                    if (blockedUserJson.has("avatar"))
-                                        avatar = blockedUserJson.getString("avatar");
-
-                                    String qualifiedName = LemmyUtils.actorID2FullName(blockedUserJson.getString("actor_id"));
-                                    BlockedUserData blockedUserData = new BlockedUserData(id, name, avatar, qualifiedName, accountName);
-
-                                    blockedUsers.add(blockedUserData);
-                                }
-                            }
-                            if (blockedCommunitiesJson != null) {
-                                for (int i = 0; i < blockedCommunitiesJson.length(); i++) {
-                                    JSONObject blockedCommunityJson = blockedCommunitiesJson.getJSONObject(i);
-                                    SubredditData blockedCommunityData = ParseSubredditData.parseSubredditData(blockedCommunityJson, true);
-                                    blockedCommunities.add(new BlockedCommunityData(blockedCommunityData, accountName));
-                                }
-                            }
-                            if (blockedInstancesJson != null) {
-                                for (int i = 0; i < blockedInstancesJson.length(); i++) {
-                                    JSONObject blockedInstanceJson = blockedInstancesJson.getJSONObject(i);
-                                    // Get the "instance" object if it exists
-                                    JSONObject instanceJson = blockedInstanceJson.has("instance") ? blockedInstanceJson.getJSONObject("instance") : null;
-                                    if (instanceJson == null) {
-                                        continue;
-                                    }
-                                    int id = instanceJson.getInt("id");
-                                    String domain = instanceJson.getString("domain");
-                                    JSONObject siteJson = blockedInstanceJson.has("site") ? blockedInstanceJson.getJSONObject("site") : null;
-                                    if (siteJson == null) {
-                                        blockedInstances.add(new BlockedInstanceData(id, domain, null, null, accountName));
-                                        continue;
-                                    }
-
-                                    String name = siteJson.getString("name");
-                                    String icon = siteJson.optString("icon");
-                                    blockedInstances.add(new BlockedInstanceData(id, domain, name, icon, accountName));
-                                }
-                            }
-
-                            fetchBlockedThingsListener.onFetchBlockedThingsSuccess(blockedUsers, blockedCommunities, blockedInstances);
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                            fetchBlockedThingsListener.onFetchBlockedThingsFailure();
-                        }
-                    } else {
-                        fetchBlockedThingsListener.onFetchBlockedThingsFailure();
-                    }
-                } else {
-                    fetchBlockedThingsListener.onFetchBlockedThingsFailure();
-                }
-            }
-
-            @Override
-            public void onFailure(Call<String> call, Throwable t) {
-                fetchBlockedThingsListener.onFetchBlockedThingsFailure();
-            }
-        });
-    }
-
-    public interface FetchBlockedThingsListener {
-        void onFetchBlockedThingsSuccess(List<BlockedUserData> blockedUsers, List<BlockedCommunityData> blockedCommunities, List<BlockedInstanceData> blockedInstances);
-
-        void onFetchBlockedThingsFailure();
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/activities/AccountSavedThingActivity.java

@@ -283,17 +283,17 @@ public class AccountSavedThingActivity extends BaseActivity implements ActivityT
                 PostFragment fragment = new PostFragment();
                 Bundle bundle = new Bundle();
                 bundle.putInt(PostFragment.EXTRA_POST_TYPE, PostPagingSource.TYPE_USER);
-                bundle.putString(PostFragment.EXTRA_USER_NAME, mAccountQualifiedName);
+                bundle.putString(PostFragment.EXTRA_USER_NAME, mAccountName);
                 bundle.putString(PostFragment.EXTRA_USER_WHERE, PostPagingSource.USER_WHERE_SAVED);
                 bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
+                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
                 bundle.putBoolean(PostFragment.EXTRA_DISABLE_READ_POSTS, true);
                 fragment.setArguments(bundle);
                 return fragment;
             }
             CommentsListingFragment fragment = new CommentsListingFragment();
             Bundle bundle = new Bundle();
-            bundle.putString(CommentsListingFragment.EXTRA_USERNAME, mAccountQualifiedName);
+            bundle.putString(CommentsListingFragment.EXTRA_USERNAME, mAccountName);
             bundle.putString(CommentsListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
             bundle.putString(CommentsListingFragment.EXTRA_ACCOUNT_NAME, mAccountName);
             bundle.putBoolean(CommentsListingFragment.EXTRA_ARE_SAVED_COMMENTS, true);

app/src/main/java/eu/toldi/infinityforlemmy/activities/BaseActivity.java

@@ -42,7 +42,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.shape.CornerFamily;
 import com.google.android.material.shape.MaterialShapeDrawable;
 import com.google.android.material.shape.ShapeAppearanceModel;
-import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
 
 import java.lang.reflect.Field;
@@ -322,12 +321,6 @@ public abstract class BaseActivity extends AppCompatActivity implements CustomFo
         applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, collapsingToolbarLayout, toolbar, true);
     }
 
-    protected Snackbar applySnackBarTheme(Snackbar snackbar) {
-        snackbar.setBackgroundTint(customThemeWrapper.getBackgroundColor());
-        snackbar.setTextColor(customThemeWrapper.getSecondaryTextColor());
-        return snackbar;
-    }
-
     protected void applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(AppBarLayout appBarLayout, @Nullable CollapsingToolbarLayout collapsingToolbarLayout, Toolbar toolbar, boolean setToolbarBackgroundColor) {
         appBarLayout.setBackgroundColor(customThemeWrapper.getColorPrimary());
         if (collapsingToolbarLayout != null) {

app/src/main/java/eu/toldi/infinityforlemmy/activities/BlockedThingListingActivity.java

@@ -1,439 +0,0 @@
-package eu.toldi.infinityforlemmy.activities;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.core.view.inputmethod.EditorInfoCompat;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-
-import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.appbar.CollapsingToolbarLayout;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.tabs.TabLayout;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.util.List;
-import java.util.concurrent.Executor;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import eu.toldi.infinityforlemmy.ActivityToolbarInterface;
-import eu.toldi.infinityforlemmy.FragmentCommunicator;
-import eu.toldi.infinityforlemmy.Infinity;
-import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
-import eu.toldi.infinityforlemmy.RetrofitHolder;
-import eu.toldi.infinityforlemmy.account.FetchBlockedThings;
-import eu.toldi.infinityforlemmy.asynctasks.InsertBlockedThings;
-import eu.toldi.infinityforlemmy.blockedcommunity.BlockedCommunityData;
-import eu.toldi.infinityforlemmy.blockedinstances.BlockedInstanceData;
-import eu.toldi.infinityforlemmy.blockeduser.BlockedUserData;
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import eu.toldi.infinityforlemmy.customviews.ViewPagerBugFixed;
-import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
-import eu.toldi.infinityforlemmy.events.GoBackToMainPageEvent;
-import eu.toldi.infinityforlemmy.events.SwitchAccountEvent;
-import eu.toldi.infinityforlemmy.fragments.BlockedCommunitiesListingFragment;
-import eu.toldi.infinityforlemmy.fragments.BlockedInstancesListingFragment;
-import eu.toldi.infinityforlemmy.fragments.BlockedUsersListingFragment;
-import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
-import eu.toldi.infinityforlemmy.utils.Utils;
-import retrofit2.Retrofit;
-
-
-public class BlockedThingListingActivity extends BaseActivity implements ActivityToolbarInterface {
-
-    public static final String EXTRA_SHOW_MULTIREDDITS = "ESM";
-    private static final String INSERT_SUBSCRIBED_SUBREDDIT_STATE = "ISSS";
-    private static final String INSERT_MULTIREDDIT_STATE = "IMS";
-
-    @BindView(R.id.coordinator_layout_subscribed_thing_listing_activity)
-    CoordinatorLayout coordinatorLayout;
-    @BindView(R.id.appbar_layout_subscribed_thing_listing_activity)
-    AppBarLayout appBarLayout;
-    @BindView(R.id.collapsing_toolbar_layout_subscribed_thing_listing_activity)
-    CollapsingToolbarLayout collapsingToolbarLayout;
-    @BindView(R.id.toolbar_subscribed_thing_listing_activity)
-    Toolbar toolbar;
-    @BindView(R.id.search_edit_text_subscribed_thing_listing_activity)
-    EditText searchEditText;
-    @BindView(R.id.tab_layout_subscribed_thing_listing_activity)
-    TabLayout tabLayout;
-    @BindView(R.id.view_pager_subscribed_thing_listing_activity)
-    ViewPagerBugFixed viewPager;
-    @BindView(R.id.fab_subscribed_thing_listing_activity)
-    FloatingActionButton fab;
-    @Inject
-    @Named("oauth")
-    Retrofit mOauthRetrofit;
-
-    @Inject
-    @Named("no_oauth")
-    RetrofitHolder mRetrofit;
-    @Inject
-    RedditDataRoomDatabase mRedditDataRoomDatabase;
-    @Inject
-    @Named("default")
-    SharedPreferences mSharedPreferences;
-    @Inject
-    @Named("current_account")
-    SharedPreferences mCurrentAccountSharedPreferences;
-    @Inject
-    CustomThemeWrapper mCustomThemeWrapper;
-    @Inject
-    Executor mExecutor;
-    private String mAccessToken;
-    private String mAccountName;
-
-    private String mAccountQualifiedName;
-    private boolean mInsertSuccess = false;
-    private SectionsPagerAdapter sectionsPagerAdapter;
-    private Menu mMenu;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        ((Infinity) getApplication()).getAppComponent().inject(this);
-
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_subscribed_thing_listing);
-
-        ButterKnife.bind(this);
-
-        EventBus.getDefault().register(this);
-
-        applyCustomTheme();
-
-        if (mSharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_RIGHT_TO_GO_BACK, true)) {
-            mSliderPanel = Slidr.attach(this);
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            Window window = getWindow();
-
-            if (isChangeStatusBarIconColor()) {
-                addOnOffsetChangedListener(appBarLayout);
-            }
-
-            if (isImmersiveInterface()) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    window.setDecorFitsSystemWindows(false);
-                } else {
-                    window.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
-                }
-                adjustToolbar(toolbar);
-
-                int navBarHeight = getNavBarHeight();
-                if (navBarHeight > 0) {
-                    CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) fab.getLayoutParams();
-                    params.bottomMargin += navBarHeight;
-                    fab.setLayoutParams(params);
-                }
-            }
-        }
-
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        setToolbarGoToTop(toolbar);
-
-        mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
-        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, "-");
-        mAccountQualifiedName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, "-");
-
-        if (savedInstanceState != null) {
-            mInsertSuccess = savedInstanceState.getBoolean(INSERT_SUBSCRIBED_SUBREDDIT_STATE);
-        }
-
-        if (mAccessToken == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            searchEditText.setImeOptions(searchEditText.getImeOptions() | EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING);
-        }
-
-        searchEditText.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable editable) {
-                sectionsPagerAdapter.changeSearchQuery(editable.toString());
-            }
-        });
-        initializeViewPagerAndLoadSubscriptions();
-    }
-
-    @Override
-    public SharedPreferences getDefaultSharedPreferences() {
-        return mSharedPreferences;
-    }
-
-    @Override
-    protected CustomThemeWrapper getCustomThemeWrapper() {
-        return mCustomThemeWrapper;
-    }
-
-    @Override
-    protected void applyCustomTheme() {
-        coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
-        applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, collapsingToolbarLayout, toolbar);
-        applyTabLayoutTheme(tabLayout);
-        applyFABTheme(fab, mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
-        searchEditText.setTextColor(mCustomThemeWrapper.getToolbarPrimaryTextAndIconColor());
-        searchEditText.setHintTextColor(mCustomThemeWrapper.getToolbarSecondaryTextColor());
-    }
-
-    private void initializeViewPagerAndLoadSubscriptions() {
-        fab.hide();
-        sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
-        viewPager.setAdapter(sectionsPagerAdapter);
-        viewPager.setOffscreenPageLimit(2);
-
-        tabLayout.setupWithViewPager(viewPager);
-
-        loadBlocks(false);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.subscribed_thing_listing_activity, menu);
-        mMenu = menu;
-        applyMenuItemTheme(menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        if (item.getItemId() == R.id.action_search_subscribed_thing_listing_activity) {
-            item.setVisible(false);
-            searchEditText.setVisibility(View.VISIBLE);
-            searchEditText.requestFocus();
-            if (searchEditText.requestFocus()) {
-                InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.showSoftInput(searchEditText, InputMethodManager.SHOW_IMPLICIT);
-            }
-            return true;
-        } else if (item.getItemId() == android.R.id.home) {
-            if (searchEditText.getVisibility() == View.VISIBLE) {
-                Utils.hideKeyboard(this);
-                searchEditText.setVisibility(View.GONE);
-                searchEditText.setText("");
-                mMenu.findItem(R.id.action_search_subscribed_thing_listing_activity).setVisible(true);
-                sectionsPagerAdapter.changeSearchQuery("");
-                return true;
-            }
-            finish();
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (searchEditText.getVisibility() == View.VISIBLE) {
-            Utils.hideKeyboard(this);
-            searchEditText.setVisibility(View.GONE);
-            searchEditText.setText("");
-            mMenu.findItem(R.id.action_search_subscribed_thing_listing_activity).setVisible(true);
-            sectionsPagerAdapter.changeSearchQuery("");
-        } else {
-            super.onBackPressed();
-        }
-    }
-
-    @Override
-    protected void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putBoolean(INSERT_SUBSCRIBED_SUBREDDIT_STATE, mInsertSuccess);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-
-    public void loadBlocks(boolean forceLoad) {
-        if (mAccessToken != null && !(!forceLoad && mInsertSuccess)) {
-            FetchBlockedThings.fetchBlockedThings(mRetrofit.getRetrofit(), mAccessToken, mAccountQualifiedName, new FetchBlockedThings.FetchBlockedThingsListener() {
-                @Override
-                public void onFetchBlockedThingsSuccess(List<BlockedUserData> blockedUsers, List<BlockedCommunityData> blockedCommunities, List<BlockedInstanceData> blockedInstances) {
-                    InsertBlockedThings.insertBlockedThings(mExecutor, new Handler(), mRedditDataRoomDatabase, mAccountQualifiedName,
-                            blockedCommunities, blockedUsers, blockedInstances, () -> {
-                                mInsertSuccess = true;
-                                sectionsPagerAdapter.stopRefreshProgressbar();
-                            });
-                }
-
-                @Override
-                public void onFetchBlockedThingsFailure() {
-
-                }
-            });
-        }
-    }
-
-
-    @Subscribe
-    public void onAccountSwitchEvent(SwitchAccountEvent event) {
-        finish();
-    }
-
-    @Subscribe
-    public void goBackToMainPageEvent(GoBackToMainPageEvent event) {
-        finish();
-    }
-
-    @Override
-    public void onLongPress() {
-        if (sectionsPagerAdapter != null) {
-            sectionsPagerAdapter.goBackToTop();
-        }
-    }
-
-    @Override
-    public void lockSwipeRightToGoBack() {
-        if (mSliderPanel != null) {
-            mSliderPanel.lock();
-        }
-    }
-
-    @Override
-    public void unlockSwipeRightToGoBack() {
-        if (mSliderPanel != null) {
-            mSliderPanel.unlock();
-        }
-    }
-
-    private class SectionsPagerAdapter extends FragmentPagerAdapter {
-
-        private BlockedCommunitiesListingFragment blockedCommunitiesListingFragment;
-        private BlockedUsersListingFragment followedUsersListingFragment;
-
-        public SectionsPagerAdapter(FragmentManager fm) {
-            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-        }
-
-        @NonNull
-        @Override
-        public Fragment getItem(int position) {
-            switch (position) {
-                default:
-                case 0: {
-                    BlockedCommunitiesListingFragment fragment = new BlockedCommunitiesListingFragment();
-                    Bundle bundle = new Bundle();
-                    bundle.putBoolean(BlockedCommunitiesListingFragment.EXTRA_IS_SUBREDDIT_SELECTION, false);
-                    bundle.putString(BlockedCommunitiesListingFragment.EXTRA_ACCOUNT_NAME, mAccountName);
-                    bundle.putString(BlockedCommunitiesListingFragment.EXTRA_ACCOUNT_QUALIFIED_NAME, mAccountQualifiedName);
-                    bundle.putString(BlockedCommunitiesListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                    fragment.setArguments(bundle);
-                    return fragment;
-                }
-                case 1: {
-                    BlockedUsersListingFragment fragment = new BlockedUsersListingFragment();
-                    Bundle bundle = new Bundle();
-                    bundle.putString(BlockedUsersListingFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
-                    bundle.putString(BlockedUsersListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                    fragment.setArguments(bundle);
-                    return fragment;
-                }
-                case 2: {
-                    BlockedInstancesListingFragment fragment = new BlockedInstancesListingFragment();
-                    Bundle bundle = new Bundle();
-                    bundle.putString(BlockedInstancesListingFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
-                    bundle.putString(BlockedInstancesListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                    fragment.setArguments(bundle);
-                    return fragment;
-                }
-            }
-        }
-
-        @Override
-        public int getCount() {
-            return 3;
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            switch (position) {
-                case 0:
-                    return Utils.getTabTextWithCustomFont(typeface, getString(R.string.communities));
-                case 1:
-                    return Utils.getTabTextWithCustomFont(typeface, getString(R.string.users));
-                case 2:
-                    return Utils.getTabTextWithCustomFont(typeface, getString(R.string.instances));
-            }
-
-            return null;
-        }
-
-        @NonNull
-        @Override
-        public Object instantiateItem(@NonNull ViewGroup container, int position) {
-            Fragment fragment = (Fragment) super.instantiateItem(container, position);
-            if (position == 0) {
-                blockedCommunitiesListingFragment = (BlockedCommunitiesListingFragment) fragment;
-            } else if (position == 1) {
-                followedUsersListingFragment = (BlockedUsersListingFragment) fragment;
-            }
-
-            return fragment;
-        }
-
-        void stopRefreshProgressbar() {
-            if (blockedCommunitiesListingFragment != null) {
-                ((FragmentCommunicator) blockedCommunitiesListingFragment).stopRefreshProgressbar();
-            }
-            if (followedUsersListingFragment != null) {
-                ((FragmentCommunicator) followedUsersListingFragment).stopRefreshProgressbar();
-            }
-        }
-
-
-        void goBackToTop() {
-            if (viewPager.getCurrentItem() == 0) {
-                blockedCommunitiesListingFragment.goBackToTop();
-            } else if (viewPager.getCurrentItem() == 1) {
-                followedUsersListingFragment.goBackToTop();
-            }
-        }
-
-        void changeSearchQuery(String searchQuery) {
-            if (blockedCommunitiesListingFragment != null) {
-                blockedCommunitiesListingFragment.changeSearchQuery(searchQuery);
-            }
-            if (followedUsersListingFragment != null) {
-                followedUsersListingFragment.changeSearchQuery(searchQuery);
-            }
-        }
-    }
-}
-

app/src/main/java/eu/toldi/infinityforlemmy/activities/CommentActivity.java

@@ -170,7 +170,6 @@ public class CommentActivity extends BaseActivity implements UploadImageEnabledA
 
         String parentBodyMarkdown = intent.getStringExtra(EXTRA_COMMENT_PARENT_BODY_MARKDOWN_KEY);
         String parentBody = intent.getStringExtra(EXTRA_COMMENT_PARENT_BODY_KEY);
-        mGlide = Glide.with(getApplication());
         if (parentBodyMarkdown != null && !parentBodyMarkdown.equals("")) {
             binding.commentContentMarkdownView.setVisibility(View.VISIBLE);
             binding.commentContentMarkdownView.setNestedScrollingEnabled(false);
@@ -205,9 +204,8 @@ public class CommentActivity extends BaseActivity implements UploadImageEnabledA
                     builder.linkColor(linkColor);
                 }
             };
-
             Markwon postBodyMarkwon = MarkdownUtils.createFullRedditMarkwon(this,
-                    miscPlugin, parentTextColor, parentSpoilerBackgroundColor, mGlide, null, mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_IMAGE_PREVIEW, false));
+                    miscPlugin, parentTextColor, parentSpoilerBackgroundColor, null);
             MarkwonAdapter markwonAdapter = MarkdownUtils.createTablesAdapter();
             binding.commentContentMarkdownView.setLayoutManager(new LinearLayoutManagerBugFixed(this));
             binding.commentContentMarkdownView.setAdapter(markwonAdapter);
@@ -228,6 +226,8 @@ public class CommentActivity extends BaseActivity implements UploadImageEnabledA
 
         setSupportActionBar(binding.commentToolbar);
 
+        mGlide = Glide.with(this);
+
         if (savedInstanceState != null) {
             selectedAccount = savedInstanceState.getParcelable(SELECTED_ACCOUNT_STATE);
             uploadedImages = savedInstanceState.getParcelableArrayList(UPLOADED_IMAGES_STATE);

app/src/main/java/eu/toldi/infinityforlemmy/activities/CommentFilterPreferenceActivity.java

@@ -1,126 +0,0 @@
-package eu.toldi.infinityforlemmy.activities;
-
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.view.MenuItem;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.ViewModelProvider;
-
-import java.util.concurrent.Executor;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import butterknife.ButterKnife;
-import eu.toldi.infinityforlemmy.Infinity;
-import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
-import eu.toldi.infinityforlemmy.adapters.CommentFilterWithUsageRecyclerViewAdapter;
-import eu.toldi.infinityforlemmy.bottomsheetfragments.CommentFilterOptionsBottomSheetFragment;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilter;
-import eu.toldi.infinityforlemmy.commentfilter.DeleteCommentFilter;
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import eu.toldi.infinityforlemmy.databinding.ActivityCommentFilterPreferenceBinding;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilterWithUsageViewModel;
-import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
-
-public class CommentFilterPreferenceActivity extends BaseActivity {
-
-    private ActivityCommentFilterPreferenceBinding binding;
-
-    @Inject
-    @Named("default")
-    SharedPreferences sharedPreferences;
-    @Inject
-    RedditDataRoomDatabase redditDataRoomDatabase;
-    @Inject
-    CustomThemeWrapper customThemeWrapper;
-    @Inject
-    Executor executor;
-    public CommentFilterWithUsageViewModel commentFilterWithUsageViewModel;
-    private CommentFilterWithUsageRecyclerViewAdapter adapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        ((Infinity) getApplication()).getAppComponent().inject(this);
-
-        setImmersiveModeNotApplicable();
-
-        super.onCreate(savedInstanceState);
-        binding = ActivityCommentFilterPreferenceBinding.inflate(getLayoutInflater());
-
-        setContentView(binding.getRoot());
-
-        ButterKnife.bind(this);
-
-        applyCustomTheme();
-
-        setSupportActionBar(binding.toolbarCommentFilterPreferenceActivity);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        binding.fabCommentFilterPreferenceActivity.setOnClickListener(view -> {
-            Intent intent = new Intent(this, CustomizeCommentFilterActivity.class);
-            intent.putExtra(CustomizeCommentFilterActivity.EXTRA_FROM_SETTINGS, true);
-            startActivity(intent);
-        });
-
-        adapter = new CommentFilterWithUsageRecyclerViewAdapter(this, commentFilter -> {
-            CommentFilterOptionsBottomSheetFragment commentFilterOptionsBottomSheetFragment = new CommentFilterOptionsBottomSheetFragment();
-            Bundle bundle = new Bundle();
-            bundle.putParcelable(CommentFilterOptionsBottomSheetFragment.EXTRA_POST_FILTER, commentFilter);
-            commentFilterOptionsBottomSheetFragment.setArguments(bundle);
-            commentFilterOptionsBottomSheetFragment.show(getSupportFragmentManager(), commentFilterOptionsBottomSheetFragment.getTag());
-        });
-
-        binding.recyclerViewCommentFilterPreferenceActivity.setAdapter(adapter);
-
-        commentFilterWithUsageViewModel = new ViewModelProvider(this,
-                new CommentFilterWithUsageViewModel.Factory(redditDataRoomDatabase)).get(CommentFilterWithUsageViewModel.class);
-
-        commentFilterWithUsageViewModel.getCommentFilterWithUsageListLiveData().observe(this, commentFilterWithUsages -> adapter.setCommentFilterWithUsageList(commentFilterWithUsages));
-    }
-
-    public void editCommentFilter(CommentFilter commentFilter) {
-        Intent intent = new Intent(this, CustomizeCommentFilterActivity.class);
-        intent.putExtra(CustomizeCommentFilterActivity.EXTRA_COMMENT_FILTER, commentFilter);
-        intent.putExtra(CustomizeCommentFilterActivity.EXTRA_FROM_SETTINGS, true);
-        startActivity(intent);
-    }
-
-    public void applyCommentFilterTo(CommentFilter commentFilter) {
-        Intent intent = new Intent(this, CommentFilterUsageListingActivity.class);
-        intent.putExtra(CommentFilterUsageListingActivity.EXTRA_COMMENT_FILTER, commentFilter);
-        startActivity(intent);
-    }
-
-    public void deleteCommentFilter(CommentFilter commentFilter) {
-        DeleteCommentFilter.deleteCommentFilter(redditDataRoomDatabase, executor, commentFilter);
-    }
-
-    @Override
-    protected SharedPreferences getDefaultSharedPreferences() {
-        return sharedPreferences;
-    }
-
-    @Override
-    protected CustomThemeWrapper getCustomThemeWrapper() {
-        return customThemeWrapper;
-    }
-
-    @Override
-    protected void applyCustomTheme() {
-        applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(binding.appbarLayoutCommentFilterPreferenceActivity, binding.collapsingToolbarLayoutCommentFilterPreferenceActivity, binding.toolbarCommentFilterPreferenceActivity);
-        applyFABTheme(binding.fabCommentFilterPreferenceActivity, sharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
-        binding.getRoot().setBackgroundColor(customThemeWrapper.getBackgroundColor());
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-        return false;
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/activities/CommentFilterUsageListingActivity.java

@@ -1,181 +0,0 @@
-package eu.toldi.infinityforlemmy.activities;
-
-import android.app.Activity;
-
-import android.content.SharedPreferences;
-import android.content.res.ColorStateList;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.ViewModelProvider;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textfield.TextInputLayout;
-
-import java.util.concurrent.Executor;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import eu.toldi.infinityforlemmy.Infinity;
-import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
-import eu.toldi.infinityforlemmy.bottomsheetfragments.CommentFilterUsageOptionsBottomSheetFragment;
-import eu.toldi.infinityforlemmy.bottomsheetfragments.NewCommentFilterUsageBottomSheetFragment;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilter;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilterUsage;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilterUsageViewModel;
-import eu.toldi.infinityforlemmy.commentfilter.DeleteCommentFilterUsage;
-import eu.toldi.infinityforlemmy.commentfilter.SaveCommentFilterUsage;
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import eu.toldi.infinityforlemmy.databinding.ActivityCommentFilterUsageListingBinding;
-import eu.toldi.infinityforlemmy.adapters.CommentFilterUsageRecyclerViewAdapter;
-import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
-import eu.toldi.infinityforlemmy.utils.Utils;
-
-public class CommentFilterUsageListingActivity extends BaseActivity {
-
-    public static final String EXTRA_COMMENT_FILTER = "ECF";
-    @Inject
-    @Named("default")
-    SharedPreferences sharedPreferences;
-    @Inject
-    RedditDataRoomDatabase redditDataRoomDatabase;
-    @Inject
-    CustomThemeWrapper customThemeWrapper;
-    @Inject
-    Executor executor;
-    private ActivityCommentFilterUsageListingBinding binding;
-    public CommentFilterUsageViewModel commentFilterUsageViewModel;
-    private CommentFilterUsageRecyclerViewAdapter adapter;
-    private CommentFilter commentFilter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        ((Infinity) getApplication()).getAppComponent().inject(this);
-
-        setImmersiveModeNotApplicable();
-
-        super.onCreate(savedInstanceState);
-        binding = ActivityCommentFilterUsageListingBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-
-        applyCustomTheme();
-
-        setSupportActionBar(binding.toolbarCommentFilterUsageListingActivity);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        commentFilter = getIntent().getParcelableExtra(EXTRA_COMMENT_FILTER);
-
-        setTitle(commentFilter.name);
-
-        binding.fabCommentFilterUsageListingActivity.setOnClickListener(view -> {
-            NewCommentFilterUsageBottomSheetFragment newCommentFilterUsageBottomSheetFragment = new NewCommentFilterUsageBottomSheetFragment();
-            newCommentFilterUsageBottomSheetFragment.show(getSupportFragmentManager(), newCommentFilterUsageBottomSheetFragment.getTag());
-        });
-
-        adapter = new CommentFilterUsageRecyclerViewAdapter(this, customThemeWrapper, commentFilterUsage -> {
-            CommentFilterUsageOptionsBottomSheetFragment commentFilterUsageOptionsBottomSheetFragment = new CommentFilterUsageOptionsBottomSheetFragment();
-            Bundle bundle = new Bundle();
-            bundle.putParcelable(CommentFilterUsageOptionsBottomSheetFragment.EXTRA_COMMENT_FILTER_USAGE, commentFilterUsage);
-            commentFilterUsageOptionsBottomSheetFragment.setArguments(bundle);
-            commentFilterUsageOptionsBottomSheetFragment.show(getSupportFragmentManager(), commentFilterUsageOptionsBottomSheetFragment.getTag());
-        });
-        binding.recyclerViewCommentFilterUsageListingActivity.setAdapter(adapter);
-
-        commentFilterUsageViewModel = new ViewModelProvider(this,
-                new CommentFilterUsageViewModel.Factory(redditDataRoomDatabase, commentFilter.name)).get(CommentFilterUsageViewModel.class);
-
-        commentFilterUsageViewModel.getCommentFilterUsageListLiveData().observe(this, commentFilterUsages -> adapter.setCommentFilterUsages(commentFilterUsages));
-    }
-
-    public void newCommentFilterUsage(int type) {
-        switch (type) {
-            case CommentFilterUsage.SUBREDDIT_TYPE:
-                editAndCommentFilterUsageNameOfUsage(type, null);
-                break;
-        }
-    }
-
-    private void editAndCommentFilterUsageNameOfUsage(int type, String nameOfUsage) {
-        View dialogView = getLayoutInflater().inflate(R.layout.dialog_edit_post_or_comment_filter_name_of_usage, null);
-        TextView messageTextView = dialogView.findViewById(R.id.message_text_view_edit_post_or_comment_filter_name_of_usage_dialog);
-        messageTextView.setVisibility(View.GONE);
-        TextInputLayout textInputLayout = dialogView.findViewById(R.id.text_input_layout_edit_post_or_comment_filter_name_of_usage_dialog);
-        TextInputEditText textInputEditText = dialogView.findViewById(R.id.text_input_edit_text_edit_post_or_comment_filter_name_of_usage_dialog);
-        int primaryTextColor = customThemeWrapper.getPrimaryTextColor();
-        textInputLayout.setBoxStrokeColor(primaryTextColor);
-        textInputLayout.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
-        textInputEditText.setTextColor(primaryTextColor);
-        if (nameOfUsage != null) {
-            textInputEditText.setText(nameOfUsage);
-        }
-        textInputEditText.requestFocus();
-        int titleStringId = R.string.community;
-        switch (type) {
-            case CommentFilterUsage.SUBREDDIT_TYPE:
-                textInputEditText.setHint(R.string.settings_tab_community_name);
-                break;
-        }
-
-        Utils.showKeyboard(this, new Handler(), textInputEditText);
-        new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
-                .setTitle(titleStringId)
-                .setView(dialogView)
-                .setPositiveButton(R.string.ok, (editTextDialogInterface, i1)
-                        -> {
-                    Utils.hideKeyboard(this);
-
-                    CommentFilterUsage commentFilterUsage;
-                    if (!textInputEditText.getText().toString().equals("")) {
-                        commentFilterUsage = new CommentFilterUsage(commentFilter.name, type, textInputEditText.getText().toString());
-                        SaveCommentFilterUsage.saveCommentFilterUsage(redditDataRoomDatabase, executor, commentFilterUsage);
-                    }
-                })
-                .setNegativeButton(R.string.cancel, null)
-                .setOnDismissListener(editTextDialogInterface -> {
-                    Utils.hideKeyboard(this);
-                })
-                .show();
-    }
-
-    public void editCommentFilterUsage(CommentFilterUsage commentFilterUsage) {
-        editAndCommentFilterUsageNameOfUsage(commentFilterUsage.usage, commentFilterUsage.nameOfUsage);
-    }
-
-    public void deleteCommentFilterUsage(CommentFilterUsage commentFilterUsage) {
-        DeleteCommentFilterUsage.deleteCommentFilterUsage(redditDataRoomDatabase, executor, commentFilterUsage);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    protected SharedPreferences getDefaultSharedPreferences() {
-        return sharedPreferences;
-    }
-
-    @Override
-    protected CustomThemeWrapper getCustomThemeWrapper() {
-        return customThemeWrapper;
-    }
-
-    @Override
-    protected void applyCustomTheme() {
-        applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(binding.appbarLayoutCommentFilterUsageListingActivity, binding.collapsingToolbarLayoutCommentFilterUsageListingActivity, binding.toolbarCommentFilterUsageListingActivity);
-        applyFABTheme(binding.fabCommentFilterUsageListingActivity, sharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
-        binding.getRoot().setBackgroundColor(customThemeWrapper.getBackgroundColor());
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/activities/CreateMultiRedditActivity.java

@@ -34,13 +34,13 @@ import butterknife.ButterKnife;
 import eu.toldi.infinityforlemmy.Infinity;
 import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
-import eu.toldi.infinityforlemmy.RetrofitHolder;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
 import eu.toldi.infinityforlemmy.multireddit.CreateMultiReddit;
-import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
+import eu.toldi.infinityforlemmy.multireddit.MultiRedditJSONModel;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
+import retrofit2.Retrofit;
 
 public class CreateMultiRedditActivity extends BaseActivity {
 
@@ -71,8 +71,8 @@ public class CreateMultiRedditActivity extends BaseActivity {
     @BindView(R.id.select_subreddit_text_view_create_multi_reddit_activity)
     TextView selectSubredditTextView;
     @Inject
-    @Named("no_oauth")
-    RetrofitHolder mRetrofit;
+    @Named("oauth")
+    Retrofit mOauthRetrofit;
     @Inject
     RedditDataRoomDatabase mRedditDataRoomDatabase;
     @Inject
@@ -87,14 +87,14 @@ public class CreateMultiRedditActivity extends BaseActivity {
     Executor mExecutor;
     private String mAccessToken;
     private String mAccountName;
-    private ArrayList<SubredditWithSelection> mSubreddits;
+    private ArrayList<String> mSubreddits;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         ((Infinity) getApplication()).getAppComponent().inject(this);
 
         setImmersiveModeNotApplicable();
-
+        
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_create_multi_reddit);
 
@@ -114,10 +114,10 @@ public class CreateMultiRedditActivity extends BaseActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
-        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, "-");
+        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, "-");
 
-        visibilityLinearLayout.setVisibility(View.GONE);
         if (mAccessToken == null) {
+            visibilityLinearLayout.setVisibility(View.GONE);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 nameEditText.setImeOptions(nameEditText.getImeOptions() | EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING);
                 descriptionEditText.setImeOptions(descriptionEditText.getImeOptions() | EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING);
@@ -125,7 +125,7 @@ public class CreateMultiRedditActivity extends BaseActivity {
         }
 
         if (savedInstanceState != null) {
-            mSubreddits = savedInstanceState.getParcelableArrayList(SELECTED_SUBREDDITS_STATE);
+            mSubreddits = savedInstanceState.getStringArrayList(SELECTED_SUBREDDITS_STATE);
         } else {
             mSubreddits = new ArrayList<>();
         }
@@ -135,7 +135,7 @@ public class CreateMultiRedditActivity extends BaseActivity {
     private void bindView() {
         selectSubredditTextView.setOnClickListener(view -> {
             Intent intent = new Intent(CreateMultiRedditActivity.this, SelectedSubredditsAndUsersActivity.class);
-            intent.putParcelableArrayListExtra(SelectedSubredditsAndUsersActivity.EXTRA_SELECTED_SUBREDDITS, mSubreddits);
+            intent.putStringArrayListExtra(SelectedSubredditsAndUsersActivity.EXTRA_SELECTED_SUBREDDITS, mSubreddits);
             startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE);
         });
     }
@@ -159,29 +159,42 @@ public class CreateMultiRedditActivity extends BaseActivity {
                 return true;
             }
 
-            // Create a list of community qualified names seperated by a comma
-            StringBuilder subredditList = new StringBuilder();
-            String prefix = "";
-            for (SubredditWithSelection s : mSubreddits) {
-                subredditList.append(prefix);
-                prefix = ",";
-                subredditList.append(s.getQualifiedName());
+            if (mAccessToken != null) {
+                String jsonModel = new MultiRedditJSONModel(nameEditText.getText().toString(), descriptionEditText.getText().toString(),
+                        visibilitySwitch.isChecked(), mSubreddits).createJSONModel();
+                CreateMultiReddit.createMultiReddit(mOauthRetrofit, mRedditDataRoomDatabase, mAccessToken,
+                        "/user/" + mAccountName + "/m/" + nameEditText.getText().toString(),
+                        jsonModel, new CreateMultiReddit.CreateMultiRedditListener() {
+                            @Override
+                            public void success() {
+                                finish();
+                            }
+
+                            @Override
+                            public void failed(int errorCode) {
+                                if (errorCode == 409) {
+                                    Snackbar.make(coordinatorLayout, R.string.duplicate_multi_reddit, Snackbar.LENGTH_SHORT).show();
+                                } else {
+                                    Snackbar.make(coordinatorLayout, R.string.create_multi_reddit_failed, Snackbar.LENGTH_SHORT).show();
+                                }
+                            }
+                        });
+            } else {
+                CreateMultiReddit.anonymousCreateMultiReddit(mExecutor, new Handler(), mRedditDataRoomDatabase,
+                        "/user/-/m/" + nameEditText.getText().toString(),
+                        nameEditText.getText().toString(), descriptionEditText.getText().toString(),
+                        mSubreddits, new CreateMultiReddit.CreateMultiRedditListener() {
+                            @Override
+                            public void success() {
+                                finish();
+                            }
+
+                            @Override
+                            public void failed(int errorType) {
+                                //Will not be called
+                            }
+                        });
             }
-
-            CreateMultiReddit.anonymousCreateMultiReddit(mExecutor, new Handler(), mRedditDataRoomDatabase,
-                    mAccountName, subredditList.toString(),
-                    nameEditText.getText().toString(), descriptionEditText.getText().toString(),
-                    mSubreddits, new CreateMultiReddit.CreateMultiRedditListener() {
-                        @Override
-                        public void success() {
-                            finish();
-                        }
-
-                        @Override
-                        public void failed(int errorType) {
-                            //Will not be called
-                        }
-                    });
         }
         return false;
     }
@@ -191,7 +204,7 @@ public class CreateMultiRedditActivity extends BaseActivity {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == SUBREDDIT_SELECTION_REQUEST_CODE && resultCode == RESULT_OK) {
             if (data != null) {
-                mSubreddits = data.getParcelableArrayListExtra(
+                mSubreddits = data.getStringArrayListExtra(
                         SubredditMultiselectionActivity.EXTRA_RETURN_SELECTED_SUBREDDITS);
             }
         }
@@ -200,7 +213,7 @@ public class CreateMultiRedditActivity extends BaseActivity {
     @Override
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putParcelableArrayList(SELECTED_SUBREDDITS_STATE, mSubreddits);
+        outState.putStringArrayList(SELECTED_SUBREDDITS_STATE, mSubreddits);
     }
 
     @Override

app/src/main/java/eu/toldi/infinityforlemmy/activities/CustomizeCommentFilterActivity.java

@@ -1,302 +0,0 @@
-package eu.toldi.infinityforlemmy.activities;
-
-import android.app.Activity;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.content.res.ColorStateList;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.concurrent.Executor;
-import java.util.regex.PatternSyntaxException;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import eu.toldi.infinityforlemmy.Infinity;
-import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilter;
-import eu.toldi.infinityforlemmy.commentfilter.SaveCommentFilter;
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import eu.toldi.infinityforlemmy.databinding.ActivityCustomizeCommentFilterBinding;
-import eu.toldi.infinityforlemmy.utils.Utils;
-
-
-public class CustomizeCommentFilterActivity extends BaseActivity {
-
-    public static final String EXTRA_COMMENT_FILTER = "ECF";
-    public static final String EXTRA_FROM_SETTINGS = "EFS";
-    public static final String RETURN_EXTRA_COMMENT_FILTER = "RECF";
-    private static final String COMMENT_FILTER_STATE = "CFS";
-    private static final String ORIGINAL_NAME_STATE = "ONS";
-    @Inject
-    RedditDataRoomDatabase mRedditDataRoomDatabase;
-    @Inject
-    @Named("default")
-    SharedPreferences mSharedPreferences;
-    @Inject
-    @Named("current_account")
-    SharedPreferences currentAccountSharedPreferences;
-    @Inject
-    CustomThemeWrapper mCustomThemeWrapper;
-    @Inject
-    Executor mExecutor;
-    private CommentFilter commentFilter;
-    private boolean fromSettings;
-    private String originalName;
-    private ActivityCustomizeCommentFilterBinding binding;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        ((Infinity) getApplication()).getAppComponent().inject(this);
-
-        setImmersiveModeNotApplicable();
-
-        super.onCreate(savedInstanceState);
-        binding = ActivityCustomizeCommentFilterBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-
-        applyCustomTheme();
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && isChangeStatusBarIconColor()) {
-            addOnOffsetChangedListener(binding.appbarLayoutCustomizeCommentFilterActivity);
-        }
-
-        setSupportActionBar(binding.toolbarCustomizeCommentFilterActivity);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        setToolbarGoToTop(binding.toolbarCustomizeCommentFilterActivity);
-
-        ActivityResultLauncher<Intent> requestAddUsersLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
-            Intent data = result.getData();
-            if (data == null) {
-                return;
-            }
-
-            ArrayList<String> usernames = data.getStringArrayListExtra(SearchActivity.RETURN_EXTRA_SELECTED_USERNAMES);
-            String currentUsers = binding.excludeUsersTextInputEditTextCustomizeCommentFilterActivity.getText().toString().trim();
-            if (usernames != null && !usernames.isEmpty()) {
-                if (!currentUsers.isEmpty() && currentUsers.charAt(currentUsers.length() - 1) != ',') {
-                    String newString = currentUsers + ",";
-                    binding.excludeUsersTextInputEditTextCustomizeCommentFilterActivity.setText(newString);
-                }
-                StringBuilder stringBuilder = new StringBuilder();
-                for (String s : usernames) {
-                    stringBuilder.append(s).append(",");
-                }
-                stringBuilder.deleteCharAt(stringBuilder.length() - 1);
-                binding.excludeUsersTextInputEditTextCustomizeCommentFilterActivity.append(stringBuilder.toString());
-            }
-        });
-
-        binding.addUsersImageViewCustomizeCommentFilterActivity.setOnClickListener(view -> {
-            Intent intent = new Intent(this, SearchActivity.class);
-            intent.putExtra(SearchActivity.EXTRA_SEARCH_ONLY_USERS, true);
-            intent.putExtra(SearchActivity.EXTRA_IS_MULTI_SELECTION, true);
-            requestAddUsersLauncher.launch(intent);
-        });
-
-        fromSettings = getIntent().getBooleanExtra(EXTRA_FROM_SETTINGS, false);
-
-        if (savedInstanceState != null) {
-            commentFilter = savedInstanceState.getParcelable(COMMENT_FILTER_STATE);
-            originalName = savedInstanceState.getString(ORIGINAL_NAME_STATE);
-        } else {
-            commentFilter = getIntent().getParcelableExtra(EXTRA_COMMENT_FILTER);
-            if (commentFilter == null) {
-                commentFilter = new CommentFilter();
-                originalName = "";
-            } else {
-                if (!fromSettings) {
-                    originalName = "";
-                } else {
-                    originalName = commentFilter.name;
-                }
-            }
-            bindView();
-        }
-    }
-
-    private void bindView() {
-        binding.nameTextInputEditTextCustomizeCommentFilterActivity.setText(commentFilter.name);
-        binding.excludeStringsTextInputEditTextCustomizeCommentFilterActivity.setText(commentFilter.excludeStrings);
-        binding.excludeUsersTextInputEditTextCustomizeCommentFilterActivity.setText(commentFilter.excludeUsers);
-        binding.minVoteTextInputEditTextCustomizeCommentFilterActivity.setText(Integer.toString(commentFilter.minVote));
-        binding.maxVoteTextInputEditTextCustomizeCommentFilterActivity.setText(Integer.toString(commentFilter.maxVote));
-    }
-
-    @Override
-    protected SharedPreferences getDefaultSharedPreferences() {
-        return mSharedPreferences;
-    }
-
-    @Override
-    protected CustomThemeWrapper getCustomThemeWrapper() {
-        return mCustomThemeWrapper;
-    }
-
-    @Override
-    protected void applyCustomTheme() {
-        binding.getRoot().setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
-        applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(binding.appbarLayoutCustomizeCommentFilterActivity, binding.collapsingToolbarLayoutCustomizeCommentFilterActivity, binding.toolbarCustomizeCommentFilterActivity);
-        int primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
-        int primaryIconColor = mCustomThemeWrapper.getPrimaryIconColor();
-        Drawable cursorDrawable = Utils.getTintedDrawable(this, R.drawable.edit_text_cursor, primaryTextColor);
-        binding.nameTextInputLayoutCustomizeCommentFilterActivity.setBoxStrokeColor(primaryTextColor);
-        binding.nameTextInputLayoutCustomizeCommentFilterActivity.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
-        binding.nameTextInputEditTextCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
-        binding.excludeStringsTextInputLayoutCustomizeCommentFilterActivity.setBoxStrokeColor(primaryTextColor);
-        binding.excludeStringsTextInputLayoutCustomizeCommentFilterActivity.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
-        binding.excludeStringsTextInputEditTextCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
-        binding.excludeUsersTextInputLayoutCustomizeCommentFilterActivity.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
-        binding.excludeUsersTextInputEditTextCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
-        binding.addUsersImageViewCustomizeCommentFilterActivity.setImageDrawable(Utils.getTintedDrawable(this, R.drawable.ic_add_24dp, primaryIconColor));
-        binding.minVoteTextInputLayoutCustomizeCommentFilterActivity.setBoxStrokeColor(primaryTextColor);
-        binding.minVoteTextInputLayoutCustomizeCommentFilterActivity.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
-        binding.minVoteTextInputEditTextCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
-        binding.maxVoteTextInputLayoutCustomizeCommentFilterActivity.setBoxStrokeColor(primaryTextColor);
-        binding.maxVoteTextInputLayoutCustomizeCommentFilterActivity.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
-        binding.maxVoteTextInputEditTextCustomizeCommentFilterActivity.setTextColor(primaryTextColor);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            binding.nameTextInputEditTextCustomizeCommentFilterActivity.setTextCursorDrawable(cursorDrawable);
-            binding.excludeStringsTextInputEditTextCustomizeCommentFilterActivity.setTextCursorDrawable(cursorDrawable);
-            binding.excludeUsersTextInputEditTextCustomizeCommentFilterActivity.setTextCursorDrawable(cursorDrawable);
-            binding.minVoteTextInputEditTextCustomizeCommentFilterActivity.setTextCursorDrawable(cursorDrawable);
-            binding.maxVoteTextInputEditTextCustomizeCommentFilterActivity.setTextCursorDrawable(cursorDrawable);
-        } else {
-            setCursorDrawableColor(binding.nameTextInputEditTextCustomizeCommentFilterActivity, primaryTextColor);
-            setCursorDrawableColor(binding.excludeStringsTextInputEditTextCustomizeCommentFilterActivity, primaryTextColor);
-            setCursorDrawableColor(binding.excludeUsersTextInputEditTextCustomizeCommentFilterActivity, primaryTextColor);
-            setCursorDrawableColor(binding.minVoteTextInputEditTextCustomizeCommentFilterActivity, primaryTextColor);
-            setCursorDrawableColor(binding.maxVoteTextInputEditTextCustomizeCommentFilterActivity, primaryTextColor);
-        }
-
-        if (typeface != null) {
-            Utils.setFontToAllTextViews(binding.getRoot(), typeface);
-        }
-    }
-
-    public void setCursorDrawableColor(EditText editText, int color) {
-        try {
-            Field fCursorDrawableRes = TextView.class.getDeclaredField("mCursorDrawableRes");
-            fCursorDrawableRes.setAccessible(true);
-            int mCursorDrawableRes = fCursorDrawableRes.getInt(editText);
-            Field fEditor = TextView.class.getDeclaredField("mEditor");
-            fEditor.setAccessible(true);
-            Object editor = fEditor.get(editText);
-            Class<?> clazz = editor.getClass();
-            Field fCursorDrawable = clazz.getDeclaredField("mCursorDrawable");
-            fCursorDrawable.setAccessible(true);
-            Drawable[] drawables = new Drawable[2];
-            drawables[0] = editText.getContext().getResources().getDrawable(mCursorDrawableRes);
-            drawables[1] = editText.getContext().getResources().getDrawable(mCursorDrawableRes);
-            drawables[0].setColorFilter(color, PorterDuff.Mode.SRC_IN);
-            drawables[1].setColorFilter(color, PorterDuff.Mode.SRC_IN);
-            fCursorDrawable.set(editor, drawables);
-        } catch (Throwable ignored) {
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.customize_comment_filter_activity, menu);
-        if (fromSettings) {
-            menu.findItem(R.id.action_save_customize_comment_filter_activity).setVisible(false);
-        }
-        applyMenuItemTheme(menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        } else if (item.getItemId() == R.id.action_save_customize_comment_filter_activity) {
-            try {
-                constructCommentFilter();
-                Intent returnIntent = new Intent();
-                returnIntent.putExtra(RETURN_EXTRA_COMMENT_FILTER, commentFilter);
-                setResult(Activity.RESULT_OK, returnIntent);
-                finish();
-            } catch (PatternSyntaxException e) {
-                Toast.makeText(this, R.string.invalid_regex, Toast.LENGTH_SHORT).show();
-            }
-
-            return true;
-        } else if (item.getItemId() == R.id.action_save_to_database_customize_comment_filter_activity) {
-            try {
-                constructCommentFilter();
-
-                if (!commentFilter.name.equals("")) {
-                    saveCommentFilter(originalName);
-                } else {
-                    Toast.makeText(CustomizeCommentFilterActivity.this, R.string.comment_filter_requires_a_name, Toast.LENGTH_LONG).show();
-                }
-            } catch (PatternSyntaxException e) {
-                Toast.makeText(this, R.string.invalid_regex, Toast.LENGTH_SHORT).show();
-            }
-        }
-        return false;
-    }
-
-    private void saveCommentFilter(String originalName) {
-        SaveCommentFilter.saveCommentFilter(mExecutor, new Handler(), mRedditDataRoomDatabase, commentFilter, originalName,
-                new SaveCommentFilter.SaveCommentFilterListener() {
-                    @Override
-                    public void success() {
-                        Intent returnIntent = new Intent();
-                        returnIntent.putExtra(RETURN_EXTRA_COMMENT_FILTER, commentFilter);
-                        setResult(Activity.RESULT_OK, returnIntent);
-                        finish();
-                    }
-
-                    @Override
-                    public void duplicate() {
-                        new MaterialAlertDialogBuilder(CustomizeCommentFilterActivity.this, R.style.MaterialAlertDialogTheme)
-                                .setTitle(getString(R.string.duplicate_comment_filter_dialog_title, commentFilter.name))
-                                .setMessage(R.string.duplicate_comment_filter_dialog_message)
-                                .setPositiveButton(R.string.override, (dialogInterface, i) -> saveCommentFilter(commentFilter.name))
-                                .setNegativeButton(R.string.cancel, null)
-                                .show();
-                    }
-                });
-    }
-
-    private void constructCommentFilter() throws PatternSyntaxException {
-        commentFilter.name = binding.nameTextInputEditTextCustomizeCommentFilterActivity.getText().toString();
-        commentFilter.excludeStrings = binding.excludeStringsTextInputEditTextCustomizeCommentFilterActivity.getText().toString();
-        commentFilter.excludeUsers = binding.excludeUsersTextInputEditTextCustomizeCommentFilterActivity.getText().toString();
-        commentFilter.maxVote = binding.maxVoteTextInputEditTextCustomizeCommentFilterActivity.getText() == null || binding.maxVoteTextInputEditTextCustomizeCommentFilterActivity.getText().toString().equals("") ? -1 : Integer.parseInt(binding.maxVoteTextInputEditTextCustomizeCommentFilterActivity.getText().toString());
-        commentFilter.minVote = binding.minVoteTextInputEditTextCustomizeCommentFilterActivity.getText() == null || binding.minVoteTextInputEditTextCustomizeCommentFilterActivity.getText().toString().equals("") ? -1 : Integer.parseInt(binding.minVoteTextInputEditTextCustomizeCommentFilterActivity.getText().toString());
-    }
-
-    @Override
-    protected void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putParcelable(COMMENT_FILTER_STATE, commentFilter);
-        outState.putString(ORIGINAL_NAME_STATE, originalName);
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/activities/CustomizePostFilterActivity.java

@@ -226,6 +226,10 @@ public class CustomizePostFilterActivity extends BaseActivity {
 
         applyCustomTheme();
 
+        if (mSharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_RIGHT_TO_GO_BACK, true)) {
+            Slidr.attach(this);
+        }
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && isChangeStatusBarIconColor()) {
             addOnOffsetChangedListener(appBarLayout);
         }

app/src/main/java/eu/toldi/infinityforlemmy/activities/EditMultiRedditActivity.java

@@ -12,6 +12,7 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
+import android.widget.Switch;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -24,7 +25,6 @@ import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.android.material.snackbar.Snackbar;
 
-import java.util.ArrayList;
 import java.util.concurrent.Executor;
 
 import javax.inject.Inject;
@@ -40,7 +40,7 @@ import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
 import eu.toldi.infinityforlemmy.multireddit.EditMultiReddit;
 import eu.toldi.infinityforlemmy.multireddit.FetchMultiRedditInfo;
 import eu.toldi.infinityforlemmy.multireddit.MultiReddit;
-import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
+import eu.toldi.infinityforlemmy.multireddit.MultiRedditJSONModel;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
 import retrofit2.Retrofit;
@@ -70,6 +70,12 @@ public class EditMultiRedditActivity extends BaseActivity {
     EditText descriptionEditText;
     @BindView(R.id.divider_2_edit_multi_reddit_activity)
     View divider2;
+    @BindView(R.id.visibility_wrapper_linear_layout_edit_multi_reddit_activity)
+    LinearLayout visibilityLinearLayout;
+    @BindView(R.id.visibility_text_view_edit_multi_reddit_activity)
+    TextView visibilityTextView;
+    @BindView(R.id.visibility_switch_edit_multi_reddit_activity)
+    Switch visibilitySwitch;
     @BindView(R.id.select_subreddit_text_view_edit_multi_reddit_activity)
     TextView selectSubredditTextView;
     @Inject
@@ -117,9 +123,10 @@ public class EditMultiRedditActivity extends BaseActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
-        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, "-");
+        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, "-");
 
         if (mAccessToken == null) {
+            visibilityLinearLayout.setVisibility(View.GONE);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 nameEditText.setImeOptions(nameEditText.getImeOptions() | EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING);
                 descriptionEditText.setImeOptions(descriptionEditText.getImeOptions() | EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING);
@@ -138,44 +145,53 @@ public class EditMultiRedditActivity extends BaseActivity {
 
     private void bindView() {
         if (multiReddit == null) {
+            if (mAccessToken == null) {
+                FetchMultiRedditInfo.anonymousFetchMultiRedditInfo(mExecutor, new Handler(),
+                        mRedditDataRoomDatabase, multipath, new FetchMultiRedditInfo.FetchMultiRedditInfoListener() {
+                            @Override
+                            public void success(MultiReddit multiReddit) {
+                                EditMultiRedditActivity.this.multiReddit = multiReddit;
+                                progressBar.setVisibility(View.GONE);
+                                linearLayout.setVisibility(View.VISIBLE);
+                                nameEditText.setText(multiReddit.getDisplayName());
+                                descriptionEditText.setText(multiReddit.getDescription());
+                            }
 
-            FetchMultiRedditInfo.anonymousFetchMultiRedditInfo(mExecutor, new Handler(),
-                    mRedditDataRoomDatabase, multipath, mAccountName, new FetchMultiRedditInfo.FetchMultiRedditInfoListener() {
-                        @Override
-                        public void success(MultiReddit multiReddit) {
-                            EditMultiRedditActivity.this.multiReddit = multiReddit;
-                            progressBar.setVisibility(View.GONE);
-                            linearLayout.setVisibility(View.VISIBLE);
-                            nameEditText.setText(multiReddit.getDisplayName());
-                            descriptionEditText.setText(multiReddit.getDescription());
-                        }
-
-                        @Override
-                        public void failed() {
-                            //Will not be called
-                        }
-                    });
+                            @Override
+                            public void failed() {
+                                //Will not be called
+                            }
+                        });
+            } else {
+                FetchMultiRedditInfo.fetchMultiRedditInfo(mRetrofit, mAccessToken, multipath, new FetchMultiRedditInfo.FetchMultiRedditInfoListener() {
+                    @Override
+                    public void success(MultiReddit multiReddit) {
+                        EditMultiRedditActivity.this.multiReddit = multiReddit;
+                        progressBar.setVisibility(View.GONE);
+                        linearLayout.setVisibility(View.VISIBLE);
+                        nameEditText.setText(multiReddit.getDisplayName());
+                        descriptionEditText.setText(multiReddit.getDescription());
+                        visibilitySwitch.setChecked(!multiReddit.getVisibility().equals("public"));
+                    }
 
+                    @Override
+                    public void failed() {
+                        Snackbar.make(coordinatorLayout, R.string.cannot_fetch_multireddit, Snackbar.LENGTH_SHORT).show();
+                    }
+                });
+            }
         } else {
             progressBar.setVisibility(View.GONE);
             linearLayout.setVisibility(View.VISIBLE);
             nameEditText.setText(multiReddit.getDisplayName());
             descriptionEditText.setText(multiReddit.getDescription());
+            visibilitySwitch.setChecked(!multiReddit.getVisibility().equals("public"));
         }
 
         selectSubredditTextView.setOnClickListener(view -> {
             Intent intent = new Intent(EditMultiRedditActivity.this, SelectedSubredditsAndUsersActivity.class);
             if (multiReddit.getSubreddits() != null) {
-                if (multiReddit.getSubreddits().isEmpty() && !multiReddit.getPath().equals("")) {
-                    String[] communities = multiReddit.getPath().split(",");
-                    ArrayList<SubredditWithSelection> communitiesList = new ArrayList<>();
-                    for (String community : communities) {
-                        communitiesList.add(new SubredditWithSelection(community.substring(0, community.indexOf('@')), null, community));
-                    }
-                    intent.putParcelableArrayListExtra(SelectedSubredditsAndUsersActivity.EXTRA_SELECTED_SUBREDDITS, communitiesList);
-                } else {
-                    intent.putParcelableArrayListExtra(SelectedSubredditsAndUsersActivity.EXTRA_SELECTED_SUBREDDITS, multiReddit.getSubreddits());
-                }
+                intent.putStringArrayListExtra(SelectedSubredditsAndUsersActivity.EXTRA_SELECTED_SUBREDDITS, multiReddit.getSubreddits());
             }
             startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE);
         });
@@ -200,34 +216,39 @@ public class EditMultiRedditActivity extends BaseActivity {
                 return true;
             }
 
+            if (mAccessToken == null) {
+                String name = nameEditText.getText().toString();
+                multiReddit.setDisplayName(name);
+                multiReddit.setName(name);
+                multiReddit.setDescription(descriptionEditText.getText().toString());
+                EditMultiReddit.anonymousEditMultiReddit(mExecutor, new Handler(), mRedditDataRoomDatabase,
+                        multiReddit, new EditMultiReddit.EditMultiRedditListener() {
+                            @Override
+                            public void success() {
+                                finish();
+                            }
 
-            String name = nameEditText.getText().toString();
-            multiReddit.setDisplayName(name);
-            multiReddit.setName(name);
-            multiReddit.setDescription(descriptionEditText.getText().toString());
-            StringBuilder pathStringBuilder = new StringBuilder();
-            String prefix = "";
-            for (SubredditWithSelection s : multiReddit.getSubreddits()) {
-                pathStringBuilder.append(prefix);
-                prefix = ",";
-                pathStringBuilder.append(s.getQualifiedName());
+                            @Override
+                            public void failed() {
+                                //Will not be called
+                            }
+                        });
+            } else {
+                String jsonModel = new MultiRedditJSONModel(nameEditText.getText().toString(), descriptionEditText.getText().toString(),
+                        visibilitySwitch.isChecked(), multiReddit.getSubreddits()).createJSONModel();
+                EditMultiReddit.editMultiReddit(mRetrofit, mAccessToken, multiReddit.getPath(),
+                        jsonModel, new EditMultiReddit.EditMultiRedditListener() {
+                            @Override
+                            public void success() {
+                                finish();
+                            }
+
+                            @Override
+                            public void failed() {
+                                Snackbar.make(coordinatorLayout, R.string.edit_multi_reddit_failed, Snackbar.LENGTH_SHORT).show();
+                            }
+                        });
             }
-
-            multiReddit.setPath(pathStringBuilder.toString());
-
-            EditMultiReddit.anonymousEditMultiReddit(mExecutor, new Handler(), mRedditDataRoomDatabase,
-                    multiReddit, multipath, new EditMultiReddit.EditMultiRedditListener() {
-                        @Override
-                        public void success() {
-                            finish();
-                        }
-
-                        @Override
-                        public void failed() {
-                            //Will not be called
-                        }
-                    });
-
             return true;
         }
         return false;
@@ -238,7 +259,7 @@ public class EditMultiRedditActivity extends BaseActivity {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == SUBREDDIT_SELECTION_REQUEST_CODE && resultCode == RESULT_OK) {
             if (data != null) {
-                multiReddit.setSubreddits(data.getParcelableArrayListExtra(
+                multiReddit.setSubreddits(data.getStringArrayListExtra(
                         SelectedSubredditsAndUsersActivity.EXTRA_RETURN_SELECTED_SUBREDDITS));
             }
         }
@@ -275,6 +296,7 @@ public class EditMultiRedditActivity extends BaseActivity {
         divider2.setBackgroundColor(dividerColor);
         descriptionEditText.setTextColor(primaryTextColor);
         descriptionEditText.setHintTextColor(secondaryTextColor);
+        visibilityTextView.setTextColor(primaryTextColor);
         selectSubredditTextView.setTextColor(primaryTextColor);
 
         if (typeface != null) {

app/src/main/java/eu/toldi/infinityforlemmy/activities/EditPostActivity.java

@@ -172,7 +172,7 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
         contentEditText.setText(mPost.getSelfText());
         linkEditText.setText(mPost.getUrl());
 
-        mGlide = Glide.with(getApplication());
+        mGlide = Glide.with(this);
 
         if (mPost.getUrl() != null && mPost.getUrl().matches(picturePattern)) {
             loadImage();
@@ -308,7 +308,7 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
             isSubmitting = true;
 
             Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_SHORT).show();
-            mRetrofit.getRetrofit().create(LemmyAPI.class).postUpdate(new EditPostDTO(mPost.getId(), titleEditText.getText().toString(), (linkEditText.getText().toString().isEmpty()) ? null : linkEditText.getText().toString(), contentEditText.getText().toString(), mPost.isNSFW(), null, mAccessToken))
+            mRetrofit.getRetrofit().create(LemmyAPI.class).postUpdate(new EditPostDTO(mPost.getId(), titleEditText.getText().toString(), linkEditText.getText().toString(), contentEditText.getText().toString(), mPost.isNSFW(), null, mAccessToken))
                     .enqueue(new Callback<String>() {
                         @Override
                         public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
@@ -354,7 +354,7 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
                 Uri imageUri = data.getData();
                 mExecutor.execute(() -> {
                     try {
-                        Bitmap bitmap = Glide.with(getApplication()).asBitmap().load(imageUri).submit().get();
+                        Bitmap bitmap = Glide.with(this).asBitmap().load(imageUri).submit().get();
                         String imageUrlOrError = UploadImageUtils.uploadImage(mRetrofit, mAccessToken, bitmap);
                         handler.post(() -> {
                             if (imageUrlOrError != null && !imageUrlOrError.startsWith("Error: ")) {

app/src/main/java/eu/toldi/infinityforlemmy/activities/EditProfileActivity.java

@@ -38,6 +38,7 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
 import eu.toldi.infinityforlemmy.Infinity;
 import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
@@ -51,7 +52,6 @@ import eu.toldi.infinityforlemmy.user.UserViewModel;
 import eu.toldi.infinityforlemmy.utils.EditProfileUtils;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
-import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
@@ -135,7 +135,7 @@ public class EditProfileActivity extends BaseActivity {
             startPickImage(PICK_IMAGE_AVATAR_REQUEST_CODE);
         });
 
-        final RequestManager glide = Glide.with(getApplication());
+        final RequestManager glide = Glide.with(this);
         final UserViewModel.Factory userViewModelFactory =
                 new UserViewModel.Factory(getApplication(), mRedditDataRoomDatabase, mAccountName);
         final UserViewModel userViewModel =

app/src/main/java/eu/toldi/infinityforlemmy/activities/FilteredPostsActivity.java

@@ -272,7 +272,7 @@ public class FilteredPostsActivity extends BaseActivity implements SortTypeSelec
         switch (postType) {
             case PostPagingSource.TYPE_FRONT_PAGE:
             case PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE:
-                getSupportActionBar().setTitle(R.string.subscribed_feed);
+                getSupportActionBar().setTitle(R.string.home);
                 break;
             case PostPagingSource.TYPE_SEARCH:
                 getSupportActionBar().setTitle(R.string.search);
@@ -317,7 +317,7 @@ public class FilteredPostsActivity extends BaseActivity implements SortTypeSelec
             bundle.putInt(PostFragment.EXTRA_POST_TYPE, postType);
             bundle.putParcelable(PostFragment.EXTRA_FILTER, postFilter);
             bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-            bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
+            bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
             if (postType == PostPagingSource.TYPE_USER) {
                 bundle.putString(PostFragment.EXTRA_USER_NAME, name);
                 bundle.putString(PostFragment.EXTRA_USER_WHERE, userWhere);
@@ -371,17 +371,20 @@ public class FilteredPostsActivity extends BaseActivity implements SortTypeSelec
         } else if (itemId == R.id.action_sort_filtered_thing_activity) {
             switch (postType) {
                 case PostPagingSource.TYPE_FRONT_PAGE:
-                case PostPagingSource.TYPE_SUBREDDIT:
-                case PostPagingSource.TYPE_MULTI_REDDIT:
-                case PostPagingSource.TYPE_ANONYMOUS_MULTIREDDIT:
-                case PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE:
-                    SortTypeBottomSheetFragment bestSortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(postType, mFragment.getSortType());
+                    SortTypeBottomSheetFragment bestSortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(false, mFragment.getSortType());
                     bestSortTypeBottomSheetFragment.show(getSupportFragmentManager(), bestSortTypeBottomSheetFragment.getTag());
                     break;
                 case PostPagingSource.TYPE_SEARCH:
                     SearchPostSortTypeBottomSheetFragment searchPostSortTypeBottomSheetFragment = SearchPostSortTypeBottomSheetFragment.getNewInstance(mFragment.getSortType());
                     searchPostSortTypeBottomSheetFragment.show(getSupportFragmentManager(), searchPostSortTypeBottomSheetFragment.getTag());
                     break;
+                case PostPagingSource.TYPE_SUBREDDIT:
+                case PostPagingSource.TYPE_MULTI_REDDIT:
+                case PostPagingSource.TYPE_ANONYMOUS_MULTIREDDIT:
+                case PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE:
+                    SortTypeBottomSheetFragment sortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(true, mFragment.getSortType());
+                    sortTypeBottomSheetFragment.show(getSupportFragmentManager(), sortTypeBottomSheetFragment.getTag());
+                    break;
                 case PostPagingSource.TYPE_USER:
                     UserThingSortTypeBottomSheetFragment userThingSortTypeBottomSheetFragment = UserThingSortTypeBottomSheetFragment.getNewInstance(mFragment.getSortType());
                     userThingSortTypeBottomSheetFragment.show(getSupportFragmentManager(), userThingSortTypeBottomSheetFragment.getTag());

app/src/main/java/eu/toldi/infinityforlemmy/activities/FullMarkdownActivity.java

@@ -18,7 +18,6 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.bumptech.glide.Glide;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
 
@@ -30,6 +29,12 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import io.noties.markwon.AbstractMarkwonPlugin;
+import io.noties.markwon.Markwon;
+import io.noties.markwon.MarkwonConfiguration;
+import io.noties.markwon.MarkwonPlugin;
+import io.noties.markwon.core.MarkwonTheme;
+import io.noties.markwon.recycler.MarkwonAdapter;
 import eu.toldi.infinityforlemmy.Infinity;
 import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
@@ -40,12 +45,6 @@ import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
 import eu.toldi.infinityforlemmy.events.SwitchAccountEvent;
 import eu.toldi.infinityforlemmy.markdown.MarkdownUtils;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
-import io.noties.markwon.AbstractMarkwonPlugin;
-import io.noties.markwon.Markwon;
-import io.noties.markwon.MarkwonConfiguration;
-import io.noties.markwon.MarkwonPlugin;
-import io.noties.markwon.core.MarkwonTheme;
-import io.noties.markwon.recycler.MarkwonAdapter;
 
 public class FullMarkdownActivity extends BaseActivity {
 
@@ -140,7 +139,7 @@ public class FullMarkdownActivity extends BaseActivity {
             }
         };
         Markwon markwon = MarkdownUtils.createFullRedditMarkwon(this,
-                miscPlugin, markdownColor, spoilerBackgroundColor, Glide.with(getApplication()), null, mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_IMAGE_PREVIEW, false));
+                miscPlugin, markdownColor, spoilerBackgroundColor, null);
 
         MarkwonAdapter markwonAdapter = MarkdownUtils.createTablesAdapter();
         LinearLayoutManagerBugFixed linearLayoutManager = new SwipeLockLinearLayoutManager(this, new SwipeLockInterface() {

app/src/main/java/eu/toldi/infinityforlemmy/activities/HistoryActivity.java

@@ -0,0 +1,336 @@
+package eu.toldi.infinityforlemmy.activities;
+
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+import androidx.viewpager2.widget.ViewPager2;
+
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import com.google.android.material.tabs.TabLayout;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import eu.toldi.infinityforlemmy.ActivityToolbarInterface;
+import eu.toldi.infinityforlemmy.Infinity;
+import eu.toldi.infinityforlemmy.R;
+import eu.toldi.infinityforlemmy.bottomsheetfragments.PostLayoutBottomSheetFragment;
+import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
+import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
+import eu.toldi.infinityforlemmy.events.ChangeNSFWEvent;
+import eu.toldi.infinityforlemmy.events.SwitchAccountEvent;
+import eu.toldi.infinityforlemmy.fragments.CommentsListingFragment;
+import eu.toldi.infinityforlemmy.fragments.HistoryPostFragment;
+import eu.toldi.infinityforlemmy.fragments.PostFragment;
+import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
+
+public class HistoryActivity extends BaseActivity implements ActivityToolbarInterface,
+        PostLayoutBottomSheetFragment.PostLayoutSelectionCallback {
+
+    @BindView(R.id.coordinator_layout_history_activity)
+    CoordinatorLayout coordinatorLayout;
+    @BindView(R.id.appbar_layout_history_activity)
+    AppBarLayout appBarLayout;
+    @BindView(R.id.collapsing_toolbar_layout_history_activity)
+    CollapsingToolbarLayout collapsingToolbarLayout;
+    @BindView(R.id.toolbar_history_activity)
+    Toolbar toolbar;
+    @BindView(R.id.tab_layout_tab_layout_history_activity_activity)
+    TabLayout tabLayout;
+    @BindView(R.id.view_pager_history_activity)
+    ViewPager2 viewPager2;
+    @Inject
+    @Named("default")
+    SharedPreferences mSharedPreferences;
+    @Inject
+    @Named("post_layout")
+    SharedPreferences mPostLayoutSharedPreferences;
+    @Inject
+    @Named("current_account")
+    SharedPreferences mCurrentAccountSharedPreferences;
+    @Inject
+    CustomThemeWrapper mCustomThemeWrapper;
+    private FragmentManager fragmentManager;
+    private SectionsPagerAdapter sectionsPagerAdapter;
+    private String mAccessToken;
+    private String mAccountName;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        ((Infinity) getApplication()).getAppComponent().inject(this);
+
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_history);
+
+        ButterKnife.bind(this);
+
+        EventBus.getDefault().register(this);
+
+        applyCustomTheme();
+
+        if (mSharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_RIGHT_TO_GO_BACK, true)) {
+            mSliderPanel = Slidr.attach(this);
+        }
+
+        //mViewPager2 = viewPager2;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            Window window = getWindow();
+
+            if (isChangeStatusBarIconColor()) {
+                addOnOffsetChangedListener(appBarLayout);
+            }
+
+            if (isImmersiveInterface()) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    window.setDecorFitsSystemWindows(false);
+                } else {
+                    window.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+                }
+                adjustToolbar(toolbar);
+            }
+        }
+
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        setToolbarGoToTop(toolbar);
+
+        fragmentManager = getSupportFragmentManager();
+
+        mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
+        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
+
+        initializeViewPager();
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (sectionsPagerAdapter != null) {
+            return sectionsPagerAdapter.handleKeyDown(keyCode) || super.onKeyDown(keyCode, event);
+        }
+
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public SharedPreferences getDefaultSharedPreferences() {
+        return mSharedPreferences;
+    }
+
+    @Override
+    protected CustomThemeWrapper getCustomThemeWrapper() {
+        return mCustomThemeWrapper;
+    }
+
+    @Override
+    protected void applyCustomTheme() {
+        coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
+        applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, collapsingToolbarLayout, toolbar);
+        applyTabLayoutTheme(tabLayout);
+    }
+
+    private void initializeViewPager() {
+        sectionsPagerAdapter = new SectionsPagerAdapter(this);
+        tabLayout.setVisibility(View.GONE);
+        viewPager2.setAdapter(sectionsPagerAdapter);
+        viewPager2.setOffscreenPageLimit(2);
+        //viewPager2.setUserInputEnabled(!mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_SWIPING_BETWEEN_TABS, false));
+        viewPager2.setUserInputEnabled(false);
+        /*new TabLayoutMediator(tabLayout, viewPager2, (tab, position) -> {
+            switch (position) {
+                case 0:
+                    Utils.setTitleWithCustomFontToTab(typeface, tab, getString(R.string.posts));
+                    break;
+            }
+        }).attach();*/
+
+        viewPager2.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
+            @Override
+            public void onPageSelected(int position) {
+                if (position == 0) {
+                    unlockSwipeRightToGoBack();
+                } else {
+                    lockSwipeRightToGoBack();
+                }
+            }
+        });
+
+        fixViewPager2Sensitivity(viewPager2);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.history_activity, menu);
+        applyMenuItemTheme(menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            finish();
+            return true;
+        } else if (itemId == R.id.action_refresh_history_activity) {
+            sectionsPagerAdapter.refresh();
+            return true;
+        } else if (itemId == R.id.action_change_post_layout_history_activity) {
+            PostLayoutBottomSheetFragment postLayoutBottomSheetFragment = new PostLayoutBottomSheetFragment();
+            postLayoutBottomSheetFragment.show(getSupportFragmentManager(), postLayoutBottomSheetFragment.getTag());
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void onAccountSwitchEvent(SwitchAccountEvent event) {
+        finish();
+    }
+
+    @Subscribe
+    public void onChangeNSFWEvent(ChangeNSFWEvent changeNSFWEvent) {
+        sectionsPagerAdapter.changeNSFW(changeNSFWEvent.nsfw);
+    }
+
+    @Override
+    public void onLongPress() {
+        if (sectionsPagerAdapter != null) {
+            sectionsPagerAdapter.goBackToTop();
+        }
+    }
+
+    @Override
+    public void lockSwipeRightToGoBack() {
+        if (mSliderPanel != null) {
+            mSliderPanel.lock();
+        }
+    }
+
+    @Override
+    public void unlockSwipeRightToGoBack() {
+        if (mSliderPanel != null) {
+            mSliderPanel.unlock();
+        }
+    }
+
+    @Override
+    public void postLayoutSelected(int postLayout) {
+        if (sectionsPagerAdapter != null) {
+            mPostLayoutSharedPreferences.edit().putInt(SharedPreferencesUtils.HISTORY_POST_LAYOUT_READ_POST, postLayout).apply();
+            sectionsPagerAdapter.changePostLayout(postLayout);
+        }
+    }
+
+    private class SectionsPagerAdapter extends FragmentStateAdapter {
+
+        SectionsPagerAdapter(FragmentActivity fa) {
+            super(fa);
+        }
+
+        @NonNull
+        @Override
+        public Fragment createFragment(int position) {
+            if (position == 0) {
+                HistoryPostFragment fragment = new HistoryPostFragment();
+                Bundle bundle = new Bundle();
+                bundle.putInt(HistoryPostFragment.EXTRA_HISTORY_TYPE, HistoryPostFragment.HISTORY_TYPE_READ_POSTS);
+                bundle.putString(HistoryPostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
+                bundle.putString(HistoryPostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
+                fragment.setArguments(bundle);
+                return fragment;
+            } else {
+                HistoryPostFragment fragment = new HistoryPostFragment();
+                Bundle bundle = new Bundle();
+                bundle.putInt(HistoryPostFragment.EXTRA_HISTORY_TYPE, HistoryPostFragment.HISTORY_TYPE_READ_POSTS);
+                bundle.putString(HistoryPostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
+                bundle.putString(HistoryPostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
+                fragment.setArguments(bundle);
+                return fragment;
+            }
+        }
+
+        @Nullable
+        private Fragment getCurrentFragment() {
+            if (viewPager2 == null || fragmentManager == null) {
+                return null;
+            }
+            return fragmentManager.findFragmentByTag("f" + viewPager2.getCurrentItem());
+        }
+
+        public boolean handleKeyDown(int keyCode) {
+            if (viewPager2.getCurrentItem() == 0) {
+                Fragment fragment = getCurrentFragment();
+                if (fragment instanceof PostFragment) {
+                    return ((PostFragment) fragment).handleKeyDown(keyCode);
+                }
+            }
+            return false;
+        }
+
+        public void refresh() {
+            Fragment fragment = getCurrentFragment();
+            if (fragment instanceof PostFragment) {
+                ((PostFragment) fragment).refresh();
+            } else if (fragment instanceof CommentsListingFragment) {
+                ((CommentsListingFragment) fragment).refresh();
+            }
+        }
+
+        public void changeNSFW(boolean nsfw) {
+            Fragment fragment = getCurrentFragment();
+            if (fragment instanceof PostFragment) {
+                ((PostFragment) fragment).changeNSFW(nsfw);
+            }
+        }
+
+        public void changePostLayout(int postLayout) {
+            Fragment fragment = getCurrentFragment();
+            if (fragment instanceof HistoryPostFragment) {
+                ((HistoryPostFragment) fragment).changePostLayout(postLayout);
+            }
+        }
+
+
+        public void goBackToTop() {
+            Fragment fragment = getCurrentFragment();
+            if (fragment instanceof PostFragment) {
+                ((PostFragment) fragment).goBackToTop();
+            } else if (fragment instanceof CommentsListingFragment) {
+                ((CommentsListingFragment) fragment).goBackToTop();
+            }
+        }
+
+        @Override
+        public int getItemCount() {
+            return 1;
+        }
+    }
+}

app/src/main/java/eu/toldi/infinityforlemmy/activities/InboxActivity.java

@@ -55,7 +55,6 @@ import eu.toldi.infinityforlemmy.events.PassPrivateMessageEvent;
 import eu.toldi.infinityforlemmy.events.PassPrivateMessageIndexEvent;
 import eu.toldi.infinityforlemmy.events.SwitchAccountEvent;
 import eu.toldi.infinityforlemmy.fragments.InboxFragment;
-import eu.toldi.infinityforlemmy.fragments.PrivateMessageFragment;
 import eu.toldi.infinityforlemmy.message.CommentInteraction;
 import eu.toldi.infinityforlemmy.message.FetchMessage;
 import eu.toldi.infinityforlemmy.message.ReadMessage;
@@ -156,7 +155,7 @@ public class InboxActivity extends BaseActivity implements ActivityToolbarInterf
         fragmentManager = getSupportFragmentManager();
 
         mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
-        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null);
+        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
 
         if (savedInstanceState != null) {
             mNewAccountName = savedInstanceState.getString(NEW_ACCOUNT_NAME_STATE);
@@ -181,7 +180,7 @@ public class InboxActivity extends BaseActivity implements ActivityToolbarInterf
                 if (i == EditorInfo.IME_ACTION_DONE) {
                     Utils.hideKeyboard(this);
                     Intent pmIntent = new Intent(this, SendPrivateMessageActivity.class);
-                    //pmIntent.putExtra(SendPrivateMessageActivity.EXTRA_RECIPIENT_USERNAME, thingEditText.getText().toString());
+                    pmIntent.putExtra(SendPrivateMessageActivity.EXTRA_RECIPIENT_USERNAME, thingEditText.getText().toString());
                     startActivity(pmIntent);
                     return true;
                 }
@@ -194,7 +193,7 @@ public class InboxActivity extends BaseActivity implements ActivityToolbarInterf
                             -> {
                         Utils.hideKeyboard(this);
                         Intent pmIntent = new Intent(this, SendPrivateMessageActivity.class);
-                        //pmIntent.putExtra(SendPrivateMessageActivity.EXTRA_RECIPIENT_USERNAME, thingEditText.getText().toString());
+                        pmIntent.putExtra(SendPrivateMessageActivity.EXTRA_RECIPIENT_USERNAME, thingEditText.getText().toString());
                         startActivity(pmIntent);
                     })
                     .setNegativeButton(R.string.cancel, null)
@@ -331,7 +330,7 @@ public class InboxActivity extends BaseActivity implements ActivityToolbarInterf
         if (resultCode == RESULT_OK && requestCode == SEARCH_USER_REQUEST_CODE && data != null) {
             String username = data.getStringExtra(SearchActivity.EXTRA_RETURN_USER_NAME);
             Intent intent = new Intent(this, SendPrivateMessageActivity.class);
-            //intent.putExtra(SendPrivateMessageActivity.EXTRA_RECIPIENT_USERNAME, username);
+            intent.putExtra(SendPrivateMessageActivity.EXTRA_RECIPIENT_USERNAME, username);
             startActivity(intent);
         }
     }
@@ -442,7 +441,7 @@ public class InboxActivity extends BaseActivity implements ActivityToolbarInterf
         @NonNull
         @Override
         public Fragment createFragment(int position) {
-            Fragment fragment = new InboxFragment();
+            InboxFragment fragment = new InboxFragment();
             Bundle bundle = new Bundle();
             bundle.putString(InboxFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
             switch (position) {
@@ -451,9 +450,11 @@ public class InboxActivity extends BaseActivity implements ActivityToolbarInterf
                     break;
                 case 1:
                     bundle.putString(InboxFragment.EXTRA_MESSAGE_WHERE, FetchMessage.WHERE_MENTIONS);
+                    fragment.setArguments(bundle);
                     break;
                 case 2:
-                    fragment = new PrivateMessageFragment();
+                    bundle.putString(InboxFragment.EXTRA_MESSAGE_WHERE, FetchMessage.WHERE_MESSAGES);
+                    fragment.setArguments(bundle);
                     break;
             }
             fragment.setArguments(bundle);

app/src/main/java/eu/toldi/infinityforlemmy/activities/InstanceInfoActivity.java

@@ -1,385 +0,0 @@
-package eu.toldi.infinityforlemmy.activities;
-
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.Spanned;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.bumptech.glide.Glide;
-import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.card.MaterialCardView;
-import com.google.android.material.snackbar.Snackbar;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import eu.toldi.infinityforlemmy.Infinity;
-import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.RetrofitHolder;
-import eu.toldi.infinityforlemmy.account.FetchBlockedThings;
-import eu.toldi.infinityforlemmy.adapters.AdminRecyclerViewAdapter;
-import eu.toldi.infinityforlemmy.blockedcommunity.BlockedCommunityData;
-import eu.toldi.infinityforlemmy.blockedinstances.BlockedInstanceData;
-import eu.toldi.infinityforlemmy.blockeduser.BlockedUserData;
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import eu.toldi.infinityforlemmy.customviews.LinearLayoutManagerBugFixed;
-import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
-import eu.toldi.infinityforlemmy.databinding.ActivityInstanceInfoBinding;
-import eu.toldi.infinityforlemmy.markdown.MarkdownUtils;
-import eu.toldi.infinityforlemmy.site.BlockInstance;
-import eu.toldi.infinityforlemmy.site.FetchSiteInfo;
-import eu.toldi.infinityforlemmy.site.SiteInfo;
-import eu.toldi.infinityforlemmy.site.SiteStatistics;
-import eu.toldi.infinityforlemmy.user.BasicUserInfo;
-import eu.toldi.infinityforlemmy.user.MyUserInfo;
-import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
-import io.noties.markwon.AbstractMarkwonPlugin;
-import io.noties.markwon.Markwon;
-import io.noties.markwon.MarkwonConfiguration;
-import io.noties.markwon.MarkwonPlugin;
-import io.noties.markwon.core.MarkwonTheme;
-import io.noties.markwon.recycler.MarkwonAdapter;
-import retrofit2.Retrofit;
-
-public class InstanceInfoActivity extends BaseActivity {
-
-    public static final String EXTRA_INSTANCE_DOMAIN = "instance_info_domain";
-    public static final String EXTRA_INSTANCE_ID = "instance_info_id";
-
-    @Inject
-    @Named("default")
-    SharedPreferences mSharedPreferences;
-
-    @Inject
-    CustomThemeWrapper mCustomThemeWrapper;
-
-    @Inject
-    @Named("no_oauth")
-    RetrofitHolder mRetorifitHolder;
-
-    @Inject
-    @Named("current_account")
-    SharedPreferences mCurrentAccountSharedPreferences;
-
-    ActivityInstanceInfoBinding mInstanceInfoActivityViewBinding;
-    private CoordinatorLayout coordinatorLayout;
-    private Toolbar toolbar;
-    private AppBarLayout appBarLayout;
-
-    private ConstraintLayout mLoadingConstraintLayout;
-
-    private MaterialCardView mStatisticsCardView;
-
-    private TextView mUsersTextView;
-    private TextView mCommunitiesTextView;
-    private TextView mPostsTextView;
-    private TextView mCommentsTextView;
-    private TextView mActiveUsersTextView;
-    private ImageView mUsersImageView;
-    private ImageView mCommunitiesImageView;
-    private ImageView mPostsImageView;
-    private ImageView mCommentsImageView;
-    private ImageView mActiveUsersImageView;
-
-    private MaterialCardView mDescriptionCardView;
-
-    private RecyclerView mContentMarkdownView;
-    private RecyclerView mAdminsRecyclerView;
-
-    private MaterialCardView mAdminsCardView;
-    private MarkwonAdapter mMarkwonAdapter;
-    private Markwon mPostDetailMarkwon;
-    private AdminRecyclerViewAdapter mAdminAdapter;
-    private Retrofit mRetrofit;
-    private String mInstanceDomain;
-    private int mInstanceId;
-    private String mAccessToken;
-    private String mAccountName;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        ((Infinity) getApplication()).getAppComponent().inject(this);
-        super.onCreate(savedInstanceState);
-        mInstanceInfoActivityViewBinding = ActivityInstanceInfoBinding.inflate(getLayoutInflater());
-        View view = mInstanceInfoActivityViewBinding.getRoot();
-        setImmersiveModeNotApplicable();
-
-        setContentView(view);
-        setSupportActionBar(mInstanceInfoActivityViewBinding.toolbarInstanceInfoActivity);
-
-        if (savedInstanceState != null) {
-            mInstanceDomain = savedInstanceState.getString(EXTRA_INSTANCE_DOMAIN);
-            mInstanceId = savedInstanceState.getInt(EXTRA_INSTANCE_ID);
-        } else {
-            mInstanceDomain = getIntent().getStringExtra(EXTRA_INSTANCE_DOMAIN);
-            mInstanceId = getIntent().getIntExtra(EXTRA_INSTANCE_ID, -1);
-        }
-
-        if (mInstanceDomain == null) {
-            mRetrofit = mRetorifitHolder.getRetrofit();
-        } else {
-            String originalBaseUrl = mRetorifitHolder.getBaseURL();
-            mRetorifitHolder.setBaseURL("https://" + mInstanceDomain);
-            mRetrofit = mRetorifitHolder.getRetrofit();
-            mRetorifitHolder.setBaseURL(originalBaseUrl);
-        }
-        mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
-        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
-
-        setUpBindings();
-        applyCustomTheme();
-
-        if (mSharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_RIGHT_TO_GO_BACK, true)) {
-            Slidr.attach(this);
-        }
-
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        // Remove transparency from navigation bar
-        getWindow().setNavigationBarColor(mCustomThemeWrapper.getBackgroundColor());
-
-        int markdownColor = customThemeWrapper.getPostContentColor();
-        int postSpoilerBackgroundColor = markdownColor | 0xFF000000;
-        int linkColor = customThemeWrapper.getLinkColor();
-
-
-        MarkwonPlugin miscPlugin = new AbstractMarkwonPlugin() {
-            @Override
-            public void beforeSetText(@NonNull TextView textView, @NonNull Spanned markdown) {
-                if (InstanceInfoActivity.this.contentTypeface != null) {
-                    textView.setTypeface(InstanceInfoActivity.this.contentTypeface);
-                }
-                textView.setTextColor(markdownColor);
-                textView.setHighlightColor(Color.TRANSPARENT);
-            }
-
-            @Override
-            public void configureConfiguration(@NonNull MarkwonConfiguration.Builder builder) {
-                builder.linkResolver((view, link) -> {
-                    Intent intent = new Intent(InstanceInfoActivity.this, LinkResolverActivity.class);
-                    Uri uri = Uri.parse(link);
-                    intent.setData(uri);
-                    InstanceInfoActivity.this.startActivity(intent);
-                });
-            }
-
-            @Override
-            public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
-                builder.linkColor(linkColor);
-            }
-        };
-
-        mPostDetailMarkwon = MarkdownUtils.createFullRedditMarkwon(this,
-                miscPlugin, markdownColor, postSpoilerBackgroundColor, Glide.with(getApplication()), null, mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_IMAGE_PREVIEW, false));
-        mMarkwonAdapter = MarkdownUtils.createTablesAdapter();
-        mContentMarkdownView.setAdapter(mMarkwonAdapter);
-        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
-        mContentMarkdownView.setLayoutManager(linearLayoutManager);
-        mAdminAdapter = new AdminRecyclerViewAdapter(InstanceInfoActivity.this, customThemeWrapper);
-        mAdminsRecyclerView.setLayoutManager(new LinearLayoutManagerBugFixed(InstanceInfoActivity.this));
-        mAdminsRecyclerView.setAdapter(mAdminAdapter);
-
-        fetchInstanceInfo();
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        fetchInstanceInfo();
-    }
-
-    private void fetchInstanceInfo() {
-        FetchSiteInfo.fetchSiteInfo(mRetrofit, null, new FetchSiteInfo.FetchSiteInfoListener() {
-            @Override
-            public void onFetchSiteInfoSuccess(SiteInfo siteInfo, MyUserInfo myUserInfo) {
-                mLoadingConstraintLayout.setVisibility(View.GONE);
-                toolbar.setTitle(siteInfo.getName());
-                if (siteInfo.getSidebar() != null) {
-                    mMarkwonAdapter.setMarkdown(mPostDetailMarkwon, siteInfo.getSidebar());
-                    Log.i("SiteInfo", "onFetchSiteInfoSuccess: " + siteInfo.getSidebar());
-                    // noinspection NotifyDataSetChanged
-                    mMarkwonAdapter.notifyDataSetChanged();
-                    mDescriptionCardView.setVisibility(View.VISIBLE);
-                }
-                List<BasicUserInfo> admins = siteInfo.getAdmins();
-                if (admins != null && !admins.isEmpty()) {
-                    mAdminsCardView.setVisibility(View.VISIBLE);
-                    mAdminAdapter.setUsers(admins);
-                }
-                SiteStatistics siteStatistics = siteInfo.getSiteStatistics();
-                if (siteStatistics != null) {
-                    mStatisticsCardView.setVisibility(View.VISIBLE);
-                    mUsersTextView.setText(getString(R.string.user_number_detail, siteStatistics.getUsers()));
-                    mCommunitiesTextView.setText(getString(R.string.community_number_detail, siteStatistics.getCommunities()));
-                    mPostsTextView.setText(getString(R.string.post_count_detail, siteStatistics.getPosts()));
-                    mCommentsTextView.setText(getString(R.string.comment_count_detail, siteStatistics.getComments()));
-                    mActiveUsersTextView.setText(getString(R.string.active_users_number_detail, siteStatistics.getUsers_active()));
-                }
-            }
-
-            @Override
-            public void onFetchSiteInfoFailed(boolean parseFailed) {
-
-            }
-        });
-    }
-
-    protected void setUpBindings() {
-        coordinatorLayout = mInstanceInfoActivityViewBinding.coordinatorLayoutInstanceInfoActivity;
-        toolbar = mInstanceInfoActivityViewBinding.toolbarInstanceInfoActivity;
-        appBarLayout = mInstanceInfoActivityViewBinding.appbarLayoutInstanceInfoActivity;
-        mStatisticsCardView = mInstanceInfoActivityViewBinding.statisticsCardInstanceInfoActivity;
-        mDescriptionCardView = mInstanceInfoActivityViewBinding.descriptionCardInstanceInfoActivity;
-        mContentMarkdownView = mInstanceInfoActivityViewBinding.markdownRecyclerViewInstanceInfoActivity;
-        mAdminsCardView = mInstanceInfoActivityViewBinding.moderatorsCardInstanceInfoActivity;
-        mLoadingConstraintLayout = mInstanceInfoActivityViewBinding.loadingLayoutInstanceInfoActivity;
-        mAdminsRecyclerView = mInstanceInfoActivityViewBinding.recyclerViewAdminsInstanceInfoActivity;
-        mUsersTextView = mInstanceInfoActivityViewBinding.registeredUserCountTextViewInstanceInfoActivity;
-        mCommunitiesTextView = mInstanceInfoActivityViewBinding.communityCountInstanceInfoActivity;
-        mPostsTextView = mInstanceInfoActivityViewBinding.postCountTextViewInstanceInfoActivity;
-        mCommentsTextView = mInstanceInfoActivityViewBinding.commentCountTextViewInstanceInfoActivity;
-        mActiveUsersTextView = mInstanceInfoActivityViewBinding.activeUserCountTextViewInstanceInfoActivity;
-        mUsersImageView = mInstanceInfoActivityViewBinding.registeredUserCountImageViewInstanceInfoActivity;
-        mCommunitiesImageView = mInstanceInfoActivityViewBinding.communitiesIconImageViewInstanceInfoActivity;
-        mPostsImageView = mInstanceInfoActivityViewBinding.postCountImageViewInstanceInfoActivity;
-        mCommentsImageView = mInstanceInfoActivityViewBinding.commentCountImageViewInstanceInfoActivity;
-        mActiveUsersImageView = mInstanceInfoActivityViewBinding.activeUserCountImageViewInstanceInfoActivity;
-    }
-
-    @Override
-    protected SharedPreferences getDefaultSharedPreferences() {
-        return mSharedPreferences;
-    }
-
-    @Override
-    protected CustomThemeWrapper getCustomThemeWrapper() {
-        return mCustomThemeWrapper;
-    }
-
-    @Override
-    protected void applyCustomTheme() {
-        coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
-        applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, null, toolbar);
-        mStatisticsCardView.setCardBackgroundColor(mCustomThemeWrapper.getCardViewBackgroundColor());
-        mDescriptionCardView.setCardBackgroundColor(mCustomThemeWrapper.getCardViewBackgroundColor());
-        mAdminsCardView.setCardBackgroundColor(mCustomThemeWrapper.getCardViewBackgroundColor());
-        mUsersImageView.setColorFilter(mCustomThemeWrapper.getPrimaryTextColor(), PorterDuff.Mode.SRC_IN);
-        mCommunitiesImageView.setColorFilter(mCustomThemeWrapper.getPrimaryTextColor(), PorterDuff.Mode.SRC_IN);
-        mPostsImageView.setColorFilter(mCustomThemeWrapper.getPrimaryTextColor(), PorterDuff.Mode.SRC_IN);
-        mCommentsImageView.setColorFilter(mCustomThemeWrapper.getPrimaryTextColor(), PorterDuff.Mode.SRC_IN);
-        mActiveUsersImageView.setColorFilter(mCustomThemeWrapper.getPrimaryTextColor(), PorterDuff.Mode.SRC_IN);
-        mUsersTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
-        mCommunitiesTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
-        mPostsTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
-        mCommentsTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
-        mActiveUsersTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
-
-    }
-
-    @Override
-    protected void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(EXTRA_INSTANCE_DOMAIN, mInstanceDomain);
-        outState.putInt(EXTRA_INSTANCE_ID, mInstanceId);
-    }
-
-    @Override
-    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        mInstanceDomain = savedInstanceState.getString(EXTRA_INSTANCE_DOMAIN);
-        mInstanceId = savedInstanceState.getInt(EXTRA_INSTANCE_ID);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.instance_info_activity, menu);
-        if (mInstanceDomain == null || mInstanceDomain.equalsIgnoreCase(mRetorifitHolder.getBaseURL().split("/")[2])) {
-            menu.findItem(R.id.action_block_instance_info).setVisible(false);
-            menu.findItem(R.id.action_unblock_instance_info).setVisible(false);
-            return true;
-        }
-        if (mAccessToken == null) {
-            menu.findItem(R.id.action_block_instance_info).setVisible(false);
-            menu.findItem(R.id.action_unblock_instance_info).setVisible(false);
-            return true;
-        }
-        FetchBlockedThings.fetchBlockedThings(mRetorifitHolder.getRetrofit(), mAccessToken, mAccountName, new FetchBlockedThings.FetchBlockedThingsListener() {
-
-            @Override
-            public void onFetchBlockedThingsSuccess(List<BlockedUserData> blockedUsers, List<BlockedCommunityData> blockedCommunities, List<BlockedInstanceData> blockedInstances) {
-                for (BlockedInstanceData blockedInstanceData : blockedInstances) {
-                    if (blockedInstanceData.getDomain().equals(mInstanceDomain)) {
-                        menu.findItem(R.id.action_block_instance_info).setVisible(false);
-                        menu.findItem(R.id.action_unblock_instance_info).setVisible(true);
-                        return;
-                    }
-                }
-                menu.findItem(R.id.action_block_instance_info).setVisible(true);
-                menu.findItem(R.id.action_unblock_instance_info).setVisible(false);
-            }
-
-            @Override
-            public void onFetchBlockedThingsFailure() {
-
-            }
-        });
-
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        } else if (item.getItemId() == R.id.action_block_instance_info) {
-            blockInstance(true);
-            return true;
-        } else if (item.getItemId() == R.id.action_unblock_instance_info) {
-            blockInstance(false);
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    public void blockInstance(boolean blocked) {
-        BlockInstance.INSTANCE.blockInstance(mRetorifitHolder.getRetrofit(), mInstanceId, blocked, new BlockInstance.BlockInstanceResponse() {
-            @Override
-            public void onResponse() {
-                if (blocked) {
-                    applySnackBarTheme(Snackbar.make(coordinatorLayout, R.string.block_instance_success, Snackbar.LENGTH_SHORT)).show();
-                } else {
-                    applySnackBarTheme(Snackbar.make(coordinatorLayout, R.string.unblock_instance_success, Snackbar.LENGTH_SHORT)).show();
-                }
-
-                InstanceInfoActivity.this.invalidateOptionsMenu();
-            }
-
-            @Override
-            public void onFailure() {
-                Toast.makeText(InstanceInfoActivity.this, R.string.block_instance_failed, Toast.LENGTH_SHORT).show();
-            }
-        });
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/activities/LinkResolverActivity.java

@@ -7,7 +7,6 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
 import android.webkit.URLUtil;
 import android.widget.Toast;
 
@@ -17,30 +16,21 @@ import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.browser.customtabs.CustomTabsService;
 
 import org.apache.commons.io.FilenameUtils;
-import org.greenrobot.eventbus.EventBus;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Executor;
 
 import javax.inject.Inject;
 import javax.inject.Named;
 
 import eu.toldi.infinityforlemmy.Infinity;
 import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
 import eu.toldi.infinityforlemmy.RetrofitHolder;
-import eu.toldi.infinityforlemmy.asynctasks.SwitchAccount;
 import eu.toldi.infinityforlemmy.comment.Comment;
 import eu.toldi.infinityforlemmy.comment.FetchComment;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import eu.toldi.infinityforlemmy.events.SwitchAccountEvent;
-import eu.toldi.infinityforlemmy.post.FetchPost;
 import eu.toldi.infinityforlemmy.post.ObjectResolver;
 import eu.toldi.infinityforlemmy.post.Post;
-import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.utils.LemmyUtils;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 
@@ -59,6 +49,7 @@ public class LinkResolverActivity extends AppCompatActivity {
     private static final String MULTIREDDIT_PATTERN = "/user/[\\w-]+/m/\\w+/?";
     private static final String MULTIREDDIT_PATTERN_2 = "/[rR]/(\\w+\\+?)+/?";
     private static final String REDD_IT_POST_PATTERN = "/\\w+/?";
+    private static final String GFYCAT_PATTERN = "(/i?fr)?/[\\w-]+$";
     private static final String REDGIFS_PATTERN = "/watch/[\\w-]+$";
     private static final String IMGUR_GALLERY_PATTERN = "/gallery/\\w+/?";
     private static final String IMGUR_ALBUM_PATTERN = "/(album|a)/\\w+/?";
@@ -73,9 +64,6 @@ public class LinkResolverActivity extends AppCompatActivity {
     @Inject
     CustomThemeWrapper mCustomThemeWrapper;
 
-    @Inject
-    RedditDataRoomDatabase mRedditDataRoomDatabase;
-
     @Inject
     ObjectResolver mObjectResolver;
 
@@ -87,20 +75,13 @@ public class LinkResolverActivity extends AppCompatActivity {
     @Named("no_oauth")
     RetrofitHolder mRetrofit;
 
-    @Inject
-    Executor mExecutor;
-
-    @Inject
-    PostEnricher postEnricher;
-
     private String mAccessToken;
-    private String mAccountQualifedName;
 
     private Uri getRedditUriByPath(String path) {
         if (path.charAt(0) != '/') {
-            return Uri.parse(mRetrofit.getBaseURL() + path);
+            return Uri.parse("https://www.reddit.com/" + path);
         } else {
-            return Uri.parse(mRetrofit.getBaseURL() + path);
+            return Uri.parse("https://www.reddit.com" + path);
         }
     }
 
@@ -110,27 +91,19 @@ public class LinkResolverActivity extends AppCompatActivity {
 
         ((Infinity) getApplication()).getAppComponent().inject(this);
         mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
-        mAccountQualifedName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME,null);
-        if (mAccessToken != null) {
-            String instance = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_INSTANCE, null);
-            mRetrofit.setBaseURL(instance);
-            if (mCurrentAccountSharedPreferences.getBoolean(SharedPreferencesUtils.BEARER_TOKEN_AUTH, true)) {
-                mRetrofit.setAccessToken(mAccessToken);
-            }
-        }
 
         Uri uri = getIntent().getData();
         if (uri == null) {
             String url = getIntent().getStringExtra(Intent.EXTRA_TEXT);
             if (!URLUtil.isValidUrl(url)) {
-                Toast.makeText(getApplicationContext(), R.string.invalid_link, Toast.LENGTH_SHORT).show();
+                Toast.makeText(this, R.string.invalid_link, Toast.LENGTH_SHORT).show();
                 finish();
                 return;
             }
             try {
                 uri = Uri.parse(url);
             } catch (NullPointerException e) {
-                Toast.makeText(getApplicationContext(), R.string.invalid_link, Toast.LENGTH_SHORT).show();
+                Toast.makeText(this, R.string.invalid_link, Toast.LENGTH_SHORT).show();
                 finish();
                 return;
             }
@@ -138,7 +111,7 @@ public class LinkResolverActivity extends AppCompatActivity {
 
         if (uri.getScheme() == null && uri.getHost() == null) {
             if (uri.toString().isEmpty()) {
-                Toast.makeText(getApplicationContext(), R.string.invalid_link, Toast.LENGTH_SHORT).show();
+                Toast.makeText(this, R.string.invalid_link, Toast.LENGTH_SHORT).show();
                 finish();
                 return;
             }
@@ -150,7 +123,7 @@ public class LinkResolverActivity extends AppCompatActivity {
 
     private void handleUri(Uri uri) {
         if (uri == null) {
-            Toast.makeText(getApplicationContext(), R.string.no_link_available, Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, R.string.no_link_available, Toast.LENGTH_SHORT).show();
         } else {
             String path = uri.getPath();
             if (path == null) {
@@ -224,17 +197,23 @@ public class LinkResolverActivity extends AppCompatActivity {
                                 intent.putExtra(ViewPostDetailActivity.EXTRA_NEW_ACCOUNT_NAME, newAccountName);
                                 startActivity(intent);
                             } else {
-                                if (mAccountQualifedName == null || newAccountName != null && !mAccountQualifedName.equals(newAccountName)) {
-                                    SwitchAccount.switchAccount(mRedditDataRoomDatabase, mRetrofit, mCurrentAccountSharedPreferences,
-                                            mExecutor, new Handler(), newAccountName, newAccount -> {
-                                                EventBus.getDefault().post(new SwitchAccountEvent(getClass().getName()));
-                                                Toast.makeText(this, R.string.account_switched, Toast.LENGTH_SHORT).show();
-                                                openPost(uri, segments, messageFullname);
-                                            });
-                                } else {
-                                    openPost(uri, segments, messageFullname);
-                                }
+                                mObjectResolver.resolvePost(uri.toString(), mAccessToken, new ObjectResolver.ObjectResolverListener() {
+                                    @Override
+                                    public void onResolveObjectSuccess(Object p) {
+                                        Post post = (Post) p;
+                                        Intent intent = new Intent(LinkResolverActivity.this, ViewPostDetailActivity.class);
+                                        intent.putExtra(ViewPostDetailActivity.EXTRA_POST_ID, post.getId());
+                                        intent.putExtra(ViewPostDetailActivity.EXTRA_MESSAGE_FULLNAME, messageFullname);
+                                        intent.putExtra(ViewPostDetailActivity.EXTRA_NEW_ACCOUNT_NAME, newAccountName);
+                                        startActivity(intent);
+                                    }
 
+                                    @Override
+                                    public void onResolveObjectFailed() {
+                                        Toast.makeText(LinkResolverActivity.this, R.string.could_not_resolve_link, Toast.LENGTH_SHORT).show();
+                                        finish();
+                                    }
+                                });
                             }
                         } else if (uri.toString().matches(COMMENT_PATTERN)) {
                             if (mAccessToken == null) {
@@ -248,42 +227,116 @@ public class LinkResolverActivity extends AppCompatActivity {
                                         intent.putExtra(ViewPostDetailActivity.EXTRA_MESSAGE_FULLNAME, messageFullname);
                                         intent.putExtra(ViewPostDetailActivity.EXTRA_NEW_ACCOUNT_NAME, newAccountName);
                                         intent.putExtra(ViewPostDetailActivity.EXTRA_SINGLE_COMMENT_ID, comment.getId());
-                                        intent.putExtra(ViewPostDetailActivity.EXTRA_SINGLE_COMMENT_PARENT_ID, comment.getParentId());
                                         startActivity(intent);
                                     }
 
                                     @Override
                                     public void onFetchCommentFailed() {
-                                        Toast.makeText(getApplicationContext(), R.string.could_not_resolve_link, Toast.LENGTH_SHORT).show();
+                                        Toast.makeText(LinkResolverActivity.this, R.string.could_not_resolve_link, Toast.LENGTH_SHORT).show();
                                         finish();
                                     }
                                 });
                             } else {
-                                if (mAccountQualifedName == null || newAccountName != null && !mAccountQualifedName.equals(newAccountName)) {
-                                    SwitchAccount.switchAccount(mRedditDataRoomDatabase, mRetrofit, mCurrentAccountSharedPreferences,
-                                            mExecutor, new Handler(), newAccountName, newAccount -> {
-                                                EventBus.getDefault().post(new SwitchAccountEvent(getClass().getName()));
-                                                Toast.makeText(this, R.string.account_switched, Toast.LENGTH_SHORT).show();
-                                                openComment(uri, segments, messageFullname);
-                                            });
-                                } else {
-                                    openComment(uri, segments, messageFullname);
-                                }
+                                mObjectResolver.resolveComment(uri.toString(), mAccessToken, new ObjectResolver.ObjectResolverListener() {
+                                    @Override
+                                    public void onResolveObjectSuccess(Object c) {
+                                        Comment comment = (Comment) c;
+                                        Intent intent = new Intent(LinkResolverActivity.this, ViewPostDetailActivity.class);
+                                        intent.putExtra(ViewPostDetailActivity.EXTRA_POST_ID, comment.getPostId());
+                                        intent.putExtra(ViewPostDetailActivity.EXTRA_MESSAGE_FULLNAME, messageFullname);
+                                        intent.putExtra(ViewPostDetailActivity.EXTRA_NEW_ACCOUNT_NAME, newAccountName);
+                                        intent.putExtra(ViewPostDetailActivity.EXTRA_SINGLE_COMMENT_ID, comment.getId());
+                                        startActivity(intent);
+                                    }
 
+                                    @Override
+                                    public void onResolveObjectFailed() {
+                                        Toast.makeText(LinkResolverActivity.this, R.string.could_not_resolve_link, Toast.LENGTH_SHORT).show();
+                                        finish();
+                                    }
+                                });
                             }
                         } else if (authority.equals("v.redd.it")) {
                             Intent intent = new Intent(this, ViewVideoActivity.class);
                             intent.putExtra(ViewVideoActivity.EXTRA_VIDEO_TYPE, ViewVideoActivity.VIDEO_TYPE_V_REDD_IT);
                             intent.putExtra(ViewVideoActivity.EXTRA_V_REDD_IT_URL, uri.toString());
                             startActivity(intent);
+                        } else if (authority.contains("reddit.com") || authority.contains("redd.it") || authority.contains("reddit.app")) {
+                            if (authority.equals("reddit.app.link") && path.isEmpty()) {
+                                String redirect = uri.getQueryParameter("$og_redirect");
+                                if (redirect != null) {
+                                    handleUri(Uri.parse(redirect));
+                                } else {
+                                    deepLinkError(uri);
+                                }
+                            } else if (path.isEmpty()) {
+                                Intent intent = new Intent(this, MainActivity.class);
+                                startActivity(intent);
+                            } else if (path.equals("/report")) {
+                                openInWebView(uri);
+                            } else if (path.matches(POST_PATTERN_3)) {
+                                Intent intent = new Intent(this, ViewPostDetailActivity.class);
+                                intent.putExtra(ViewPostDetailActivity.EXTRA_POST_ID, path.substring(1));
+                                intent.putExtra(ViewPostDetailActivity.EXTRA_MESSAGE_FULLNAME, messageFullname);
+                                intent.putExtra(ViewPostDetailActivity.EXTRA_NEW_ACCOUNT_NAME, newAccountName);
+                                startActivity(intent);
+                            } else if (path.matches(WIKI_PATTERN)) {
+                                String[] pathSegments = path.split("/");
+                                String wikiPage;
+                                if (pathSegments.length == 4) {
+                                    wikiPage = "index";
+                                } else {
+                                    int lengthThroughWiki = 0;
+                                    for (int i = 1; i <= 3; ++i) {
+                                        lengthThroughWiki += pathSegments[i].length() + 1;
+                                    }
+                                    wikiPage = path.substring(lengthThroughWiki);
+                                }
+                                Intent intent = new Intent(this, WikiActivity.class);
+                                intent.putExtra(WikiActivity.EXTRA_SUBREDDIT_NAME, segments.get(1));
+                                intent.putExtra(WikiActivity.EXTRA_WIKI_PATH, wikiPage);
+                                startActivity(intent);
+                            } else if (path.matches(SIDEBAR_PATTERN)) {
+                                Intent intent = new Intent(this, ViewSubredditDetailActivity.class);
+                                intent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, path.substring(3, path.length() - 14));
+                                intent.putExtra(ViewSubredditDetailActivity.EXTRA_VIEW_SIDEBAR, true);
+                                startActivity(intent);
+                            } else if (path.matches(MULTIREDDIT_PATTERN)) {
+                                Intent intent = new Intent(this, ViewMultiRedditDetailActivity.class);
+                                intent.putExtra(ViewMultiRedditDetailActivity.EXTRA_MULTIREDDIT_PATH, path);
+                                startActivity(intent);
+                            } else if (path.matches(MULTIREDDIT_PATTERN_2)) {
+                                String subredditName = path.substring(3);
+                                Intent intent = new Intent(this, ViewSubredditDetailActivity.class);
+                                intent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, subredditName);
+                                intent.putExtra(ViewSubredditDetailActivity.EXTRA_MESSAGE_FULLNAME, messageFullname);
+                                intent.putExtra(ViewSubredditDetailActivity.EXTRA_NEW_ACCOUNT_NAME, newAccountName);
+                                startActivity(intent);
+                            } else if (authority.equals("redd.it") && path.matches(REDD_IT_POST_PATTERN)) {
+                                Intent intent = new Intent(this, ViewPostDetailActivity.class);
+                                intent.putExtra(ViewPostDetailActivity.EXTRA_POST_ID, path.substring(1));
+                                startActivity(intent);
+                            } else {
+                                deepLinkError(uri);
+                            }
                         } else if (authority.equals("click.redditmail.com")) {
                             if (path.startsWith("/CL0/")) {
                                 handleUri(Uri.parse(path.substring("/CL0/".length())));
                             }
+                        } else if (authority.contains("gfycat.com")) {
+                            if (path.matches(GFYCAT_PATTERN)) {
+                                Intent intent = new Intent(this, ViewVideoActivity.class);
+                                intent.putExtra(ViewVideoActivity.EXTRA_GFYCAT_ID, path.substring(path.lastIndexOf("/") + 1));
+                                intent.putExtra(ViewVideoActivity.EXTRA_VIDEO_TYPE, ViewVideoActivity.VIDEO_TYPE_GFYCAT);
+                                intent.putExtra(ViewVideoActivity.EXTRA_IS_NSFW, getIntent().getBooleanExtra(EXTRA_IS_NSFW, false));
+                                startActivity(intent);
+                            } else {
+                                deepLinkError(uri);
+                            }
                         } else if (authority.contains("redgifs.com")) {
                             if (path.matches(REDGIFS_PATTERN)) {
                                 Intent intent = new Intent(this, ViewVideoActivity.class);
-                                intent.putExtra(ViewVideoActivity.EXTRA_REDGIFS_ID, path.substring(path.lastIndexOf("/") + 1));
+                                intent.putExtra(ViewVideoActivity.EXTRA_GFYCAT_ID, path.substring(path.lastIndexOf("/") + 1));
                                 intent.putExtra(ViewVideoActivity.EXTRA_VIDEO_TYPE, ViewVideoActivity.VIDEO_TYPE_REDGIFS);
                                 intent.putExtra(ViewVideoActivity.EXTRA_IS_NSFW, true);
                                 startActivity(intent);
@@ -349,110 +402,12 @@ public class LinkResolverActivity extends AppCompatActivity {
         finish();
     }
 
-    private void openComment(Uri uri, List<String> segments, String messageFullname) {
-        boolean local = false;
-        try {
-            URL baseURL = new URL(mRetrofit.getBaseURL());
-            if (baseURL.getHost().equalsIgnoreCase(uri.getHost())) {
-                local = true;
-                FetchComment.fetchSingleComment(mRetrofit.getRetrofit(), mAccessToken, Integer.parseInt(segments.get(segments.size() - 1)), new FetchComment.FetchCommentListener() {
-                    @Override
-                    public void onFetchCommentSuccess(ArrayList<Comment> comments, Integer parentId, ArrayList<Integer> moreChildrenIds) {
-                        Intent intent = new Intent(LinkResolverActivity.this, ViewPostDetailActivity.class);
-                        Comment comment = comments.get(0);
-                        intent.putExtra(ViewPostDetailActivity.EXTRA_POST_ID, comment.getPostId());
-                        intent.putExtra(ViewPostDetailActivity.EXTRA_MESSAGE_FULLNAME, messageFullname);
-                        intent.putExtra(ViewPostDetailActivity.EXTRA_SINGLE_COMMENT_ID, comment.getId());
-                        intent.putExtra(ViewPostDetailActivity.EXTRA_SINGLE_COMMENT_PARENT_ID, comment.getParentId());
-                        startActivity(intent);
-                    }
-
-                    @Override
-                    public void onFetchCommentFailed() {
-                        Toast.makeText(getApplicationContext(), R.string.could_not_resolve_link, Toast.LENGTH_SHORT).show();
-                        finish();
-                    }
-                });
-            }
-        } catch (MalformedURLException e) {
-            Toast.makeText(getApplicationContext(), R.string.could_not_resolve_link, Toast.LENGTH_SHORT).show();
-            finish();
-        }
-        if (!local) {
-            mObjectResolver.resolveComment(uri.toString(), mAccessToken, new ObjectResolver.ObjectResolverListener() {
-                @Override
-                public void onResolveObjectSuccess(Object c) {
-                    Comment comment = (Comment) c;
-                    Intent intent = new Intent(LinkResolverActivity.this, ViewPostDetailActivity.class);
-                    intent.putExtra(ViewPostDetailActivity.EXTRA_POST_ID, comment.getPostId());
-                    intent.putExtra(ViewPostDetailActivity.EXTRA_MESSAGE_FULLNAME, messageFullname);
-                    intent.putExtra(ViewPostDetailActivity.EXTRA_SINGLE_COMMENT_ID, comment.getId());
-                    intent.putExtra(ViewPostDetailActivity.EXTRA_SINGLE_COMMENT_PARENT_ID, comment.getParentId());
-                    startActivity(intent);
-                }
-
-                @Override
-                public void onResolveObjectFailed() {
-                    Toast.makeText(getApplicationContext(), R.string.could_not_resolve_link, Toast.LENGTH_SHORT).show();
-                    finish();
-                }
-            });
-        }
-    }
-
-    private void openPost(Uri uri, List<String> segments, String messageFullname) {
-        boolean local = false;
-        try {
-            URL baseURL = new URL(mRetrofit.getBaseURL());
-            if (baseURL.getHost().equalsIgnoreCase(uri.getHost())) {
-                local = true;
-                FetchPost.fetchPost(mExecutor, new Handler(), mRetrofit.getRetrofit(), segments.get(segments.size() - 1), mAccessToken, postEnricher, new FetchPost.FetchPostListener() {
-                    @Override
-                    public void fetchPostSuccess(Post post) {
-
-                        Intent intent = new Intent(LinkResolverActivity.this, ViewPostDetailActivity.class);
-                        intent.putExtra(ViewPostDetailActivity.EXTRA_POST_ID, post.getId());
-                        intent.putExtra(ViewPostDetailActivity.EXTRA_MESSAGE_FULLNAME, messageFullname);
-                        startActivity(intent);
-                    }
-
-                    @Override
-                    public void fetchPostFailed() {
-                        Toast.makeText(getApplicationContext(), R.string.could_not_resolve_link, Toast.LENGTH_SHORT).show();
-                        finish();
-                    }
-                });
-            }
-        } catch (MalformedURLException e) {
-            Toast.makeText(getApplicationContext(), R.string.could_not_resolve_link, Toast.LENGTH_SHORT).show();
-            finish();
-        }
-        if (!local) {
-            mObjectResolver.resolvePost(uri.toString(), mAccessToken, new ObjectResolver.ObjectResolverListener() {
-                @Override
-                public void onResolveObjectSuccess(Object p) {
-                    Post post = (Post) p;
-                    Intent intent = new Intent(LinkResolverActivity.this, ViewPostDetailActivity.class);
-                    intent.putExtra(ViewPostDetailActivity.EXTRA_POST_ID, post.getId());
-                    intent.putExtra(ViewPostDetailActivity.EXTRA_MESSAGE_FULLNAME, messageFullname);
-                    startActivity(intent);
-                }
-
-                @Override
-                public void onResolveObjectFailed() {
-                    Toast.makeText(getApplicationContext(), R.string.could_not_resolve_link, Toast.LENGTH_SHORT).show();
-                    finish();
-                }
-            });
-        }
-    }
-
     private void deepLinkError(Uri uri) {
         PackageManager pm = getPackageManager();
 
         String authority = uri.getAuthority();
         if(authority != null && (authority.contains("reddit.com") || authority.contains("redd.it") || authority.contains("reddit.app.link"))) {
-            openInBrowser(uri, pm, false);
+            openInCustomTabs(uri, pm, false);
             return;
         }
 

app/src/main/java/eu/toldi/infinityforlemmy/activities/LoginActivity.java

@@ -6,18 +6,16 @@ import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
-import android.text.Editable;
 import android.util.Log;
+import android.util.Patterns;
 import android.view.InflateException;
 import android.view.MenuItem;
-import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.AppCompatAutoCompleteTextView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
@@ -28,10 +26,6 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.Executor;
 
 import javax.inject.Inject;
@@ -39,22 +33,16 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import eu.toldi.infinityforlemmy.FetchMyInfo;
 import eu.toldi.infinityforlemmy.Infinity;
 import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
 import eu.toldi.infinityforlemmy.RetrofitHolder;
-import eu.toldi.infinityforlemmy.adapters.CustomArrayAdapter;
 import eu.toldi.infinityforlemmy.apis.LemmyAPI;
 import eu.toldi.infinityforlemmy.asynctasks.ParseAndInsertNewAccount;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
 import eu.toldi.infinityforlemmy.dto.AccountLoginDTO;
-import eu.toldi.infinityforlemmy.lemmyverse.FetchInstancesListener;
-import eu.toldi.infinityforlemmy.lemmyverse.LemmyInstance;
-import eu.toldi.infinityforlemmy.lemmyverse.LemmyVerseFetchInstances;
-import eu.toldi.infinityforlemmy.site.FetchSiteInfo;
-import eu.toldi.infinityforlemmy.site.SiteInfo;
-import eu.toldi.infinityforlemmy.user.MyUserInfo;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
 import retrofit2.Call;
@@ -67,9 +55,6 @@ public class LoginActivity extends BaseActivity {
     private static final String ENABLE_DOM_STATE = "EDS";
     private static final String IS_AGREE_TO_USER_AGGREMENT_STATE = "IATUAS";
 
-    public static final String EXTRA_INPUT_USERNAME = "INPUT_USERNAME";
-    public static final String EXTRA_INPUT_INSTANCE = "INPUT_INSTANCE";
-
     @BindView(R.id.coordinator_layout_login_activity)
     CoordinatorLayout coordinatorLayout;
     @BindView(R.id.appbar_layout_login_activity)
@@ -80,7 +65,7 @@ public class LoginActivity extends BaseActivity {
     TextView twoFAInfoTextView;
 
     @BindView(R.id.instance_url_input)
-    AppCompatAutoCompleteTextView instance_input;
+    TextInputEditText instance_input;
     @BindView(R.id.username_input)
     TextInputEditText username_input;
     @BindView(R.id.user_password_input)
@@ -97,11 +82,9 @@ public class LoginActivity extends BaseActivity {
     @Inject
     @Named("no_oauth")
     RetrofitHolder mRetrofit;
-
     @Inject
-    @Named("lemmyVerse")
-    Retrofit mLemmyVerseRetrofit;
-
+    @Named("oauth")
+    Retrofit mOauthRetrofit;
     @Inject
     RedditDataRoomDatabase mRedditDataRoomDatabase;
     @Inject
@@ -152,45 +135,17 @@ public class LoginActivity extends BaseActivity {
             isAgreeToUserAgreement = savedInstanceState.getBoolean(IS_AGREE_TO_USER_AGGREMENT_STATE);
         }
 
-        // Get username and instance from intent
-        Intent intent = getIntent();
-        String username_intent = intent.getStringExtra(EXTRA_INPUT_USERNAME);
-        String instance_intent = intent.getStringExtra(EXTRA_INPUT_INSTANCE);
-        if (username_intent != null) {
-            username_input.setText(username_intent);
-        }
-        if (instance_intent != null) {
-            instance_input.setText(instance_intent);
-        }
-
-        LemmyVerseFetchInstances.INSTANCE.fetchInstances(mLemmyVerseRetrofit, new FetchInstancesListener() {
-
-            @Override
-            public void onFetchInstancesSuccess(@NonNull List<LemmyInstance> instances) {
-                ArrayList<String> instanceNames = new ArrayList<>();
-                for (LemmyInstance instance : instances) {
-                    instanceNames.add(instance.getFqdn());
-                }
-                ArrayAdapter<String> adapter = new CustomArrayAdapter(LoginActivity.this, android.R.layout.simple_dropdown_item_1line, instanceNames, mCustomThemeWrapper);
-                instance_input.setAdapter(adapter);
-            }
-        });
-
-
         loginButton.setOnClickListener(view -> {
             Log.i("LoginActivity", "Login button clicked");
-            if (!checkFields())
-                return;
             loginButton.setEnabled(false);
             progressBar.setVisibility(ProgressBar.VISIBLE);
             String username = username_input.getText().toString().trim();
             String instance = correctURL(instance_input.getText().toString().trim());
-            try {
-                URL urlObj = new URL(instance);
-                instance = urlObj.getProtocol() + "://" + urlObj.getHost() + "/";
-            } catch (MalformedURLException e) {
-                instance_input.setError("Invalid URL");
+            if (!Patterns.WEB_URL.matcher(instance).matches()) {
+                instance_input.setError("Invalid instance URL");
                 Toast.makeText(LoginActivity.this, "Invalid instance URL", Toast.LENGTH_SHORT).show();
+                loginButton.setEnabled(true);
+                progressBar.setVisibility(ProgressBar.GONE);
                 return;
             }
             Log.i("LoginActivity", "Instance: " + instance);
@@ -198,7 +153,6 @@ public class LoginActivity extends BaseActivity {
             mRetrofit.setBaseURL(instance);
             LemmyAPI api = mRetrofit.getRetrofit().create(LemmyAPI.class);
             Call<String> accessTokenCall = api.userLogin(accountLoginDTO);
-            String finalInstance = instance;
             accessTokenCall.enqueue(new Callback<String>() {
                 @Override
                 public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
@@ -217,58 +171,35 @@ public class LoginActivity extends BaseActivity {
                         try {
                             JSONObject responseJSON = new JSONObject(accountResponse);
                             String accessToken = responseJSON.getString("jwt");
-                            mRetrofit.setAccessToken(accessToken);
 
-                            FetchSiteInfo.fetchSiteInfo(mRetrofit.getRetrofit(), accessToken, new FetchSiteInfo.FetchSiteInfoListener() {
-                                @Override
-                                public void onFetchSiteInfoSuccess(SiteInfo siteInfo, MyUserInfo myUserInfo) {
-                                    if (myUserInfo == null) {
-                                        finish();
-                                        Toast.makeText(LoginActivity.this, R.string.parse_user_info_error, Toast.LENGTH_SHORT).show();
-                                        return;
-                                    }
-
-                                    boolean canDownvote = siteInfo.isEnable_downvotes();
-                                    ParseAndInsertNewAccount.parseAndInsertNewAccount(mExecutor, new Handler(), myUserInfo.getQualifiedName(), myUserInfo.getDisplayName(), accessToken, myUserInfo.getProfileImageUrl(), myUserInfo.getBannerImageUrl(), authCode, finalInstance, canDownvote, mRedditDataRoomDatabase.accountDao(),
-                                            () -> {
-                                                Intent resultIntent = new Intent();
-                                                setResult(Activity.RESULT_OK, resultIntent);
-                                                finish();
-                                            });
-                                    mCurrentAccountSharedPreferences.edit()
-                                            .putString(SharedPreferencesUtils.ACCESS_TOKEN, accessToken)
-                                            .putString(SharedPreferencesUtils.ACCOUNT_NAME, myUserInfo.getDisplayName())
-                                            .putString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, myUserInfo.getQualifiedName())
-                                            .putString(SharedPreferencesUtils.ACCOUNT_INSTANCE,finalInstance)
-                                            .putString(SharedPreferencesUtils.ACCOUNT_IMAGE_URL, myUserInfo.getProfileImageUrl())
-                                            .putBoolean(SharedPreferencesUtils.CAN_DOWNVOTE, canDownvote).apply();
-                                    String[] version = siteInfo.getVersion().split("\\.");
-                                    if (version.length > 0) {
-                                        Log.d("SwitchAccount", "Lemmy Version: " + version[0] + "." + version[1]);
-                                        int majorVersion = Integer.parseInt(version[0]);
-                                        int minorVersion = Integer.parseInt(version[1]);
-                                        if (majorVersion > 0 || (majorVersion == 0 && minorVersion >= 19)) {
-                                            mRetrofit.setAccessToken(accessToken);
-                                            mCurrentAccountSharedPreferences.edit().putBoolean(SharedPreferencesUtils.BEARER_TOKEN_AUTH, true).apply();
-                                        } else {
-                                            mRetrofit.setAccessToken(null);
-                                            mCurrentAccountSharedPreferences.edit().putBoolean(SharedPreferencesUtils.BEARER_TOKEN_AUTH, false).apply();
+                            FetchMyInfo.fetchAccountInfo(mRetrofit.getRetrofit(), mRedditDataRoomDatabase, username,
+                                    accessToken, new FetchMyInfo.FetchMyInfoListener() {
+                                        @Override
+                                        public void onFetchMyInfoSuccess(String name, String display_name, String profileImageUrl, String bannerImageUrl) {
+                                            mCurrentAccountSharedPreferences.edit().putString(SharedPreferencesUtils.ACCESS_TOKEN, accessToken)
+                                                    .putString(SharedPreferencesUtils.ACCOUNT_NAME, display_name)
+                                                    .putString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, name)
+                                                    .putString(SharedPreferencesUtils.ACCOUNT_INSTANCE,instance)
+                                                    .putString(SharedPreferencesUtils.ACCOUNT_IMAGE_URL, profileImageUrl).apply();
+                                            ParseAndInsertNewAccount.parseAndInsertNewAccount(mExecutor, new Handler(), name,display_name, accessToken,  profileImageUrl, bannerImageUrl, authCode,instance, mRedditDataRoomDatabase.accountDao(),
+                                                    () -> {
+                                                        Intent resultIntent = new Intent();
+                                                        setResult(Activity.RESULT_OK, resultIntent);
+                                                        finish();
+                                                    });
                                         }
-                                    }
-                                }
 
-                                @Override
-                                public void onFetchSiteInfoFailed(boolean parseFailed) {
-                                    if (parseFailed) {
-                                        finish();
-                                        Toast.makeText(LoginActivity.this, R.string.parse_user_info_error, Toast.LENGTH_SHORT).show();
-                                    } else {
-                                        progressBar.setVisibility(ProgressBar.GONE);
-                                        loginButton.setEnabled(true);
-                                        Toast.makeText(LoginActivity.this, R.string.cannot_fetch_user_info, Toast.LENGTH_SHORT).show();
-                                    }
-                                }
-                            });
+                                        @Override
+                                        public void onFetchMyInfoFailed(boolean parseFailed) {
+                                            if (parseFailed) {
+                                                Toast.makeText(LoginActivity.this, R.string.parse_user_info_error, Toast.LENGTH_SHORT).show();
+                                            } else {
+                                                Toast.makeText(LoginActivity.this, R.string.cannot_fetch_user_info, Toast.LENGTH_SHORT).show();
+                                            }
+
+                                            finish();
+                                        }
+                                    });
                         } catch (JSONException e) {
                             throw new RuntimeException(e);
                         }
@@ -309,26 +240,6 @@ public class LoginActivity extends BaseActivity {
         });
 
     }
-
-    private boolean checkFields() {
-        boolean result = true;
-        Editable username = username_input.getText();
-        Editable password = password_input.getText();
-        Editable instance = instance_input.getText();
-        if(instance == null || instance.toString().isEmpty()) {
-            instance_input.setError(getString(R.string.instance_cannot_be_empty));
-            result = false;
-        }
-        if(username == null || username.toString().isEmpty()) {
-            username_input.setError(getString(R.string.username_cannot_be_empty));
-            result = false;
-        }
-        if(password == null || password.toString().isEmpty()) {
-            password_input.setError(getString(R.string.password_cannot_be_empty));
-            result = false;
-        }
-        return result;
-    }
     private static String correctURL(String url) {
         if (url == null || url.isEmpty()) {
             throw new IllegalArgumentException("URL cannot be null or empty");
@@ -370,7 +281,6 @@ public class LoginActivity extends BaseActivity {
         if (typeface != null) {
             twoFAInfoTextView.setTypeface(typeface);
         }
-        instance_input.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
     }
 
     @Override

app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java

@@ -14,7 +14,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -34,7 +33,6 @@ import androidx.appcompat.app.AppCompatDelegate;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
-import androidx.core.splashscreen.SplashScreen;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -54,7 +52,6 @@ import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.navigation.NavigationView;
-import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
 import com.google.android.material.textfield.TextInputEditText;
@@ -121,15 +118,12 @@ import eu.toldi.infinityforlemmy.post.MarkPostAsRead;
 import eu.toldi.infinityforlemmy.post.Post;
 import eu.toldi.infinityforlemmy.post.PostPagingSource;
 import eu.toldi.infinityforlemmy.readpost.InsertReadPost;
-import eu.toldi.infinityforlemmy.site.FetchSiteInfo;
-import eu.toldi.infinityforlemmy.site.SiteInfo;
 import eu.toldi.infinityforlemmy.subreddit.ParseSubredditData;
 import eu.toldi.infinityforlemmy.subreddit.SubredditData;
 import eu.toldi.infinityforlemmy.subscribedsubreddit.SubscribedSubredditData;
 import eu.toldi.infinityforlemmy.subscribedsubreddit.SubscribedSubredditViewModel;
 import eu.toldi.infinityforlemmy.subscribeduser.SubscribedUserData;
 import eu.toldi.infinityforlemmy.user.FetchUserData;
-import eu.toldi.infinityforlemmy.user.MyUserInfo;
 import eu.toldi.infinityforlemmy.user.UserData;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
 import eu.toldi.infinityforlemmy.utils.CustomThemeSharedPreferencesUtils;
@@ -253,12 +247,8 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
     private int fabOption;
     private int inboxCount;
 
-    private boolean mBearerTokenUsed = true;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        SplashScreen.installSplashScreen(this);
-
         ((Infinity) getApplication()).getAppComponent().inject(this);
 
         setTheme(R.style.AppTheme_NoActionBarWithTransparentStatusBar);
@@ -346,13 +336,11 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
         fragmentManager = getSupportFragmentManager();
 
         mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
-        mRetrofit.setAccessToken(mAccessToken);
-        mBearerTokenUsed = mCurrentAccountSharedPreferences.getBoolean(SharedPreferencesUtils.BEARER_TOKEN_AUTH, true);
 
         mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
         mAccountQualifiedName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null);
         String instance = (mAccessToken == null) ? mSharedPreferences.getString(SharedPreferencesUtils.ANONYMOUS_ACCOUNT_INSTANCE, APIUtils.API_BASE_URI) : mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_INSTANCE, null);
-        if (instance != null) {
+        if(instance != null) {
             mRetrofit.setBaseURL(instance);
         }
 
@@ -377,12 +365,9 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
         super.onResume();
         if (mAccessToken == null) {
             String instancePreference = mSharedPreferences.getString(SharedPreferencesUtils.ANONYMOUS_ACCOUNT_INSTANCE, APIUtils.API_BASE_URI);
-            if (!instancePreference.startsWith(mRetrofit.getBaseURL())) {
-                mRetrofit.setBaseURL(instancePreference);
+            if (!mRetrofit.getBaseURL().equalsIgnoreCase(instancePreference)) {
                 this.recreate();
             }
-        } else {
-            checkUserToken();
         }
     }
 
@@ -496,6 +481,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                 Intent intent = new Intent(this, ViewUserDetailActivity.class);
                 intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, mAccountName);
                 intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, mAccountQualifiedName);
+                intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, mAccountName);
                 startActivity(intent);
                 break;
             }
@@ -822,19 +808,21 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
 
         adapter = new NavigationDrawerRecyclerViewMergedAdapter(this, mSharedPreferences,
                 mNsfwAndSpoilerSharedPreferences, mNavigationDrawerSharedPreferences, mSecuritySharedPreferences,
-                mCustomThemeWrapper, mAccountName, mAccountQualifiedName, new NavigationDrawerRecyclerViewMergedAdapter.ItemClickListener() {
-            @Override
-            public void onMenuClick(int stringId) {
-                Intent intent = null;
-                if (stringId == R.string.profile) {
-                    intent = new Intent(MainActivity.this, ViewUserDetailActivity.class);
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, mAccountName);
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, mAccountQualifiedName);
-                } else if (stringId == R.string.subscriptions) {
-                    intent = new Intent(MainActivity.this, SubscribedThingListingActivity.class);
-                } else if (stringId == R.string.multi_reddit) {
+                mCustomThemeWrapper, mAccountName, new NavigationDrawerRecyclerViewMergedAdapter.ItemClickListener() {
+                    @Override
+                    public void onMenuClick(int stringId) {
+                        Intent intent = null;
+                        if (stringId == R.string.profile) {
+                            intent = new Intent(MainActivity.this, ViewUserDetailActivity.class);
+                            intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, mAccountName);
+                            intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, mAccountQualifiedName);
+                        } else if (stringId == R.string.subscriptions) {
+                            intent = new Intent(MainActivity.this, SubscribedThingListingActivity.class);
+                        } else if (stringId == R.string.multi_reddit) {
                             intent = new Intent(MainActivity.this, SubscribedThingListingActivity.class);
                             intent.putExtra(SubscribedThingListingActivity.EXTRA_SHOW_MULTIREDDITS, true);
+                        } else if (stringId == R.string.history) {
+                            intent = new Intent(MainActivity.this, HistoryActivity.class);
                         } else if (stringId == R.string.trending) {
                             intent = new Intent(MainActivity.this, TrendingActivity.class);
                         } else if (stringId == R.string.upvoted) {
@@ -895,11 +883,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                                     });
                         } else if (stringId == R.string.anonymous_account_instance) {
                             changeAnonymousAccountInstance();
-                } else if (stringId == R.string.blocks) {
-                    intent = new Intent(MainActivity.this, BlockedThingListingActivity.class);
-                } else if (stringId == R.string.instance_info) {
-                    intent = new Intent(MainActivity.this, InstanceInfoActivity.class);
-                }
+                        }
                         if (intent != null) {
                             startActivity(intent);
                         }
@@ -936,7 +920,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
         sectionsPagerAdapter = new SectionsPagerAdapter(this, tabCount, mShowFavoriteMultiReddits,
                 mShowMultiReddits, mShowFavoriteSubscribedSubreddits, mShowSubscribedSubreddits);
         viewPager2.setAdapter(sectionsPagerAdapter);
-        viewPager2.setOffscreenPageLimit(ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT);
+        viewPager2.setOffscreenPageLimit(1);
         viewPager2.setUserInputEnabled(!mDisableSwipingBetweenTabs);
         if (mMainActivityTabsSharedPreferences.getBoolean((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_SHOW_TAB_NAMES, true)) {
             if (mShowFavoriteMultiReddits || mShowMultiReddits || mShowFavoriteSubscribedSubreddits || mShowSubscribedSubreddits) {
@@ -947,7 +931,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
             new TabLayoutMediator(tabLayout, viewPager2, (tab, position) -> {
                 switch (position) {
                     case 0:
-                        Utils.setTitleWithCustomFontToTab(typeface, tab, mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_TITLE, getString(R.string.subscribed_feed)));
+                        Utils.setTitleWithCustomFontToTab(typeface, tab, mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_TITLE, getString(R.string.home)));
                         break;
                     case 1:
                         Utils.setTitleWithCustomFontToTab(typeface, tab, mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_TITLE, getString(R.string.local)));
@@ -1026,12 +1010,12 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                         sectionsPagerAdapter.setSubscribedSubreddits(subscribedSubredditData);
                     }
                 });
-        subscribedSubredditViewModel.getAllFavoriteSubscribedSubreddits().observe(this, subscribedSubredditData -> {
+        /*subscribedSubredditViewModel.getAllFavoriteSubscribedSubreddits().observe(this, subscribedSubredditData -> {
             adapter.setFavoriteSubscribedSubreddits(subscribedSubredditData);
             if (mShowFavoriteSubscribedSubreddits && sectionsPagerAdapter != null) {
                 sectionsPagerAdapter.setFavoriteSubscribedSubreddits(subscribedSubredditData);
             }
-        });
+        });*/
 
         accountViewModel = new ViewModelProvider(this,
                 new AccountViewModel.Factory(mRedditDataRoomDatabase)).get(AccountViewModel.class);
@@ -1090,39 +1074,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
         }
     }
 
-    private void checkUserToken() {
-        if (mBearerTokenUsed) {
-            FetchUserData.validateAuthToken(mRetrofit.getRetrofit(), new FetchUserData.ValidateAuthTokenListener() {
-                @Override
-                public void onValidateAuthTokenSuccess() {
-                }
-
-                @Override
-                public void onValidateAuthTokenFailed() {
-                    // Alert user that the token is invalid and they need to re-login
-                    new MaterialAlertDialogBuilder(MainActivity.this, R.style.MaterialAlertDialogTheme)
-                            .setTitle(R.string.token_expired)
-                            .setMessage(R.string.token_expired_message)
-                            .setPositiveButton(R.string.ok, (dialogInterface, i) -> {
-                                Intent intent = new Intent(MainActivity.this, LoginActivity.class);
-                                // Username without instance
-                                String username = mAccountName.substring(0, mAccountQualifiedName.indexOf("@"));
-                                intent.putExtra(LoginActivity.EXTRA_INPUT_USERNAME, username);
-                                intent.putExtra(LoginActivity.EXTRA_INPUT_INSTANCE, mRetrofit.getBaseURL());
-                                startActivity(intent);
-                            })
-                            .setCancelable(false)
-                            .show();
-                }
-
-                @Override
-                public void onCheckFailed(String message) {
-                    applySnackBarTheme(Snackbar.make(findViewById(android.R.id.content), getString(R.string.failed_to_check_token_validity,message), Snackbar.LENGTH_LONG)).show();
-                }
-            });
-        }
-    }
-
     private void loadUserData() {
         if (!mFetchUserInfoSuccess) {
             FetchUserData.fetchUnreadCount(mRetrofit.getRetrofit(), mAccessToken, new FetchUserData.FetchUserUnreadCountListener() {
@@ -1148,35 +1099,9 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
 
                         @Override
                         public void onFetchUserDataFailed() {
-                            mFetchUserInfoSuccess = false;
-                        }
-                    });
-            if (mAccessToken != null) {
-                FetchSiteInfo.fetchSiteInfo(mRetrofit.getRetrofit(), mAccessToken, new FetchSiteInfo.FetchSiteInfoListener() {
-                    @Override
-                    public void onFetchSiteInfoSuccess(SiteInfo siteInfo, MyUserInfo myUserInfo) {
-                        String[] version = siteInfo.getVersion().split("\\.");
-                        if (version.length > 0) {
-                            Log.d("MainActvity", "Lemmy Version: " + version[0] + "." + version[1]);
-                            int majorVersion = Integer.parseInt(version[0]);
-                            int minorVersion = Integer.parseInt(version[1]);
-                            if (majorVersion > 0 || (majorVersion == 0 && minorVersion >= 19)) {
-                                mRetrofit.setAccessToken(mAccessToken);
-                                mCurrentAccountSharedPreferences.edit().putBoolean(SharedPreferencesUtils.BEARER_TOKEN_AUTH, true).apply();
-                                checkUserToken();
-                            } else {
-                                mRetrofit.setAccessToken(null);
-                                mCurrentAccountSharedPreferences.edit().putBoolean(SharedPreferencesUtils.BEARER_TOKEN_AUTH, false).apply();
-                            }
-                        }
-                    }
-
-                    @Override
-                    public void onFetchSiteInfoFailed(boolean parseFailed) {
-
-                    }
-                });
-            }
+                    mFetchUserInfoSuccess = false;
+                }
+            });
         }
     }
 
@@ -1202,7 +1127,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
         int currentPostType = sectionsPagerAdapter.getCurrentPostType();
         PostFragment postFragment = sectionsPagerAdapter.getCurrentFragment();
         if (postFragment != null) {
-            SortTypeBottomSheetFragment sortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(currentPostType, postFragment.getSortType());
+            SortTypeBottomSheetFragment sortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(currentPostType != PostPagingSource.TYPE_FRONT_PAGE, postFragment.getSortType());
             sortTypeBottomSheetFragment.show(getSupportFragmentManager(), sortTypeBottomSheetFragment.getTag());
         }
     }
@@ -1475,6 +1400,10 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                 goToUser();
                 break;
             }
+            case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
+                randomThing();
+                break;
+            }
             case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
                 if (sectionsPagerAdapter != null) {
                     sectionsPagerAdapter.hideReadPosts();
@@ -1582,12 +1511,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
             if (i == EditorInfo.IME_ACTION_DONE) {
                 Utils.hideKeyboard(this);
                 Intent subredditIntent = new Intent(this, ViewSubredditDetailActivity.class);
-                String communityName = thingEditText.getText().toString();
-                if (communityName.startsWith("!")) {
-                    communityName = communityName.substring(1);
-                }
-                subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, communityName);
-
+                subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, thingEditText.getText().toString());
                 startActivity(subredditIntent);
                 return true;
             }
@@ -1645,11 +1569,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                         -> {
                     Utils.hideKeyboard(this);
                     Intent subredditIntent = new Intent(this, ViewSubredditDetailActivity.class);
-                    String communityName = thingEditText.getText().toString();
-                    if (communityName.startsWith("!")) {
-                        communityName = communityName.substring(1);
-                    }
-                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, communityName);
+                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, thingEditText.getText().toString());
                     startActivity(subredditIntent);
                 })
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) -> {
@@ -1670,11 +1590,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
             if (i == EditorInfo.IME_ACTION_DONE) {
                 Utils.hideKeyboard(this);
                 Intent userIntent = new Intent(this, ViewUserDetailActivity.class);
-                String qualifiedName = thingEditText.getText().toString();
-                if (qualifiedName.startsWith("@")) {
-                    qualifiedName = qualifiedName.substring(1);
-                }
-                userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, qualifiedName);
+                userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, thingEditText.getText().toString());
                 startActivity(userIntent);
                 return true;
             }
@@ -1687,11 +1603,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                         -> {
                     Utils.hideKeyboard(this);
                     Intent userIntent = new Intent(this, ViewUserDetailActivity.class);
-                    String qualifiedName = thingEditText.getText().toString();
-                    if (qualifiedName.startsWith("@")) {
-                        qualifiedName = qualifiedName.substring(1);
-                    }
-                    userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, qualifiedName);
+                    userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, thingEditText.getText().toString());
                     startActivity(userIntent);
                 })
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) -> {
@@ -1734,7 +1646,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
     }
 
     public void doNotShowRedditAPIInfoAgain() {
-        mInternalSharedPreferences.edit().putBoolean(SharedPreferencesUtils.DO_NOT_SHOW_REDDIT_API_INFO_V2_AGAIN, true).apply();
+        mInternalSharedPreferences.edit().putBoolean(SharedPreferencesUtils.DO_NOT_SHOW_REDDIT_API_INFO_AGAIN, true).apply();
     }
 
     private class SectionsPagerAdapter extends FragmentStateAdapter {
@@ -1846,7 +1758,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                 Bundle bundle = new Bundle();
                 bundle.putInt(PostFragment.EXTRA_POST_TYPE, mAccessToken == null ? PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE : PostPagingSource.TYPE_FRONT_PAGE);
                 bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
+                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
                 fragment.setArguments(bundle);
                 return fragment;
             } else if (postType == SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_ALL) {
@@ -1855,7 +1767,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                 bundle.putInt(PostFragment.EXTRA_POST_TYPE, PostPagingSource.TYPE_FRONT_PAGE);
                 bundle.putString(PostFragment.EXTRA_NAME, "all");
                 bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
+                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
                 fragment.setArguments(bundle);
                 return fragment;
             } else if (postType == SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_SUBREDDIT) {
@@ -1864,7 +1776,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                 bundle.putInt(PostFragment.EXTRA_POST_TYPE, PostPagingSource.TYPE_SUBREDDIT);
                 bundle.putString(PostFragment.EXTRA_NAME, name);
                 bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
+                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
                 fragment.setArguments(bundle);
                 return fragment;
             } else if (postType == SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_MULTIREDDIT) {
@@ -1873,7 +1785,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                 bundle.putString(PostFragment.EXTRA_NAME, name);
                 bundle.putInt(PostFragment.EXTRA_POST_TYPE, mAccessToken == null ? PostPagingSource.TYPE_ANONYMOUS_MULTIREDDIT : PostPagingSource.TYPE_MULTI_REDDIT);
                 bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
+                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
                 fragment.setArguments(bundle);
                 return fragment;
             } else if (postType == SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_USER) {
@@ -1883,7 +1795,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                 bundle.putString(PostFragment.EXTRA_USER_NAME, name);
                 bundle.putString(PostFragment.EXTRA_USER_WHERE, PostPagingSource.USER_WHERE_SUBMITTED);
                 bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
+                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
                 fragment.setArguments(bundle);
                 return fragment;
             } else if (postType == SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_UPVOTED
@@ -1896,7 +1808,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                 bundle.putInt(PostFragment.EXTRA_POST_TYPE, PostPagingSource.TYPE_USER);
                 bundle.putString(PostFragment.EXTRA_USER_NAME, mAccountName);
                 bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
+                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
                 bundle.putBoolean(PostFragment.EXTRA_DISABLE_READ_POSTS, true);
 
                 if (postType == SharedPreferencesUtils.MAIN_PAGE_TAB_POST_TYPE_UPVOTED) {
@@ -1919,7 +1831,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                 bundle.putInt(PostFragment.EXTRA_POST_TYPE, PostPagingSource.TYPE_FRONT_PAGE);
                 bundle.putString(PostFragment.EXTRA_NAME, "local");
                 bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
+                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
                 fragment.setArguments(bundle);
                 return fragment;
             }

app/src/main/java/eu/toldi/infinityforlemmy/activities/MultiredditSelectionActivity.java

@@ -117,7 +117,7 @@ public class MultiredditSelectionActivity extends BaseActivity implements Activi
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
-        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null);
+        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
 
         if (savedInstanceState == null) {
             bindView(true);

app/src/main/java/eu/toldi/infinityforlemmy/activities/PostFilterPreferenceActivity.java

@@ -8,7 +8,6 @@ import android.view.MenuItem;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -17,7 +16,6 @@ import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
-import java.util.List;
 import java.util.concurrent.Executor;
 
 import javax.inject.Inject;
@@ -28,14 +26,13 @@ import butterknife.ButterKnife;
 import eu.toldi.infinityforlemmy.Infinity;
 import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
-import eu.toldi.infinityforlemmy.adapters.PostFilterWithUsageRecyclerViewAdapter;
+import eu.toldi.infinityforlemmy.adapters.PostFilterRecyclerViewAdapter;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.PostFilterOptionsBottomSheetFragment;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.post.Post;
 import eu.toldi.infinityforlemmy.postfilter.DeletePostFilter;
 import eu.toldi.infinityforlemmy.postfilter.PostFilter;
-import eu.toldi.infinityforlemmy.postfilter.PostFilterWithUsageViewModel;
-import eu.toldi.infinityforlemmy.postfilter.PostFilterWithUsage;
+import eu.toldi.infinityforlemmy.postfilter.PostFilterViewModel;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 
 public class PostFilterPreferenceActivity extends BaseActivity {
@@ -65,8 +62,8 @@ public class PostFilterPreferenceActivity extends BaseActivity {
     CustomThemeWrapper customThemeWrapper;
     @Inject
     Executor executor;
-    public PostFilterWithUsageViewModel postFilterWithUsageViewModel;
-    private PostFilterWithUsageRecyclerViewAdapter adapter;
+    public PostFilterViewModel postFilterViewModel;
+    private PostFilterRecyclerViewAdapter adapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -102,7 +99,7 @@ public class PostFilterPreferenceActivity extends BaseActivity {
             }
         });
 
-        adapter = new PostFilterWithUsageRecyclerViewAdapter(this, customThemeWrapper, postFilter -> {
+        adapter = new PostFilterRecyclerViewAdapter(this, customThemeWrapper, postFilter -> {
             if (post != null) {
                 showPostFilterOptions(post, postFilter);
             } else if (subredditName != null) {
@@ -120,15 +117,10 @@ public class PostFilterPreferenceActivity extends BaseActivity {
 
         recyclerView.setAdapter(adapter);
 
-        postFilterWithUsageViewModel = new ViewModelProvider(this,
-                new PostFilterWithUsageViewModel.Factory(redditDataRoomDatabase)).get(PostFilterWithUsageViewModel.class);
+        postFilterViewModel = new ViewModelProvider(this,
+                new PostFilterViewModel.Factory(redditDataRoomDatabase)).get(PostFilterViewModel.class);
 
-        postFilterWithUsageViewModel.getPostFilterWithUsageListLiveData().observe(this, new Observer<List<PostFilterWithUsage>>() {
-            @Override
-            public void onChanged(List<PostFilterWithUsage> postFilterWithUsages) {
-                adapter.setPostFilterWithUsageList(postFilterWithUsages);
-            }
-        });
+        postFilterViewModel.getPostFilterListLiveData().observe(this, postFilters -> adapter.setPostFilterList(postFilters));
     }
 
     public void showPostFilterOptions(Post post, PostFilter postFilter) {

app/src/main/java/eu/toldi/infinityforlemmy/activities/PostFilterUsageListingActivity.java

@@ -126,9 +126,9 @@ public class PostFilterUsageListingActivity extends BaseActivity {
     }
 
     private void editAndPostFilterUsageNameOfUsage(int type, String nameOfUsage) {
-        View dialogView = getLayoutInflater().inflate(R.layout.dialog_edit_post_or_comment_filter_name_of_usage, null);
-        TextInputLayout textInputLayout = dialogView.findViewById(R.id.text_input_layout_edit_post_or_comment_filter_name_of_usage_dialog);
-        TextInputEditText textInputEditText = dialogView.findViewById(R.id.text_input_edit_text_edit_post_or_comment_filter_name_of_usage_dialog);
+        View dialogView = getLayoutInflater().inflate(R.layout.dialog_edit_post_filter_name_of_usage, null);
+        TextInputLayout textInputLayout = dialogView.findViewById(R.id.text_input_layout_edit_post_filter_name_of_usage_dialog);
+        TextInputEditText textInputEditText = dialogView.findViewById(R.id.text_input_edit_text_edit_post_filter_name_of_usage_dialog);
         int primaryTextColor = customThemeWrapper.getPrimaryTextColor();
         textInputLayout.setBoxStrokeColor(primaryTextColor);
         textInputLayout.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));

app/src/main/java/eu/toldi/infinityforlemmy/activities/PostGalleryActivity.java

@@ -214,7 +214,7 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        mGlide = Glide.with(getApplication());
+        mGlide = Glide.with(this);
 
         mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE);
 
@@ -504,7 +504,7 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
     }
 
     private void loadSubredditIcon() {
-        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, subredditName, mAccessToken, mRetrofit.getRetrofit(), iconImageUrl -> {
+        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, subredditName, mAccessToken, mOauthRetrofit, mRetrofit.getRetrofit(), iconImageUrl -> {
             iconUrl = iconImageUrl;
             displaySubredditIcon();
             loadSubredditIconSuccessful = true;

app/src/main/java/eu/toldi/infinityforlemmy/activities/PostImageActivity.java

@@ -228,7 +228,7 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        mGlide = Glide.with(getApplication());
+        mGlide = Glide.with(this);
 
         mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE);
 
@@ -475,8 +475,6 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
         nsfwTextView.setTextColor(primaryTextColor);
         titleEditText.setTextColor(primaryTextColor);
         titleEditText.setHintTextColor(secondaryTextColor);
-        contentEditText.setTextColor(primaryTextColor);
-        contentEditText.setHintTextColor(secondaryTextColor);
         boolean circleFab = mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false);
         applyFABTheme(captureFab, circleFab);
         applyFABTheme(selectFromLibraryFab, circleFab);
@@ -489,10 +487,6 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
             titleEditText.setTypeface(typeface);
             selectAgainTextView.setTypeface(typeface);
         }
-
-        if (contentTypeface != null) {
-            contentEditText.setTypeface(contentTypeface);
-        }
     }
 
     private void loadImage() {
@@ -517,7 +511,7 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
     }
 
     private void loadSubredditIcon() {
-        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, communityData.getQualified_name(), mAccessToken, mRetrofit.getRetrofit(), iconImageUrl -> {
+        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, subredditName, mAccessToken, mOauthRetrofit, mRetrofit.getRetrofit(), iconImageUrl -> {
             iconUrl = iconImageUrl;
             displaySubredditIcon();
             loadSubredditIconSuccessful = true;

app/src/main/java/eu/toldi/infinityforlemmy/activities/PostLinkActivity.java

@@ -217,7 +217,7 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        mGlide = Glide.with(getApplication());
+        mGlide = Glide.with(this);
 
         mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE);
 
@@ -458,8 +458,6 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
         titleEditText.setHintTextColor(secondaryTextColor);
         suggestTitleButton.setBackgroundColor(mCustomThemeWrapper.getColorPrimaryLightTheme());
         suggestTitleButton.setTextColor(mCustomThemeWrapper.getButtonTextColor());
-        contentEditText.setTextColor(primaryTextColor);
-        contentEditText.setHintTextColor(secondaryTextColor);
         linkEditText.setTextColor(primaryTextColor);
         linkEditText.setHintTextColor(secondaryTextColor);
         if (typeface != null) {
@@ -472,7 +470,6 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
         }
         if (contentTypeface != null) {
             linkEditText.setTypeface(contentTypeface);
-            contentEditText.setTypeface(contentTypeface);
         }
     }
 
@@ -491,8 +488,8 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
     }
 
     private void loadSubredditIcon() {
-        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, communityData.getQualified_name(),
-                mAccessToken, mRetrofit.getRetrofit(), iconImageUrl -> {
+        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, subredditName,
+                mAccessToken, mOauthRetrofit, mRetrofit.getRetrofit(), iconImageUrl -> {
                     iconUrl = iconImageUrl;
                     displaySubredditIcon();
                     loadSubredditIconSuccessful = true;

app/src/main/java/eu/toldi/infinityforlemmy/activities/PostPollActivity.java

@@ -219,7 +219,7 @@ public class PostPollActivity extends BaseActivity implements FlairBottomSheetFr
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        mGlide = Glide.with(getApplication());
+        mGlide = Glide.with(this);
 
         mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE);
 
@@ -500,7 +500,7 @@ public class PostPollActivity extends BaseActivity implements FlairBottomSheetFr
     }
 
     private void loadSubredditIcon() {
-        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, subredditName, mAccessToken, mRetrofit.getRetrofit(), iconImageUrl -> {
+        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, subredditName, mAccessToken, mOauthRetrofit, mRetrofit.getRetrofit(), iconImageUrl -> {
             iconUrl = iconImageUrl;
             displaySubredditIcon();
             loadSubredditIconSuccessful = true;

app/src/main/java/eu/toldi/infinityforlemmy/activities/PostTextActivity.java

@@ -208,7 +208,7 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        mGlide = Glide.with(getApplication());
+        mGlide = Glide.with(this);
 
         mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE);
 
@@ -450,12 +450,12 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr
     }
 
     private void loadSubredditIcon() {
-        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, communityData.getQualified_name(),
-                mAccessToken, mRetrofit.getRetrofit(), iconImageUrl -> {
-                    iconUrl = iconImageUrl;
-                    displaySubredditIcon();
-                    loadSubredditIconSuccessful = true;
-                });
+        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, subredditName,
+                mAccessToken, mOauthRetrofit, mRetrofit.getRetrofit(), iconImageUrl -> {
+            iconUrl = iconImageUrl;
+            displaySubredditIcon();
+            loadSubredditIconSuccessful = true;
+        });
     }
 
     private void promptAlertDialog(int titleResId, int messageResId) {

app/src/main/java/eu/toldi/infinityforlemmy/activities/PostVideoActivity.java

@@ -216,7 +216,7 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        mGlide = Glide.with(getApplication());
+        mGlide = Glide.with(this);
 
         player = new ExoPlayer.Builder(this).build();
         videoPlayerView.setPlayer(player);
@@ -486,11 +486,11 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF
 
     private void loadSubredditIcon() {
         LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, subredditName,
-                mAccessToken, mRetrofit.getRetrofit(), iconImageUrl -> {
-                    iconUrl = iconImageUrl;
-                    displaySubredditIcon();
-                    loadSubredditIconSuccessful = true;
-                });
+                mAccessToken, mOauthRetrofit, mRetrofit.getRetrofit(), iconImageUrl -> {
+            iconUrl = iconImageUrl;
+            displaySubredditIcon();
+            loadSubredditIconSuccessful = true;
+        });
     }
 
     private void promptAlertDialog(int titleResId, int messageResId) {

app/src/main/java/eu/toldi/infinityforlemmy/activities/RulesActivity.java

@@ -132,7 +132,7 @@ public class RulesActivity extends BaseActivity {
 
         mSubredditName = getIntent().getExtras().getString(EXTRA_SUBREDDIT_NAME);
 
-        mAdapter = new RulesRecyclerViewAdapter(this, mCustomThemeWrapper, sliderPanel, mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_IMAGE_PREVIEW, false));
+        mAdapter = new RulesRecyclerViewAdapter(this, mCustomThemeWrapper, sliderPanel);
         recyclerView.setAdapter(mAdapter);
         FetchSubredditData.fetchSubredditData(mRetrofit.getRetrofit(), mSubredditName, mAccessToken, new FetchSubredditData.FetchSubredditDataListener() {
             @Override

app/src/main/java/eu/toldi/infinityforlemmy/activities/SearchActivity.java

@@ -3,7 +3,6 @@ package eu.toldi.infinityforlemmy.activities;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.res.ColorStateList;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -28,14 +27,11 @@ import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.ArrayList;
-import java.util.concurrent.Executor;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -51,14 +47,13 @@ import eu.toldi.infinityforlemmy.apis.RedditAPI;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
 import eu.toldi.infinityforlemmy.events.SwitchAccountEvent;
+import eu.toldi.infinityforlemmy.recentsearchquery.DeleteRecentSearchQuery;
 import eu.toldi.infinityforlemmy.recentsearchquery.RecentSearchQuery;
 import eu.toldi.infinityforlemmy.recentsearchquery.RecentSearchQueryViewModel;
 import eu.toldi.infinityforlemmy.subreddit.ParseSubredditData;
 import eu.toldi.infinityforlemmy.subreddit.SubredditData;
-import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 import eu.toldi.infinityforlemmy.subscribedsubreddit.SubscribedSubredditData;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
-import eu.toldi.infinityforlemmy.utils.LemmyUtils;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
 import retrofit2.Call;
@@ -103,8 +98,6 @@ public class SearchActivity extends BaseActivity {
     ImageView clearSearchTextImageView;
     @BindView(R.id.link_handler_image_view_search_activity)
     ImageView linkHandlerImageView;
-    @BindView(R.id.delete_all_recent_searches_button_search_activity)
-    MaterialButton deleteAllSearchesButton;
     @BindView(R.id.subreddit_name_relative_layout_search_activity)
     RelativeLayout subredditNameRelativeLayout;
     @BindView(R.id.search_in_text_view_search_activity)
@@ -131,8 +124,6 @@ public class SearchActivity extends BaseActivity {
     SharedPreferences mNsfwAndSpoilerSharedPreferences;
     @Inject
     CustomThemeWrapper mCustomThemeWrapper;
-    @Inject
-    Executor executor;
     private String mAccountName;
     private String mAccessToken;
     private String query;
@@ -172,7 +163,6 @@ public class SearchActivity extends BaseActivity {
         setSupportActionBar(toolbar);
 
         clearSearchTextImageView.setVisibility(View.GONE);
-        deleteAllSearchesButton.setVisibility(View.GONE);
 
         searchOnlySubreddits = getIntent().getBooleanExtra(EXTRA_SEARCH_ONLY_SUBREDDITS, false);
         searchOnlyUsers = getIntent().getBooleanExtra(EXTRA_SEARCH_ONLY_USERS, false);
@@ -192,9 +182,9 @@ public class SearchActivity extends BaseActivity {
             if (searchOnlySubreddits) {
                 Intent returnIntent = new Intent();
                 if (getIntent().getBooleanExtra(EXTRA_IS_MULTI_SELECTION, false)) {
-                    ArrayList<SubredditWithSelection> subredditNameList = new ArrayList<>();
-                    subredditNameList.add(new SubredditWithSelection(subredditData.getName(), subredditData.getIconUrl(), LemmyUtils.actorID2FullName(subredditData.getActorId())));
-                    returnIntent.putParcelableArrayListExtra(RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES, subredditNameList);
+                    ArrayList<String> subredditNameList = new ArrayList<>();
+                    subredditNameList.add(subredditData.getName());
+                    returnIntent.putStringArrayListExtra(RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES, subredditNameList);
                 } else {
                     returnIntent.putExtra(EXTRA_RETURN_SUBREDDIT_NAME, new SubscribedSubredditData(subredditData));
                     returnIntent.putExtra(EXTRA_RETURN_SUBREDDIT_ICON_URL, subredditData.getIconUrl());
@@ -264,7 +254,7 @@ public class SearchActivity extends BaseActivity {
         });
 
         searchEditText.setOnEditorActionListener((v, actionId, event) -> {
-            if ((actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_SEARCH) || (event.getKeyCode() == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_DOWN)) {
+            if ((actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_SEARCH) || (event.getKeyCode() == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_DOWN )) {
                 if (!searchEditText.getText().toString().isEmpty()) {
                     search(searchEditText.getText().toString());
                     return true;
@@ -286,17 +276,6 @@ public class SearchActivity extends BaseActivity {
             }
         });
 
-        deleteAllSearchesButton.setOnClickListener(view -> {
-            new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
-                    .setTitle(R.string.confirm)
-                    .setMessage(R.string.confirm_delete_all_recent_searches)
-                    .setPositiveButton(R.string.yes, (dialogInterface, i) -> {
-                        executor.execute(() -> mRedditDataRoomDatabase.recentSearchQueryDao().deleteAllRecentSearchQueries(mAccountName));
-                    })
-                    .setNegativeButton(R.string.no, null)
-                    .show();
-        });
-
         if (savedInstanceState != null) {
             subredditName = savedInstanceState.getString(SUBREDDIT_NAME_STATE);
             subredditIsUser = savedInstanceState.getBoolean(SUBREDDIT_IS_USER_STATE);
@@ -340,7 +319,7 @@ public class SearchActivity extends BaseActivity {
 
                 @Override
                 public void onDelete(RecentSearchQuery recentSearchQuery) {
-                    executor.execute(() -> mRedditDataRoomDatabase.recentSearchQueryDao().deleteRecentSearchQueries(recentSearchQuery));
+                    DeleteRecentSearchQuery.deleteRecentSearchQueryListener(mRedditDataRoomDatabase, recentSearchQuery, () -> {});
                 }
             });
             recyclerView.setVisibility(View.VISIBLE);
@@ -355,10 +334,8 @@ public class SearchActivity extends BaseActivity {
                 mRecentSearchQueryViewModel.getAllRecentSearchQueries().observe(this, recentSearchQueries -> {
                     if (recentSearchQueries != null && !recentSearchQueries.isEmpty()) {
                         divider.setVisibility(View.VISIBLE);
-                        deleteAllSearchesButton.setVisibility(View.VISIBLE);
                     } else {
                         divider.setVisibility(View.GONE);
-                        deleteAllSearchesButton.setVisibility(View.GONE);
                     }
                     adapter.setRecentSearchQueries(recentSearchQueries);
                 });
@@ -387,11 +364,6 @@ public class SearchActivity extends BaseActivity {
             intent.putExtra(SearchUsersResultActivity.EXTRA_QUERY, query);
             intent.putExtra(SearchUsersResultActivity.EXTRA_IS_MULTI_SELECTION, getIntent().getBooleanExtra(EXTRA_IS_MULTI_SELECTION, false));
             startActivityForResult(intent, USER_SEARCH_REQUEST_CODE);
-        } else if (query.startsWith("http://") || query.startsWith("https://")) {
-            Intent intent = new Intent(this, LinkResolverActivity.class);
-            intent.setData(Uri.parse(query));
-            startActivity(intent);
-            finish();
         } else {
             Intent intent = new Intent(SearchActivity.this, SearchResultActivity.class);
             intent.putExtra(SearchResultActivity.EXTRA_QUERY, query);
@@ -405,7 +377,6 @@ public class SearchActivity extends BaseActivity {
             }
             startActivity(intent);
             finish();
-
         }
     }
 
@@ -430,7 +401,6 @@ public class SearchActivity extends BaseActivity {
         linkHandlerImageView.setColorFilter(mCustomThemeWrapper.getToolbarPrimaryTextAndIconColor(), android.graphics.PorterDuff.Mode.SRC_IN);
         int colorAccent = mCustomThemeWrapper.getColorAccent();
         searchInTextView.setTextColor(colorAccent);
-        deleteAllSearchesButton.setIconTint(ColorStateList.valueOf(mCustomThemeWrapper.getPrimaryIconColor()));
         subredditNameTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
         divider.setBackgroundColor(mCustomThemeWrapper.getDividerColor());
         if (typeface != null) {
@@ -463,20 +433,18 @@ public class SearchActivity extends BaseActivity {
         if (resultCode == RESULT_OK && data != null) {
             if (requestCode == SUBREDDIT_SELECTION_REQUEST_CODE) {
                 communityData = data.getParcelableExtra(SubredditSelectionActivity.EXTRA_RETURN_COMMUNITY_DATA);
-
+                subredditName = communityData.getName();
                 subredditIsUser = false;
 
-                if (communityData == null) {
+                if (subredditName == null) {
                     subredditNameTextView.setText(R.string.all_communities);
                 } else {
-                    subredditName = communityData.getName();
-                    communityQualifiedName = communityData.getQualified_name();
                     subredditNameTextView.setText(subredditName);
                 }
             } else if (requestCode == SUBREDDIT_SEARCH_REQUEST_CODE) {
                 Intent returnIntent = new Intent();
                 if (getIntent().getBooleanExtra(EXTRA_IS_MULTI_SELECTION, false)) {
-                    returnIntent.putParcelableArrayListExtra(RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES, data.getParcelableArrayListExtra(SearchSubredditsResultActivity.RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES));
+                    returnIntent.putStringArrayListExtra(RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES, data.getStringArrayListExtra(SearchSubredditsResultActivity.RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES));
                 } else {
                     SubscribedSubredditData communityData = data.getParcelableExtra(SearchSubredditsResultActivity.EXTRA_RETURN_SUBREDDIT_NAME);
                     String iconUrl = data.getStringExtra(SearchSubredditsResultActivity.EXTRA_RETURN_SUBREDDIT_ICON_URL);

app/src/main/java/eu/toldi/infinityforlemmy/activities/SearchResultActivity.java

@@ -38,7 +38,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.ArrayList;
-import java.util.concurrent.Executor;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -59,13 +58,13 @@ import eu.toldi.infinityforlemmy.bottomsheetfragments.FABMoreOptionsBottomSheetF
 import eu.toldi.infinityforlemmy.bottomsheetfragments.PostLayoutBottomSheetFragment;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.PostTypeBottomSheetFragment;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.RandomBottomSheetFragment;
+import eu.toldi.infinityforlemmy.bottomsheetfragments.SearchPostSortTypeBottomSheetFragment;
+import eu.toldi.infinityforlemmy.bottomsheetfragments.SearchUserAndSubredditSortTypeBottomSheetFragment;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.SortTimeBottomSheetFragment;
-import eu.toldi.infinityforlemmy.bottomsheetfragments.SortTypeBottomSheetFragment;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
 import eu.toldi.infinityforlemmy.events.ChangeNSFWEvent;
 import eu.toldi.infinityforlemmy.events.SwitchAccountEvent;
-import eu.toldi.infinityforlemmy.fragments.CommentsListingFragment;
 import eu.toldi.infinityforlemmy.fragments.PostFragment;
 import eu.toldi.infinityforlemmy.fragments.SubredditListingFragment;
 import eu.toldi.infinityforlemmy.fragments.UserListingFragment;
@@ -131,11 +130,10 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
     SharedPreferences mCurrentAccountSharedPreferences;
     @Inject
     CustomThemeWrapper mCustomThemeWrapper;
-    @Inject
-    Executor executor;
     private Call<String> subredditAutocompleteCall;
     private String mAccessToken;
     private String mAccountName;
+
     private String mAccountQualifiedName;
     private String mQuery;
     private String mSubredditName;
@@ -246,7 +244,7 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
     private void bindView(Bundle savedInstanceState) {
         sectionsPagerAdapter = new SectionsPagerAdapter(this);
         viewPager2.setAdapter(sectionsPagerAdapter);
-        viewPager2.setOffscreenPageLimit(ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT);
+        viewPager2.setOffscreenPageLimit(3);
         viewPager2.setUserInputEnabled(!mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_SWIPING_BETWEEN_TABS, false));
         viewPager2.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
             @Override
@@ -271,9 +269,6 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
                 case 2:
                     Utils.setTitleWithCustomFontToTab(typeface, tab, getString(R.string.users));
                     break;
-                case 3:
-                    Utils.setTitleWithCustomFontToTab(typeface, tab, getString(R.string.comments));
-                    break;
             }
         }).attach();
         fixViewPager2Sensitivity(viewPager2);
@@ -339,7 +334,7 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
                 case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_FAB_CHANGE_SORT_TYPE: {
                     Fragment fragment = sectionsPagerAdapter.getCurrentFragment();
                     if (fragment instanceof PostFragment) {
-                        SortTypeBottomSheetFragment searchPostSortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(SortTypeBottomSheetFragment.PAGE_TYPE_SEARCH,((PostFragment) fragment).getSortType());
+                        SearchPostSortTypeBottomSheetFragment searchPostSortTypeBottomSheetFragment = SearchPostSortTypeBottomSheetFragment.getNewInstance(((PostFragment) fragment).getSortType());
                         searchPostSortTypeBottomSheetFragment.show(getSupportFragmentManager(), searchPostSortTypeBottomSheetFragment.getTag());
                     }
                     break;
@@ -397,26 +392,25 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
         });
 
         if (mAccountName != null && mSharedPreferences.getBoolean(SharedPreferencesUtils.ENABLE_SEARCH_HISTORY, true) && !mInsertSearchQuerySuccess && mQuery != null) {
-            InsertRecentSearchQuery.insertRecentSearchQueryListener(executor, new Handler(getMainLooper()),
-                    mRedditDataRoomDatabase, mAccountQualifiedName, mQuery, () -> mInsertSearchQuerySuccess = true);
+            InsertRecentSearchQuery.insertRecentSearchQueryListener(mRedditDataRoomDatabase, mAccountQualifiedName,
+                    mQuery, () -> mInsertSearchQuerySuccess = true);
         }
     }
 
     private void displaySortTypeBottomSheetFragment() {
         Fragment fragment = sectionsPagerAdapter.getCurrentFragment();
         if (fragment instanceof PostFragment) {
-            SortTypeBottomSheetFragment searchPostSortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(SortTypeBottomSheetFragment.PAGE_TYPE_SEARCH,((PostFragment) fragment).getSortType());
+            SearchPostSortTypeBottomSheetFragment searchPostSortTypeBottomSheetFragment = SearchPostSortTypeBottomSheetFragment.getNewInstance(((PostFragment) fragment).getSortType());
             searchPostSortTypeBottomSheetFragment.show(getSupportFragmentManager(), searchPostSortTypeBottomSheetFragment.getTag());
         } else {
             if (fragment instanceof SubredditListingFragment) {
-                SortTypeBottomSheetFragment searchPostSortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(SortTypeBottomSheetFragment.PAGE_TYPE_SEARCH,((SubredditListingFragment) fragment).getSortType());
-                searchPostSortTypeBottomSheetFragment.show(getSupportFragmentManager(), searchPostSortTypeBottomSheetFragment.getTag());
+                SearchUserAndSubredditSortTypeBottomSheetFragment searchUserAndSubredditSortTypeBottomSheetFragment
+                        = SearchUserAndSubredditSortTypeBottomSheetFragment.getNewInstance(viewPager2.getCurrentItem(), ((SubredditListingFragment) fragment).getSortType());
+                searchUserAndSubredditSortTypeBottomSheetFragment.show(getSupportFragmentManager(), searchUserAndSubredditSortTypeBottomSheetFragment.getTag());
             } else if (fragment instanceof UserListingFragment) {
-                SortTypeBottomSheetFragment searchPostSortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(SortTypeBottomSheetFragment.PAGE_TYPE_SEARCH,((UserListingFragment) fragment).getSortType());
-                searchPostSortTypeBottomSheetFragment.show(getSupportFragmentManager(), searchPostSortTypeBottomSheetFragment.getTag());
-            } else if (fragment instanceof CommentsListingFragment) {
-                SortTypeBottomSheetFragment searchPostSortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(SortTypeBottomSheetFragment.PAGE_TYPE_SEARCH,((CommentsListingFragment) fragment).getSortType());
-                searchPostSortTypeBottomSheetFragment.show(getSupportFragmentManager(), searchPostSortTypeBottomSheetFragment.getTag());
+                SearchUserAndSubredditSortTypeBottomSheetFragment searchUserAndSubredditSortTypeBottomSheetFragment
+                        = SearchUserAndSubredditSortTypeBottomSheetFragment.getNewInstance(viewPager2.getCurrentItem(), ((UserListingFragment) fragment).getSortType());
+                searchUserAndSubredditSortTypeBottomSheetFragment.show(getSupportFragmentManager(), searchUserAndSubredditSortTypeBottomSheetFragment.getTag());
             }
         }
     }
@@ -476,6 +470,7 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
         if (sectionsPagerAdapter != null) {
             sectionsPagerAdapter.changeSortType(sortType);
         }
+
     }
 
     @Override
@@ -563,6 +558,10 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
                 goToUser();
                 break;
             }
+            case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
+                random();
+                break;
+            }
             case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
                 if (sectionsPagerAdapter != null) {
                     sectionsPagerAdapter.hideReadPosts();
@@ -779,7 +778,7 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
                     bundle.putString(PostFragment.EXTRA_QUERY, mQuery);
                     bundle.putString(PostFragment.EXTRA_TRENDING_SOURCE, getIntent().getStringExtra(EXTRA_TRENDING_SOURCE));
                     bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                    bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
+                    bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
                     mFragment.setArguments(bundle);
                     return mFragment;
                 }
@@ -789,12 +788,11 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
                     bundle.putString(SubredditListingFragment.EXTRA_QUERY, mQuery);
                     bundle.putBoolean(SubredditListingFragment.EXTRA_IS_GETTING_SUBREDDIT_INFO, false);
                     bundle.putString(SubredditListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                    bundle.putString(SubredditListingFragment.EXTRA_ACCOUNT_NAME, mAccountName);
-                    bundle.putString(SubredditListingFragment.EXTRA_ACCOUNT_QUALIFIED_NAME, mAccountQualifiedName);
+                    bundle.putString(SubredditListingFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
                     mFragment.setArguments(bundle);
                     return mFragment;
                 }
-                case 2: {
+                default: {
                     UserListingFragment mFragment = new UserListingFragment();
                     Bundle bundle = new Bundle();
                     bundle.putString(UserListingFragment.EXTRA_QUERY, mQuery);
@@ -804,15 +802,6 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
                     mFragment.setArguments(bundle);
                     return mFragment;
                 }
-                default: {
-                    CommentsListingFragment mFragment = new CommentsListingFragment();
-                    Bundle bundle = new Bundle();
-                    bundle.putString(CommentsListingFragment.EXTRA_SEARCH_QUERY, mQuery);
-                    bundle.putString(CommentsListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                    bundle.putString(CommentsListingFragment.EXTRA_ACCOUNT_NAME, mAccountName);
-                    mFragment.setArguments(bundle);
-                    return mFragment;
-                }
             }
         }
 
@@ -837,19 +826,9 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
 
         void changeSortType(SortType sortType) {
             Fragment fragment = getCurrentFragment();
-
             if (fragment instanceof PostFragment) {
                 ((PostFragment) fragment).changeSortType(sortType);
                 displaySortTypeInToolbar();
-            } else if (fragment instanceof SubredditListingFragment) {
-                ((SubredditListingFragment) fragment).changeSortType(sortType);
-                displaySortTypeInToolbar();
-            } else if (fragment instanceof UserListingFragment) {
-                ((UserListingFragment) fragment).changeSortType(sortType);
-                displaySortTypeInToolbar();
-            } else if (fragment instanceof CommentsListingFragment) {
-                ((CommentsListingFragment) fragment).changeSortType(sortType);
-                displaySortTypeInToolbar();
             }
         }
 
@@ -892,8 +871,6 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
                 ((SubredditListingFragment) fragment).goBackToTop();
             } else if (fragment instanceof UserListingFragment) {
                 ((UserListingFragment) fragment).goBackToTop();
-            } else if (fragment instanceof CommentsListingFragment) {
-                ((CommentsListingFragment) fragment).goBackToTop();
             }
         }
 
@@ -908,9 +885,6 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
             } else if (fragment instanceof UserListingFragment) {
                 SortType sortType = ((UserListingFragment) fragment).getSortType();
                 Utils.displaySortTypeInToolbar(sortType, toolbar);
-            } else if (fragment instanceof CommentsListingFragment) {
-                SortType sortType = ((CommentsListingFragment) fragment).getSortType();
-                Utils.displaySortTypeInToolbar(sortType, toolbar);
             }
         }
 
@@ -930,7 +904,7 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
 
         @Override
         public int getItemCount() {
-            return 4;
+            return 3;
         }
     }
 

app/src/main/java/eu/toldi/infinityforlemmy/activities/SearchSubredditsResultActivity.java

@@ -35,7 +35,6 @@ import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
 import eu.toldi.infinityforlemmy.events.SwitchAccountEvent;
 import eu.toldi.infinityforlemmy.fragments.SubredditListingFragment;
 import eu.toldi.infinityforlemmy.subreddit.SubredditData;
-import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 import eu.toldi.infinityforlemmy.subscribedsubreddit.SubscribedSubredditData;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 
@@ -120,8 +119,7 @@ public class SearchSubredditsResultActivity extends BaseActivity implements Acti
             bundle.putString(SubredditListingFragment.EXTRA_QUERY, query);
             bundle.putBoolean(SubredditListingFragment.EXTRA_IS_GETTING_SUBREDDIT_INFO, true);
             bundle.putString(SubredditListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-            bundle.putString(SubredditListingFragment.EXTRA_ACCOUNT_NAME, mAccountName);
-            bundle.putString(SubredditListingFragment.EXTRA_ACCOUNT_QUALIFIED_NAME, mAccountQualifiedName);
+            bundle.putString(SubredditListingFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
             bundle.putBoolean(SubredditListingFragment.EXTRA_IS_MULTI_SELECTION, getIntent().getBooleanExtra(EXTRA_IS_MULTI_SELECTION, false));
             mFragment.setArguments(bundle);
         } else {
@@ -172,9 +170,9 @@ public class SearchSubredditsResultActivity extends BaseActivity implements Acti
             return true;
         } else if (item.getItemId() == R.id.action_save_search_subreddits_result_activity) {
             if (mFragment != null) {
-                ArrayList<SubredditWithSelection> selectedSubredditNames = ((SubredditListingFragment) mFragment).getSelectedSubredditNames();
+                ArrayList<String> selectedSubredditNames = ((SubredditListingFragment) mFragment).getSelectedSubredditNames();
                 Intent returnIntent = new Intent();
-                returnIntent.putParcelableArrayListExtra(RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES, selectedSubredditNames);
+                returnIntent.putStringArrayListExtra(RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES, selectedSubredditNames);
                 setResult(Activity.RESULT_OK, returnIntent);
                 finish();
             }

app/src/main/java/eu/toldi/infinityforlemmy/activities/SelectedSubredditsAndUsersActivity.java

@@ -18,6 +18,7 @@ import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.util.ArrayList;
+import java.util.Collections;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -28,10 +29,10 @@ import eu.toldi.infinityforlemmy.ActivityToolbarInterface;
 import eu.toldi.infinityforlemmy.Infinity;
 import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.adapters.SelectedSubredditsRecyclerViewAdapter;
+import eu.toldi.infinityforlemmy.bottomsheetfragments.SelectSubredditsOrUsersOptionsBottomSheetFragment;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.customviews.LinearLayoutManagerBugFixed;
 import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
-import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 
 public class SelectedSubredditsAndUsersActivity extends BaseActivity implements ActivityToolbarInterface {
@@ -61,7 +62,7 @@ public class SelectedSubredditsAndUsersActivity extends BaseActivity implements
     CustomThemeWrapper mCustomThemeWrapper;
     private LinearLayoutManagerBugFixed linearLayoutManager;
     private SelectedSubredditsRecyclerViewAdapter adapter;
-    private ArrayList<SubredditWithSelection> subreddits;
+    private ArrayList<String> subreddits;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -85,11 +86,12 @@ public class SelectedSubredditsAndUsersActivity extends BaseActivity implements
         setToolbarGoToTop(toolbar);
 
         if (savedInstanceState != null) {
-            subreddits = savedInstanceState.getParcelableArrayList(SELECTED_SUBREDDITS_STATE);
+            subreddits = savedInstanceState.getStringArrayList(SELECTED_SUBREDDITS_STATE);
         } else {
-            subreddits = getIntent().getParcelableArrayListExtra(EXTRA_SELECTED_SUBREDDITS);
+            subreddits = getIntent().getStringArrayListExtra(EXTRA_SELECTED_SUBREDDITS);
         }
 
+        Collections.sort(subreddits);
 
         adapter = new SelectedSubredditsRecyclerViewAdapter(this, mCustomThemeWrapper, subreddits);
         linearLayoutManager = new LinearLayoutManagerBugFixed(this);
@@ -108,7 +110,8 @@ public class SelectedSubredditsAndUsersActivity extends BaseActivity implements
         });
 
         fab.setOnClickListener(view -> {
-            selectSubreddits();
+            SelectSubredditsOrUsersOptionsBottomSheetFragment selectSubredditsOrUsersOptionsBottomSheetFragment = new SelectSubredditsOrUsersOptionsBottomSheetFragment();
+            selectSubredditsOrUsersOptionsBottomSheetFragment.show(getSupportFragmentManager(), selectSubredditsOrUsersOptionsBottomSheetFragment.getTag());
         });
     }
 
@@ -155,7 +158,7 @@ public class SelectedSubredditsAndUsersActivity extends BaseActivity implements
                     if (subreddits == null) {
                         subreddits = new ArrayList<>();
                     }
-                    subreddits = data.getParcelableArrayListExtra(SubredditMultiselectionActivity.EXTRA_RETURN_SELECTED_SUBREDDITS);
+                    subreddits = data.getStringArrayListExtra(SubredditMultiselectionActivity.EXTRA_RETURN_SELECTED_SUBREDDITS);
                     adapter.addSubreddits(subreddits);
                 }
             } else if (requestCode == USER_SELECTION_REQUEST_CODE) {
@@ -173,7 +176,7 @@ public class SelectedSubredditsAndUsersActivity extends BaseActivity implements
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         if (adapter != null) {
-            outState.putParcelableArrayList(SELECTED_SUBREDDITS_STATE, adapter.getSubreddits());
+            outState.putStringArrayList(SELECTED_SUBREDDITS_STATE, adapter.getSubreddits());
         }
     }
 

app/src/main/java/eu/toldi/infinityforlemmy/activities/SendPrivateMessageActivity.java

@@ -1,13 +1,8 @@
 package eu.toldi.infinityforlemmy.activities;
 
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
 import android.content.SharedPreferences;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Environment;
-import android.provider.MediaStore;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -15,20 +10,12 @@ import android.widget.EditText;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.core.content.FileProvider;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.snackbar.Snackbar;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.concurrent.Executor;
-
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -36,24 +23,13 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import eu.toldi.infinityforlemmy.Infinity;
 import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.RetrofitHolder;
-import eu.toldi.infinityforlemmy.UploadImageEnabledActivity;
-import eu.toldi.infinityforlemmy.UploadedImage;
-import eu.toldi.infinityforlemmy.adapters.MarkdownBottomBarRecyclerViewAdapter;
-import eu.toldi.infinityforlemmy.bottomsheetfragments.UploadedImagesBottomSheetFragment;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import eu.toldi.infinityforlemmy.customviews.LinearLayoutManagerBugFixed;
-import eu.toldi.infinityforlemmy.privatemessage.LemmyPrivateMessageAPI;
-import eu.toldi.infinityforlemmy.privatemessage.PrivateMessage;
-import eu.toldi.infinityforlemmy.user.BasicUserInfo;
+import eu.toldi.infinityforlemmy.message.ComposeMessage;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
-import eu.toldi.infinityforlemmy.utils.Utils;
+import retrofit2.Retrofit;
 
-public class SendPrivateMessageActivity extends BaseActivity implements UploadImageEnabledActivity {
-    public static final String EXTRA_RECIPIENT_USER_INFO = "ERUI";
-
-    private static final int PICK_IMAGE_REQUEST_CODE = 100;
-    private static final int CAPTURE_IMAGE_REQUEST_CODE = 200;
+public class SendPrivateMessageActivity extends BaseActivity {
+    public static final String EXTRA_RECIPIENT_USERNAME = "ERU";
     @BindView(R.id.coordinator_layout_send_private_message_activity)
     CoordinatorLayout coordinatorLayout;
     @BindView(R.id.appbar_layout_send_private_message_activity)
@@ -64,20 +40,15 @@ public class SendPrivateMessageActivity extends BaseActivity implements UploadIm
     EditText usernameEditText;
     @BindView(R.id.divider_1_send_private_message_activity)
     View divider1;
+    @BindView(R.id.subjet_edit_text_send_private_message_activity)
+    EditText subjectEditText;
     @BindView(R.id.divider_2_send_private_message_activity)
     View divider2;
     @BindView(R.id.content_edit_text_send_private_message_activity)
     EditText messageEditText;
-
-    @BindView(R.id.markdown_bottom_bar_recycler_view_send_private_message_activity)
-    RecyclerView markdownBottomBarRecyclerView;
     @Inject
-    @Named("no_oauth")
-    RetrofitHolder mRetrofit;
-
-    @Inject
-    Executor mExecutor;
-
+    @Named("oauth")
+    Retrofit mOauthRetrofit;
     @Inject
     @Named("default")
     SharedPreferences mSharedPreferences;
@@ -86,24 +57,15 @@ public class SendPrivateMessageActivity extends BaseActivity implements UploadIm
     SharedPreferences mCurrentAccountSharedPreferences;
     @Inject
     CustomThemeWrapper mCustomThemeWrapper;
-
-    @Inject
-    LemmyPrivateMessageAPI mLemmyPrivateMessageAPI;
     private String mAccessToken;
-
-    private BasicUserInfo mRecipientBasicUserInfo;
     private boolean isSubmitting = false;
 
-    private ArrayList<UploadedImage> uploadedImages = new ArrayList<>();
-
-    private Uri capturedImageUri;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         ((Infinity) getApplication()).getAppComponent().inject(this);
 
         setImmersiveModeNotApplicable();
-
+        
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_send_private_message);
 
@@ -115,66 +77,14 @@ public class SendPrivateMessageActivity extends BaseActivity implements UploadIm
             addOnOffsetChangedListener(appBarLayout);
         }
 
-        MarkdownBottomBarRecyclerViewAdapter adapter = new MarkdownBottomBarRecyclerViewAdapter(
-                mCustomThemeWrapper, new MarkdownBottomBarRecyclerViewAdapter.ItemClickListener() {
-            @Override
-            public void onClick(int item) {
-                MarkdownBottomBarRecyclerViewAdapter.bindEditTextWithItemClickListener(
-                        SendPrivateMessageActivity.this, messageEditText, item);
-            }
-
-            @Override
-            public void onUploadImage() {
-                Utils.hideKeyboard(SendPrivateMessageActivity.this);
-                UploadedImagesBottomSheetFragment fragment = new UploadedImagesBottomSheetFragment();
-                Bundle arguments = new Bundle();
-                arguments.putParcelableArrayList(UploadedImagesBottomSheetFragment.EXTRA_UPLOADED_IMAGES,
-                        uploadedImages);
-                fragment.setArguments(arguments);
-                fragment.show(getSupportFragmentManager(), fragment.getTag());
-            }
-        });
-
-        markdownBottomBarRecyclerView.setLayoutManager(new LinearLayoutManagerBugFixed(this,
-                LinearLayoutManagerBugFixed.HORIZONTAL, false));
-        markdownBottomBarRecyclerView.setAdapter(adapter);
-
         mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
 
         setSupportActionBar(toolbar);
-        if (savedInstanceState != null) {
-            mRecipientBasicUserInfo = savedInstanceState.getParcelable(EXTRA_RECIPIENT_USER_INFO);
-        } else {
-            mRecipientBasicUserInfo = getIntent().getParcelableExtra(EXTRA_RECIPIENT_USER_INFO);
+
+        String username = getIntent().getStringExtra(EXTRA_RECIPIENT_USERNAME);
+        if (username != null) {
+            usernameEditText.setText(username);
         }
-
-        if (mRecipientBasicUserInfo != null) {
-            usernameEditText.setText(mRecipientBasicUserInfo.getQualifiedName());
-            usernameEditText.setEnabled(false);
-        } else {
-            finish();
-        }
-
-
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode == RESULT_OK) {
-            if (requestCode == PICK_IMAGE_REQUEST_CODE) {
-                if (data == null) {
-                    Toast.makeText(SendPrivateMessageActivity.this, R.string.error_getting_image, Toast.LENGTH_LONG).show();
-                    return;
-                }
-                Utils.uploadImageToReddit(this, mExecutor, mRetrofit,
-                        mAccessToken, messageEditText, coordinatorLayout, data.getData(), uploadedImages);
-            } else if (requestCode == CAPTURE_IMAGE_REQUEST_CODE) {
-                Utils.uploadImageToReddit(this, mExecutor, mRetrofit,
-                        mAccessToken, messageEditText, coordinatorLayout, capturedImageUri, uploadedImages);
-            }
-        }
-
     }
 
     @Override
@@ -198,6 +108,12 @@ public class SendPrivateMessageActivity extends BaseActivity implements UploadIm
                     return true;
                 }
 
+                if (subjectEditText.getText() == null || subjectEditText.getText().toString().equals("")) {
+                    isSubmitting = false;
+                    Snackbar.make(coordinatorLayout, R.string.message_subject_required, Snackbar.LENGTH_LONG).show();
+                    return true;
+                }
+
                 if (messageEditText.getText() == null || messageEditText.getText().toString().equals("")) {
                     isSubmitting = false;
                     Snackbar.make(coordinatorLayout, R.string.message_content_required, Snackbar.LENGTH_LONG).show();
@@ -209,26 +125,32 @@ public class SendPrivateMessageActivity extends BaseActivity implements UploadIm
                 Snackbar sendingSnackbar = Snackbar.make(coordinatorLayout, R.string.sending_message, Snackbar.LENGTH_INDEFINITE);
                 sendingSnackbar.show();
 
-                mLemmyPrivateMessageAPI.sendPrivateMessage(mAccessToken, mRecipientBasicUserInfo.getId(), messageEditText.getText().toString(), new LemmyPrivateMessageAPI.PrivateMessageSentListener() {
-                    @Override
-                    public void onPrivateMessageSentSuccess(@NonNull PrivateMessage privateMessage) {
-                        isSubmitting = false;
-                        item.setEnabled(true);
-                        item.getIcon().setAlpha(255);
-                        Toast.makeText(SendPrivateMessageActivity.this, R.string.send_message_success, Toast.LENGTH_SHORT).show();
-                        finish();
-                    }
+                ComposeMessage.composeMessage(mOauthRetrofit, mAccessToken, getResources().getConfiguration().locale,
+                        usernameEditText.getText().toString(), subjectEditText.getText().toString(),
+                        messageEditText.getText().toString(), new ComposeMessage.ComposeMessageListener() {
+                            @Override
+                            public void composeMessageSuccess() {
+                                isSubmitting = false;
+                                item.setEnabled(true);
+                                item.getIcon().setAlpha(255);
+                                Toast.makeText(SendPrivateMessageActivity.this, R.string.send_message_success, Toast.LENGTH_SHORT).show();
+                                finish();
+                            }
 
-                    @Override
-                    public void onPrivateMessageSentError() {
-                        isSubmitting = false;
-                        sendingSnackbar.dismiss();
-                        item.setEnabled(true);
-                        item.getIcon().setAlpha(255);
+                            @Override
+                            public void composeMessageFailed(String errorMessage) {
+                                isSubmitting = false;
+                                sendingSnackbar.dismiss();
+                                item.setEnabled(true);
+                                item.getIcon().setAlpha(255);
 
-                        Snackbar.make(coordinatorLayout, R.string.send_message_failed, Snackbar.LENGTH_LONG).show();
-                    }
-                });
+                                if (errorMessage == null || errorMessage.equals("")) {
+                                    Snackbar.make(coordinatorLayout, R.string.send_message_failed, Snackbar.LENGTH_LONG).show();
+                                } else {
+                                    Snackbar.make(coordinatorLayout, errorMessage, Snackbar.LENGTH_LONG).show();
+                                }
+                            }
+                        });
             }
         }
         return false;
@@ -237,7 +159,6 @@ public class SendPrivateMessageActivity extends BaseActivity implements UploadIm
     @Override
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putParcelable(EXTRA_RECIPIENT_USER_INFO, mRecipientBasicUserInfo);
     }
 
     @Override
@@ -256,49 +177,19 @@ public class SendPrivateMessageActivity extends BaseActivity implements UploadIm
         applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, null, toolbar);
         int primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
         usernameEditText.setTextColor(primaryTextColor);
+        subjectEditText.setTextColor(primaryTextColor);
         messageEditText.setTextColor(primaryTextColor);
         int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor();
         usernameEditText.setHintTextColor(secondaryTextColor);
+        subjectEditText.setHintTextColor(secondaryTextColor);
         messageEditText.setHintTextColor(secondaryTextColor);
         int dividerColor = mCustomThemeWrapper.getDividerColor();
         divider1.setBackgroundColor(dividerColor);
         divider2.setBackgroundColor(dividerColor);
         if (typeface != null) {
             usernameEditText.setTypeface(typeface);
+            subjectEditText.setTypeface(typeface);
             messageEditText.setTypeface(typeface);
         }
     }
-
-    @Override
-    public void uploadImage() {
-        Intent intent = new Intent();
-        intent.setType("image/*");
-        intent.setAction(Intent.ACTION_GET_CONTENT);
-        startActivityForResult(Intent.createChooser(intent,
-                getResources().getString(R.string.select_from_gallery)), PICK_IMAGE_REQUEST_CODE);
-    }
-
-    @Override
-    public void captureImage() {
-        Intent pictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-        try {
-            capturedImageUri = FileProvider.getUriForFile(this, "eu.toldi.infinityforlemmy.provider",
-                    File.createTempFile("captured_image", ".jpg", getExternalFilesDir(Environment.DIRECTORY_PICTURES)));
-            pictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, capturedImageUri);
-            startActivityForResult(pictureIntent, CAPTURE_IMAGE_REQUEST_CODE);
-        } catch (IOException ex) {
-            Toast.makeText(this, R.string.error_creating_temp_file, Toast.LENGTH_SHORT).show();
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(this, R.string.no_camera_available, Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    @Override
-    public void insertImageUrl(UploadedImage uploadedImage) {
-        int start = Math.max(messageEditText.getSelectionStart(), 0);
-        int end = Math.max(messageEditText.getSelectionEnd(), 0);
-        messageEditText.getText().replace(Math.min(start, end), Math.max(start, end),
-                "![" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
-                0, "![]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
-    }
 }

app/src/main/java/eu/toldi/infinityforlemmy/activities/SettingsActivity.java

@@ -81,7 +81,7 @@ public class SettingsActivity extends BaseActivity implements
 
         setSupportActionBar(binding.toolbarSettingsActivity);
 
-        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null);
+        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
 
         if (savedInstanceState == null) {
             getSupportFragmentManager()

app/src/main/java/eu/toldi/infinityforlemmy/activities/SubmitCrosspostActivity.java

@@ -112,6 +112,8 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
     View divider1;
     @BindView(R.id.flair_custom_text_view_submit_crosspost_activity)
     CustomTextView flairTextView;
+    @BindView(R.id.spoiler_custom_text_view_submit_crosspost_activity)
+    CustomTextView spoilerTextView;
     @BindView(R.id.nsfw_custom_text_view_submit_crosspost_activity)
     CustomTextView nsfwTextView;
     @BindView(R.id.divider_2_submit_crosspost_activity)
@@ -202,7 +204,7 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        mGlide = Glide.with(getApplication());
+        mGlide = Glide.with(this);
 
         mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE);
 
@@ -257,6 +259,11 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
                 flairTextView.setBorderColor(flairBackgroundColor);
                 flairTextView.setTextColor(flairTextColor);
             }
+            if (isSpoiler) {
+                spoilerTextView.setBackgroundColor(spoilerBackgroundColor);
+                spoilerTextView.setBorderColor(spoilerBackgroundColor);
+                spoilerTextView.setTextColor(spoilerTextColor);
+            }
             if (isNSFW) {
                 nsfwTextView.setBackgroundColor(nsfwBackgroundColor);
                 nsfwTextView.setBorderColor(nsfwBackgroundColor);
@@ -280,14 +287,13 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
             titleEditText.setText(post.getTitle());
         }
 
-        if (post.getPostType() == Post.TEXT_TYPE || post.getPostType() == Post.LINK_TYPE || post.getPostType() == Post.NO_PREVIEW_LINK_TYPE) {
+        if (post.getPostType() == Post.TEXT_TYPE) {
             contentTextView.setVisibility(View.VISIBLE);
-            contentTextView.setText(generateCrossPostText(post));
+            contentTextView.setText(post.getSelfTextPlain());
+        } else if (post.getPostType() == Post.LINK_TYPE || post.getPostType() == Post.NO_PREVIEW_LINK_TYPE) {
+            contentTextView.setVisibility(View.VISIBLE);
+            contentTextView.setText(post.getUrl());
         } else {
-            if (post.getSelfTextPlain() != null && !post.getSelfTextPlain().equals("")) {
-                contentTextView.setVisibility(View.VISIBLE);
-                contentTextView.setText(generateCrossPostText(post));
-            }
             Post.Preview preview = getPreview(post);
             if (preview != null) {
                 frameLayout.setVisibility(View.VISIBLE);
@@ -362,6 +368,18 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
             }
         });
 
+        spoilerTextView.setOnClickListener(view -> {
+            if (!isSpoiler) {
+                spoilerTextView.setBackgroundColor(spoilerBackgroundColor);
+                spoilerTextView.setBorderColor(spoilerBackgroundColor);
+                spoilerTextView.setTextColor(spoilerTextColor);
+                isSpoiler = true;
+            } else {
+                spoilerTextView.setBackgroundColor(resources.getColor(android.R.color.transparent));
+                spoilerTextView.setTextColor(primaryTextColor);
+                isSpoiler = false;
+            }
+        });
 
         nsfwTextView.setOnClickListener(view -> {
             if (!isNSFW) {
@@ -443,6 +461,7 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
         nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
         nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
         flairTextView.setTextColor(primaryTextColor);
+        spoilerTextView.setTextColor(primaryTextColor);
         nsfwTextView.setTextColor(primaryTextColor);
         titleEditText.setTextColor(primaryTextColor);
         titleEditText.setHintTextColor(secondaryTextColor);
@@ -455,6 +474,7 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
             rulesButton.setTypeface(typeface);
             receivePostReplyNotificationsTextView.setTypeface(typeface);
             flairTextView.setTypeface(typeface);
+            spoilerTextView.setTypeface(typeface);
             nsfwTextView.setTypeface(typeface);
             titleEditText.setTypeface(typeface);
         }
@@ -479,11 +499,11 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
 
     private void loadSubredditIcon() {
         LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, subredditName,
-                mAccessToken, mRetrofit.getRetrofit(), iconImageUrl -> {
-                    iconUrl = iconImageUrl;
-                    displaySubredditIcon();
-                    loadSubredditIconSuccessful = true;
-                });
+                mAccessToken, mOauthRetrofit, mRetrofit.getRetrofit(), iconImageUrl -> {
+            iconUrl = iconImageUrl;
+            displaySubredditIcon();
+            loadSubredditIconSuccessful = true;
+        });
     }
 
     private void promptAlertDialog(int titleResId, int messageResId) {
@@ -541,19 +561,22 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
 
             mPostingSnackbar.show();
 
-            String subredditName = subredditNameTextView.getText().toString();
-
+            String subredditName;
+            if (subredditIsUser) {
+                subredditName = "u_" + subredditNameTextView.getText().toString();
+            } else {
+                subredditName = subredditNameTextView.getText().toString();
+            }
 
             Intent intent = new Intent(this, SubmitPostService.class);
             intent.putExtra(SubmitPostService.EXTRA_ACCOUNT, selectedAccount);
             intent.putExtra(SubmitPostService.EXTRA_SUBREDDIT_NAME, communityData.getId());
             intent.putExtra(SubmitPostService.EXTRA_TITLE, titleEditText.getText().toString());
-
-            intent.putExtra(SubmitPostService.EXTRA_BODY, generateCrossPostText(post));
-            if (post.getUrl() != null && !post.getUrl().equals("")) {
-                intent.putExtra(SubmitPostService.EXTRA_URL, post.getUrl());
+            if (post.isCrosspost()) {
+                intent.putExtra(SubmitPostService.EXTRA_BODY, "t3_" + post.getCrosspostParentId());
+            } else {
+                intent.putExtra(SubmitPostService.EXTRA_BODY, post.getFullName());
             }
-
             intent.putExtra(SubmitPostService.EXTRA_KIND, APIUtils.KIND_CROSSPOST);
             intent.putExtra(SubmitPostService.EXTRA_FLAIR, flair);
             intent.putExtra(SubmitPostService.EXTRA_IS_SPOILER, isSpoiler);
@@ -676,15 +699,4 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
             }
         }
     }
-
-    private static String generateCrossPostText(Post post) {
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append("cross-posted from: ").append(post.getPermalink()).append("\n");
-        String[] lines = post.getSelfTextPlain().split("\n");
-        for (String line : lines) {
-            stringBuilder.append("> ").append(line).append("\n");
-        }
-
-        return stringBuilder.toString();
-    }
 }

app/src/main/java/eu/toldi/infinityforlemmy/activities/SubredditMultiselectionActivity.java

@@ -37,14 +37,13 @@ import eu.toldi.infinityforlemmy.ActivityToolbarInterface;
 import eu.toldi.infinityforlemmy.Infinity;
 import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
-import eu.toldi.infinityforlemmy.RetrofitHolder;
 import eu.toldi.infinityforlemmy.adapters.SubredditMultiselectionRecyclerViewAdapter;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.customviews.LinearLayoutManagerBugFixed;
 import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
-import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 import eu.toldi.infinityforlemmy.subscribedsubreddit.SubscribedSubredditViewModel;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
+import retrofit2.Retrofit;
 
 public class SubredditMultiselectionActivity extends BaseActivity implements ActivityToolbarInterface {
 
@@ -71,8 +70,8 @@ public class SubredditMultiselectionActivity extends BaseActivity implements Act
     @BindView(R.id.error_text_view_subscribed_subreddits_multiselection_activity)
     TextView mErrorTextView;
     @Inject
-    @Named("no_oauth")
-    RetrofitHolder mRetrofit;
+    @Named("oauth")
+    Retrofit mOauthRetrofit;
     @Inject
     RedditDataRoomDatabase mRedditDataRoomDatabase;
     @Inject
@@ -128,11 +127,11 @@ public class SubredditMultiselectionActivity extends BaseActivity implements Act
         setSupportActionBar(mToolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        mGlide = Glide.with(getApplication());
+        mGlide = Glide.with(this);
 
         mSwipeRefreshLayout.setEnabled(false);
 
-        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, "-");
+        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, "-");
 
         bindView();
     }
@@ -151,7 +150,7 @@ public class SubredditMultiselectionActivity extends BaseActivity implements Act
             if (subscribedSubredditData == null || subscribedSubredditData.size() == 0) {
                 mRecyclerView.setVisibility(View.GONE);
                 mLinearLayout.setVisibility(View.VISIBLE);
-                mGlide.load(R.mipmap.ic_launcher_round).into(mImageView);
+                mGlide.load(R.drawable.error_image).into(mImageView);
             } else {
                 mLinearLayout.setVisibility(View.GONE);
                 mRecyclerView.setVisibility(View.VISIBLE);
@@ -178,7 +177,7 @@ public class SubredditMultiselectionActivity extends BaseActivity implements Act
         } else if (itemId == R.id.action_save_subreddit_multiselection_activity) {
             if (mAdapter != null) {
                 Intent returnIntent = new Intent();
-                returnIntent.putExtra(EXTRA_RETURN_SELECTED_SUBREDDITS,
+                returnIntent.putStringArrayListExtra(EXTRA_RETURN_SELECTED_SUBREDDITS,
                         mAdapter.getAllSelectedSubreddits());
                 setResult(RESULT_OK, returnIntent);
             }
@@ -199,12 +198,12 @@ public class SubredditMultiselectionActivity extends BaseActivity implements Act
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == SUBREDDIT_SEARCH_REQUEST_CODE && resultCode == RESULT_OK && data != null && mAdapter != null) {
             Intent returnIntent = new Intent();
-            ArrayList<SubredditWithSelection> selectedSubreddits = mAdapter.getAllSelectedSubreddits();
-            ArrayList<SubredditWithSelection> searchedSubreddits = data.getParcelableArrayListExtra(SearchActivity.RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES);
+            ArrayList<String> selectedSubreddits = mAdapter.getAllSelectedSubreddits();
+            ArrayList<String> searchedSubreddits = data.getStringArrayListExtra(SearchActivity.RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES);
             if (searchedSubreddits != null) {
                 selectedSubreddits.addAll(searchedSubreddits);
             }
-            returnIntent.putParcelableArrayListExtra(EXTRA_RETURN_SELECTED_SUBREDDITS, selectedSubreddits);
+            returnIntent.putStringArrayListExtra(EXTRA_RETURN_SELECTED_SUBREDDITS, selectedSubreddits);
             setResult(RESULT_OK, returnIntent);
             finish();
         }

app/src/main/java/eu/toldi/infinityforlemmy/activities/SubscribedThingListingActivity.java

@@ -63,6 +63,7 @@ import eu.toldi.infinityforlemmy.events.SwitchAccountEvent;
 import eu.toldi.infinityforlemmy.fragments.FollowedUsersListingFragment;
 import eu.toldi.infinityforlemmy.fragments.MultiRedditListingFragment;
 import eu.toldi.infinityforlemmy.fragments.SubscribedSubredditsListingFragment;
+import eu.toldi.infinityforlemmy.multireddit.DeleteMultiReddit;
 import eu.toldi.infinityforlemmy.multireddit.FetchMyMultiReddits;
 import eu.toldi.infinityforlemmy.multireddit.MultiReddit;
 import eu.toldi.infinityforlemmy.subreddit.SubredditData;
@@ -72,6 +73,7 @@ import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
 import retrofit2.Retrofit;
 
+;
 
 public class SubscribedThingListingActivity extends BaseActivity implements ActivityToolbarInterface {
 
@@ -111,9 +113,6 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
     @Named("current_account")
     SharedPreferences mCurrentAccountSharedPreferences;
     @Inject
-    @Named("internal")
-    SharedPreferences mInternalSharedPreferences;
-    @Inject
     CustomThemeWrapper mCustomThemeWrapper;
     @Inject
     Executor mExecutor;
@@ -234,8 +233,8 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
         });
         sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
         viewPager.setAdapter(sectionsPagerAdapter);
-        viewPager.setOffscreenPageLimit(1);
-        if (viewPager.getCurrentItem() != 1) {
+        viewPager.setOffscreenPageLimit(3);
+        if (viewPager.getCurrentItem() != 2) {
             fab.hide();
         }
         viewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
@@ -246,7 +245,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
                     fab.hide();
                 } else {
                     lockSwipeRightToGoBack();
-                    if (position != 1) {
+                    if (position != 2) {
                         fab.hide();
                     } else {
                         fab.show();
@@ -257,7 +256,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
         tabLayout.setupWithViewPager(viewPager);
 
         if (showMultiReddits) {
-            viewPager.setCurrentItem(1, false);
+            viewPager.setCurrentItem(2, false);
         }
 
         loadSubscriptions(false);
@@ -325,10 +324,6 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
     }
 
     public void loadSubscriptions(boolean forceLoad) {
-        if (!forceLoad && System.currentTimeMillis() - mInternalSharedPreferences.getLong(SharedPreferencesUtils.SUBSCRIBED_THINGS_SYNC_TIME, 0L) < 24 * 60 * 60 * 1000) {
-            return;
-        }
-
         if (mAccessToken != null && !(!forceLoad && mInsertSuccess)) {
             FetchSubscribedThing.fetchSubscribedThing(mRetrofit.getRetrofit(), mAccessToken, mAccountQualifiedName, null,
                     new ArrayList<>(), new ArrayList<>(),
@@ -338,7 +333,6 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
                         public void onFetchSubscribedThingSuccess(ArrayList<SubscribedSubredditData> subscribedSubredditData,
                                                                   ArrayList<SubscribedUserData> subscribedUserData,
                                                                   ArrayList<SubredditData> subredditData) {
-                            mInternalSharedPreferences.edit().putLong(SharedPreferencesUtils.SUBSCRIBED_THINGS_SYNC_TIME, System.currentTimeMillis()).apply();
                             InsertSubscribedThings.insertSubscribedThings(
                                     mExecutor,
                                     new Handler(),
@@ -364,7 +358,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
         }
 
         if (!(!forceLoad && mInsertMultiredditSuccess)) {
-            //loadMultiReddits();
+            loadMultiReddits();
         }
     }
 
@@ -385,7 +379,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
             FetchMyMultiReddits.fetchMyMultiReddits(mOauthRetrofit, mAccessToken, new FetchMyMultiReddits.FetchMyMultiRedditsListener() {
                 @Override
                 public void success(ArrayList<MultiReddit> multiReddits) {
-                    InsertMultireddit.insertMultireddits(mExecutor, new Handler(), mRedditDataRoomDatabase, multiReddits, mAccountQualifiedName, () -> {
+                    InsertMultireddit.insertMultireddits(mExecutor, new Handler(), mRedditDataRoomDatabase, multiReddits, mAccountName, () -> {
                         mInsertMultiredditSuccess = true;
                         sectionsPagerAdapter.stopMultiRedditRefreshProgressbar();
                     });
@@ -407,11 +401,27 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
                 .setMessage(R.string.delete_multi_reddit_dialog_message)
                 .setPositiveButton(R.string.delete, (dialogInterface, i)
                         -> {
+                    if (mAccessToken == null) {
+                        DeleteMultiredditInDatabase.deleteMultiredditInDatabase(mExecutor, new Handler(), mRedditDataRoomDatabase, mAccountName, multiReddit.getPath(),
+                                () -> Toast.makeText(SubscribedThingListingActivity.this,
+                                        R.string.delete_multi_reddit_success, Toast.LENGTH_SHORT).show());
+                    } else {
+                        DeleteMultiReddit.deleteMultiReddit(mExecutor, new Handler(), mOauthRetrofit, mRedditDataRoomDatabase,
+                                mAccessToken, mAccountName, multiReddit.getPath(), new DeleteMultiReddit.DeleteMultiRedditListener() {
+                                    @Override
+                                    public void success() {
+                                        Toast.makeText(SubscribedThingListingActivity.this,
+                                                R.string.delete_multi_reddit_success, Toast.LENGTH_SHORT).show();
+                                        loadMultiReddits();
+                                    }
 
-                    DeleteMultiredditInDatabase.deleteMultiredditInDatabase(mExecutor, new Handler(), mRedditDataRoomDatabase, mAccountQualifiedName, multiReddit.getPath(),
-                            () -> Toast.makeText(SubscribedThingListingActivity.this,
-                                    R.string.delete_multi_reddit_success, Toast.LENGTH_SHORT).show());
-
+                                    @Override
+                                    public void failed() {
+                                        Toast.makeText(SubscribedThingListingActivity.this,
+                                                R.string.delete_multi_reddit_failed, Toast.LENGTH_SHORT).show();
+                                    }
+                                });
+                    }
                 })
                 .setNegativeButton(R.string.cancel, null)
                 .show();
@@ -429,7 +439,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
 
     @Subscribe
     public void onRefreshMultiRedditsEvent(RefreshMultiRedditsEvent event) {
-        //loadMultiReddits();
+        loadMultiReddits();
     }
 
     @Override
@@ -467,7 +477,6 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
         @Override
         public Fragment getItem(int position) {
             switch (position) {
-
                 case 0: {
                     SubscribedSubredditsListingFragment fragment = new SubscribedSubredditsListingFragment();
                     Bundle bundle = new Bundle();
@@ -478,11 +487,19 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
                     fragment.setArguments(bundle);
                     return fragment;
                 }
+                case 1: {
+                    FollowedUsersListingFragment fragment = new FollowedUsersListingFragment();
+                    Bundle bundle = new Bundle();
+                    bundle.putString(FollowedUsersListingFragment.EXTRA_ACCOUNT_NAME, mAccountName == null ? "-" : mAccountName);
+                    bundle.putString(FollowedUsersListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
+                    fragment.setArguments(bundle);
+                    return fragment;
+                }
                 default: {
                     MultiRedditListingFragment fragment = new MultiRedditListingFragment();
                     Bundle bundle = new Bundle();
                     bundle.putString(MultiRedditListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                    bundle.putString(MultiRedditListingFragment.EXTRA_ACCOUNT_NAME, mAccountName == null ? "-" : mAccountQualifiedName);
+                    bundle.putString(MultiRedditListingFragment.EXTRA_ACCOUNT_NAME, mAccountName == null ? "-" : mAccountName);
                     fragment.setArguments(bundle);
                     return fragment;
                 }
@@ -491,7 +508,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
 
         @Override
         public int getCount() {
-            return 2;
+            return 3;
         }
 
         @Override
@@ -500,6 +517,8 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
                 case 0:
                     return Utils.getTabTextWithCustomFont(typeface, getString(R.string.communities));
                 case 1:
+                    return Utils.getTabTextWithCustomFont(typeface, getString(R.string.users));
+                case 2:
                     return Utils.getTabTextWithCustomFont(typeface, getString(R.string.multi_reddits));
             }
 
@@ -512,6 +531,8 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
             Fragment fragment = (Fragment) super.instantiateItem(container, position);
             if (position == 0) {
                 subscribedSubredditsListingFragment = (SubscribedSubredditsListingFragment) fragment;
+            } else if (position == 1) {
+                followedUsersListingFragment = (FollowedUsersListingFragment) fragment;
             } else {
                 multiRedditListingFragment = (MultiRedditListingFragment) fragment;
             }

app/src/main/java/eu/toldi/infinityforlemmy/activities/TrendingActivity.java

@@ -152,7 +152,7 @@ public class TrendingActivity extends BaseActivity {
 
         mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
 
-        mGlide = Glide.with(getApplication());
+        mGlide = Glide.with(this);
 
         DisplayMetrics displayMetrics = new DisplayMetrics();
         getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
@@ -201,7 +201,7 @@ public class TrendingActivity extends BaseActivity {
         isRefreshing = true;
 
         errorLinearLayout.setVisibility(View.GONE);
-        Glide.with(getApplication()).clear(errorImageView);
+        Glide.with(this).clear(errorImageView);
         swipeRefreshLayout.setRefreshing(true);
         trendingSearches = null;
         adapter.setTrendingSearches(null);
@@ -278,7 +278,7 @@ public class TrendingActivity extends BaseActivity {
 
     private void showErrorView(int stringId) {
         errorLinearLayout.setVisibility(View.VISIBLE);
-        mGlide.load(R.mipmap.ic_launcher_round).into(errorImageView);
+        mGlide.load(R.drawable.error_image).into(errorImageView);
         errorTextView.setText(stringId);
     }
 

app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewImageOrGifActivity.java

@@ -78,7 +78,6 @@ import eu.toldi.infinityforlemmy.font.TitleFontStyle;
 import eu.toldi.infinityforlemmy.services.DownloadMediaService;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
-import okhttp3.OkHttpClient;
 
 public class ViewImageOrGifActivity extends AppCompatActivity implements SetAsWallpaperCallback, CustomFontReceiver {
 
@@ -109,9 +108,6 @@ public class ViewImageOrGifActivity extends AppCompatActivity implements SetAsWa
     @Named("default")
     SharedPreferences mSharedPreferences;
     @Inject
-    @Named("glide")
-    OkHttpClient okHttpClient;
-    @Inject
     Executor mExecutor;
     private boolean isActionBarHidden = false;
     private boolean isDownloading = false;
@@ -150,7 +146,7 @@ public class ViewImageOrGifActivity extends AppCompatActivity implements SetAsWa
         getTheme().applyStyle(ContentFontFamily.valueOf(mSharedPreferences
                 .getString(SharedPreferencesUtils.CONTENT_FONT_FAMILY_KEY, ContentFontFamily.Default.name())).getResId(), true);
 
-        BigImageViewer.initialize(GlideImageLoader.with(this.getApplicationContext(), okHttpClient));
+        BigImageViewer.initialize(GlideImageLoader.with(this.getApplicationContext()));
 
         setContentView(R.layout.activity_view_image_or_gif);
 
@@ -165,7 +161,7 @@ public class ViewImageOrGifActivity extends AppCompatActivity implements SetAsWa
             Slidr.attach(this, new SlidrConfig.Builder().position(SlidrPosition.VERTICAL).distanceThreshold(0.125f).build());
         }
 
-        glide = Glide.with(getApplication());
+        glide = Glide.with(this);
 
         handler = new Handler();
 

app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewMultiRedditDetailActivity.java

@@ -62,8 +62,10 @@ import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.customviews.NavigationWrapper;
 import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
 import eu.toldi.infinityforlemmy.events.GoBackToMainPageEvent;
+import eu.toldi.infinityforlemmy.events.RefreshMultiRedditsEvent;
 import eu.toldi.infinityforlemmy.events.SwitchAccountEvent;
 import eu.toldi.infinityforlemmy.fragments.PostFragment;
+import eu.toldi.infinityforlemmy.multireddit.DeleteMultiReddit;
 import eu.toldi.infinityforlemmy.multireddit.MultiReddit;
 import eu.toldi.infinityforlemmy.post.MarkPostAsRead;
 import eu.toldi.infinityforlemmy.post.Post;
@@ -428,7 +430,7 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
         bundle.putString(PostFragment.EXTRA_NAME, multiPath);
         bundle.putInt(PostFragment.EXTRA_POST_TYPE, mAccessToken == null ? PostPagingSource.TYPE_ANONYMOUS_MULTIREDDIT : PostPagingSource.TYPE_MULTI_REDDIT);
         bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-        bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
+        bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
         mFragment.setArguments(bundle);
         getSupportFragmentManager().beginTransaction().replace(R.id.frame_layout_view_multi_reddit_detail_activity, mFragment).commit();
     }
@@ -590,7 +592,7 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
 
     private void showSortTypeBottomSheetFragment() {
         if (mFragment instanceof PostFragment) {
-            SortTypeBottomSheetFragment sortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(SortTypeBottomSheetFragment.PAGE_TYPE_MULTICOMMUNITY, ((PostFragment) mFragment).getSortType());
+            SortTypeBottomSheetFragment sortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(true, ((PostFragment) mFragment).getSortType());
             sortTypeBottomSheetFragment.show(getSupportFragmentManager(), sortTypeBottomSheetFragment.getTag());
         }
     }
@@ -676,7 +678,7 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
                         -> {
                     Utils.hideKeyboard(this);
                     Intent subredditIntent = new Intent(this, ViewSubredditDetailActivity.class);
-                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, thingEditText.getText().toString());
+                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, thingEditText.getText().toString());
                     startActivity(subredditIntent);
                 })
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) -> {
@@ -697,7 +699,7 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
             if (i == EditorInfo.IME_ACTION_DONE) {
                 Utils.hideKeyboard(this);
                 Intent userIntent = new Intent(this, ViewUserDetailActivity.class);
-                userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, thingEditText.getText().toString());
+                userIntent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, thingEditText.getText().toString());
                 startActivity(userIntent);
                 return true;
             }
@@ -762,7 +764,6 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
             Intent editIntent = new Intent(this, EditMultiRedditActivity.class);
             editIntent.putExtra(EditMultiRedditActivity.EXTRA_MULTI_PATH, multiPath);
             startActivity(editIntent);
-            finish();
             return true;
         } else if (itemId == R.id.action_delete_view_multi_reddit_detail_activity) {
             new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
@@ -770,13 +771,30 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
                     .setMessage(R.string.delete_multi_reddit_dialog_message)
                     .setPositiveButton(R.string.delete, (dialogInterface, i)
                             -> {
+                        if (mAccessToken == null) {
+                            DeleteMultiredditInDatabase.deleteMultiredditInDatabase(mExecutor, new Handler(), mRedditDataRoomDatabase, mAccountName, multiPath,
+                                    () -> {
+                                        Toast.makeText(this, R.string.delete_multi_reddit_success, Toast.LENGTH_SHORT).show();
+                                        finish();
+                                    });
+                        } else {
+                            DeleteMultiReddit.deleteMultiReddit(mExecutor, new Handler(), mOauthRetrofit, mRedditDataRoomDatabase,
+                                    mAccessToken, mAccountName, multiPath, new DeleteMultiReddit.DeleteMultiRedditListener() {
+                                        @Override
+                                        public void success() {
+                                            Toast.makeText(ViewMultiRedditDetailActivity.this,
+                                                    R.string.delete_multi_reddit_success, Toast.LENGTH_SHORT).show();
+                                            EventBus.getDefault().post(new RefreshMultiRedditsEvent());
+                                            finish();
+                                        }
 
-                        DeleteMultiredditInDatabase.deleteMultiredditInDatabase(mExecutor, new Handler(), mRedditDataRoomDatabase, mAccountName, multiPath,
-                                () -> {
-                                    Toast.makeText(this, R.string.delete_multi_reddit_success, Toast.LENGTH_SHORT).show();
-                                    finish();
-                                });
-
+                                        @Override
+                                        public void failed() {
+                                            Toast.makeText(ViewMultiRedditDetailActivity.this,
+                                                    R.string.delete_multi_reddit_failed, Toast.LENGTH_SHORT).show();
+                                        }
+                                    });
+                        }
                     })
                     .setNegativeButton(R.string.cancel, null)
                     .show();
@@ -928,6 +946,10 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
                 goToUser();
                 break;
             }
+            case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
+                random();
+                break;
+            }
             case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
                 if (mFragment instanceof PostFragment) {
                     ((PostFragment) mFragment).hideReadPosts();

app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewPostDetailActivity.java

@@ -67,7 +67,6 @@ import eu.toldi.infinityforlemmy.SaveComment;
 import eu.toldi.infinityforlemmy.SaveThing;
 import eu.toldi.infinityforlemmy.SortType;
 import eu.toldi.infinityforlemmy.SortTypeSelectionCallback;
-import eu.toldi.infinityforlemmy.apis.LemmyAPI;
 import eu.toldi.infinityforlemmy.apis.RedditAPI;
 import eu.toldi.infinityforlemmy.asynctasks.SwitchAccount;
 import eu.toldi.infinityforlemmy.comment.Comment;
@@ -82,12 +81,10 @@ import eu.toldi.infinityforlemmy.post.HistoryPostPagingSource;
 import eu.toldi.infinityforlemmy.post.ParsePost;
 import eu.toldi.infinityforlemmy.post.Post;
 import eu.toldi.infinityforlemmy.post.PostPagingSource;
-import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.postfilter.PostFilter;
 import eu.toldi.infinityforlemmy.readpost.ReadPost;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
-import okhttp3.OkHttpClient;
 import retrofit2.Call;
 import retrofit2.Response;
 import retrofit2.Retrofit;
@@ -98,7 +95,6 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
     public static final String EXTRA_POST_ID = "EPI";
     public static final String EXTRA_POST_LIST_POSITION = "EPLP";
     public static final String EXTRA_SINGLE_COMMENT_ID = "ESCI";
-    public static final String EXTRA_SINGLE_COMMENT_PARENT_ID = "ESCPI";
     public static final String EXTRA_CONTEXT_NUMBER = "ECN";
     public static final String EXTRA_MESSAGE_FULLNAME = "ENI";
     public static final String EXTRA_NEW_ACCOUNT_NAME = "ENAN";
@@ -150,11 +146,6 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
     CustomThemeWrapper mCustomThemeWrapper;
     @Inject
     Executor mExecutor;
-    @Inject
-    @Named("glide")
-    OkHttpClient okHttpClient;
-    @Inject
-    PostEnricher postEnricher;
     @State
     ArrayList<Post> posts;
     @State
@@ -189,8 +180,6 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
     private SectionsPagerAdapter sectionsPagerAdapter;
     private String mAccessToken;
     private String mAccountName;
-
-    private String mAccountQalifiedName;
     private long postFragmentId;
     private int postListPosition;
     private int orientation;
@@ -203,7 +192,7 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
 
         super.onCreate(savedInstanceState);
 
-        BigImageViewer.initialize(GlideImageLoader.with(this.getApplicationContext(), okHttpClient));
+        BigImageViewer.initialize(GlideImageLoader.with(this.getApplicationContext()));
 
         setContentView(R.layout.activity_view_post_detail);
 
@@ -279,7 +268,6 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
 
         mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
         mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
-        mAccountQalifiedName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null);
 
         mVolumeKeysNavigateComments = mSharedPreferences.getBoolean(SharedPreferencesUtils.VOLUME_KEYS_NAVIGATE_COMMENTS, false);
 
@@ -364,8 +352,8 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
 
     private void checkNewAccountAndBindView(Bundle savedInstanceState) {
         if (mNewAccountName != null) {
-            if (mAccountName == null || !mAccountQalifiedName.equals(mNewAccountName)) {
-                SwitchAccount.switchAccount(mRedditDataRoomDatabase, mRetrofit, mCurrentAccountSharedPreferences,
+            if (mAccountName == null || !mAccountName.equals(mNewAccountName)) {
+                SwitchAccount.switchAccount(mRedditDataRoomDatabase,mRetrofit, mCurrentAccountSharedPreferences,
                         mExecutor, new Handler(), mNewAccountName, newAccount -> {
                             EventBus.getDefault().post(new SwitchAccountEvent(getClass().getName()));
                             Toast.makeText(this, R.string.account_switched, Toast.LENGTH_SHORT).show();
@@ -534,38 +522,69 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
         Handler handler = new Handler(Looper.getMainLooper());
 
         if (postType != HistoryPostPagingSource.TYPE_READ_POSTS) {
-            int nextPage = posts.size() / 25 + 1;
-
             mExecutor.execute(() -> {
-                LemmyAPI api = mRetrofit.getRetrofit().create(LemmyAPI.class);
+                RedditAPI api = (mAccessToken == null ? mRetrofit.getRetrofit() : mOauthRetrofit).create(RedditAPI.class);
                 Call<String> call;
-
+                String afterKey = posts.isEmpty() ? null : posts.get(posts.size() - 1).getFullName();
                 switch (postType) {
                     case PostPagingSource.TYPE_SUBREDDIT:
-                        call = api.getPosts(null, sortType.value, nextPage, 25, null, post.getSubredditNamePrefixed(), false, mAccessToken);
+                        if (mAccessToken == null) {
+                            call = api.getSubredditBestPosts(subredditName, sortType, sortTime, afterKey);
+                        } else {
+                            call = api.getSubredditBestPostsOauth(subredditName, sortType,
+                                   sortTime, afterKey, APIUtils.getOAuthHeader(mAccessToken));
+                        }
                         break;
                     case PostPagingSource.TYPE_USER:
-                        call = api.getUserPosts(username, sortType.value, nextPage, 25, false, mAccessToken);
+                        if (mAccessToken == null) {
+                            call = api.getUserPosts(username, afterKey, sortType, sortTime);
+                        } else {
+                            call = api.getUserPostsOauth(username, userWhere, afterKey, sortType,
+                                    sortTime, APIUtils.getOAuthHeader(mAccessToken));
+                        }
                         break;
                     case PostPagingSource.TYPE_SEARCH:
-                        call = api.search(query, null, subredditName, null, "Post", sortType.value, "All", nextPage, 25, mAccessToken);
+                        if (subredditName == null) {
+                            if (mAccessToken == null) {
+                                call = api.searchPosts(query, afterKey, sortType, sortTime,
+                                        trendingSource);
+                            } else {
+                                call = api.searchPostsOauth(query, afterKey, sortType,
+                                        sortTime, trendingSource, APIUtils.getOAuthHeader(mAccessToken));
+                            }
+                        } else {
+                            if (mAccessToken == null) {
+                                call = api.searchPostsInSpecificSubreddit(subredditName, query,
+                                        sortType, sortTime, afterKey);
+                            } else {
+                                call = api.searchPostsInSpecificSubredditOauth(subredditName, query,
+                                        sortType, sortTime, afterKey,
+                                        APIUtils.getOAuthHeader(mAccessToken));
+                            }
+                        }
                         break;
                     case PostPagingSource.TYPE_MULTI_REDDIT:
-                        // TODO: Implement multi community
-
+                        if (mAccessToken == null) {
+                            call = api.getMultiRedditPosts(multiPath, afterKey, sortTime);
+                        } else {
+                            call = api.getMultiRedditPostsOauth(multiPath, afterKey,
+                                    sortTime, APIUtils.getOAuthHeader(mAccessToken));
+                        }
+                        break;
                     case PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE:
-                        // TODO: Implement anonymous front page
-
+                        //case PostPagingSource.TYPE_ANONYMOUS_MULTIREDDIT
+                        call = api.getSubredditBestPosts(subredditName, sortType, sortTime, afterKey);
+                        break;
                     default:
-                        String type = (subredditName == null) ? "Subscribed" : (subredditName.equals("all")) ? "All" : "Local";
-                        call = api.getPosts(type, sortType.value, nextPage, 25, null, null, false, mAccessToken);
+                        call = api.getBestPosts(sortType, sortTime, afterKey,
+                                APIUtils.getOAuthHeader(mAccessToken));
                 }
 
                 try {
                     Response<String> response = call.execute();
                     if (response.isSuccessful()) {
                         String responseString = response.body();
-                        LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, readPostList, postEnricher);
+                        LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, readPostList);
                         if (newPosts == null) {
                             handler.post(() -> {
                                 loadingMorePostsStatus = LoadingMorePostsStatus.NO_MORE_POSTS;
@@ -647,7 +666,7 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
                     Response<String> response = historyPosts.execute();
                     if (response.isSuccessful()) {
                         String responseString = response.body();
-                        LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, null, postEnricher);
+                        LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, null);
                         if (newPosts == null || newPosts.isEmpty()) {
                             handler.post(() -> {
                                 loadingMorePostsStatus = LoadingMorePostsStatus.NO_MORE_POSTS;
@@ -851,7 +870,6 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
                     bundle.putParcelable(ViewPostDetailFragment.EXTRA_POST_DATA, post);
                     bundle.putInt(ViewPostDetailFragment.EXTRA_POST_LIST_POSITION, position);
                     bundle.putInt(ViewPostDetailFragment.EXTRA_SINGLE_COMMENT_ID, getIntent().getIntExtra(EXTRA_SINGLE_COMMENT_ID, 0));
-                    bundle.putInt(ViewPostDetailFragment.EXTRA_SINGLE_COMMENT_PARENT_ID, getIntent().getIntExtra(EXTRA_SINGLE_COMMENT_PARENT_ID, 0));
                     bundle.putString(ViewPostDetailFragment.EXTRA_CONTEXT_NUMBER, getIntent().getStringExtra(EXTRA_CONTEXT_NUMBER));
                     bundle.putString(ViewPostDetailFragment.EXTRA_MESSAGE_FULLNAME, getIntent().getStringExtra(EXTRA_MESSAGE_FULLNAME));
                 } else {
@@ -873,7 +891,6 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
                     bundle.putInt(ViewPostDetailFragment.EXTRA_POST_LIST_POSITION, postListPosition);
                 }
                 bundle.putInt(ViewPostDetailFragment.EXTRA_SINGLE_COMMENT_ID, getIntent().getIntExtra(EXTRA_SINGLE_COMMENT_ID, 0));
-                bundle.putInt(ViewPostDetailFragment.EXTRA_SINGLE_COMMENT_PARENT_ID, getIntent().getIntExtra(EXTRA_SINGLE_COMMENT_PARENT_ID, 0));
                 bundle.putString(ViewPostDetailFragment.EXTRA_CONTEXT_NUMBER, getIntent().getStringExtra(EXTRA_CONTEXT_NUMBER));
                 bundle.putString(ViewPostDetailFragment.EXTRA_MESSAGE_FULLNAME, getIntent().getStringExtra(EXTRA_MESSAGE_FULLNAME));
             }

app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewPrivateMessagesActivity.java

@@ -5,7 +5,6 @@ import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
@@ -28,7 +27,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.Executor;
 
 import javax.inject.Inject;
@@ -48,15 +46,14 @@ import eu.toldi.infinityforlemmy.customviews.LinearLayoutManagerBugFixed;
 import eu.toldi.infinityforlemmy.events.PassPrivateMessageEvent;
 import eu.toldi.infinityforlemmy.events.PassPrivateMessageIndexEvent;
 import eu.toldi.infinityforlemmy.events.RepliedToPrivateMessageEvent;
+import eu.toldi.infinityforlemmy.message.Message;
 import eu.toldi.infinityforlemmy.message.ReadMessage;
-import eu.toldi.infinityforlemmy.privatemessage.LemmyPrivateMessageAPI;
-import eu.toldi.infinityforlemmy.privatemessage.PrivateMessage;
+import eu.toldi.infinityforlemmy.message.ReplyMessage;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import retrofit2.Retrofit;
 
 public class ViewPrivateMessagesActivity extends BaseActivity implements ActivityToolbarInterface {
 
-    public static final String EXTRA_PRIVATE_MESSAGE = "EPM";
     public static final String EXTRA_PRIVATE_MESSAGE_INDEX = "EPM";
     public static final String EXTRA_MESSAGE_POSITION = "EMP";
     private static final String USER_AVATAR_STATE = "UAS";
@@ -94,19 +91,14 @@ public class ViewPrivateMessagesActivity extends BaseActivity implements Activit
     CustomThemeWrapper mCustomThemeWrapper;
     @Inject
     Executor mExecutor;
-
-    @Inject
-    LemmyPrivateMessageAPI mLemmyPrivateMessageAPI;
     private LinearLayoutManagerBugFixed mLinearLayoutManager;
     private PrivateMessagesDetailRecyclerViewAdapter mAdapter;
     @State
-    PrivateMessage privateMessage;
+    Message privateMessage;
     @State
-    PrivateMessage replyTo;
+    Message replyTo;
     private String mAccessToken;
     private String mAccountName;
-
-    private String mAccountQualifiedName;
     private String mUserAvatar;
     private ArrayList<ProvideUserAvatarCallback> mProvideUserAvatarCallbacks;
     private boolean isLoadingUserAvatar = false;
@@ -136,11 +128,6 @@ public class ViewPrivateMessagesActivity extends BaseActivity implements Activit
             addOnOffsetChangedListener(mAppBarLayout);
         }
 
-        Intent intent = getIntent();
-        privateMessage = intent.getParcelableExtra(EXTRA_PRIVATE_MESSAGE);
-
-        Log.i("ViewPrivate", "privateMessage: " + privateMessage);
-
         setSupportActionBar(mToolbar);
         setToolbarGoToTop(mToolbar);
 
@@ -148,7 +135,6 @@ public class ViewPrivateMessagesActivity extends BaseActivity implements Activit
 
         mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
         mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
-        mAccountQualifiedName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null);
 
         if (savedInstanceState != null) {
             mUserAvatar = savedInstanceState.getString(USER_AVATAR_STATE);
@@ -158,37 +144,36 @@ public class ViewPrivateMessagesActivity extends BaseActivity implements Activit
                 bindView();
             }
         } else {
-            if (privateMessage != null) {
-                bindView();
-            }
             EventBus.getDefault().post(new PassPrivateMessageIndexEvent(getIntent().getIntExtra(EXTRA_PRIVATE_MESSAGE_INDEX, -1)));
         }
     }
 
     private void bindView() {
         if (privateMessage != null) {
-            if (privateMessage.getCreatorQualifiedName().equals(mAccountQualifiedName)) {
-                setTitle(privateMessage.getRecipientName());
+            if (privateMessage.getAuthor().equals(mAccountName)) {
+                setTitle(privateMessage.getDestination());
                 mToolbar.setOnClickListener(view -> {
-
+                    if (privateMessage.isDestinationDeleted()) {
+                        return;
+                    }
                     Intent intent = new Intent(this, ViewUserDetailActivity.class);
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, privateMessage.getRecipientName());
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, privateMessage.getRecipientQualifiedName());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, privateMessage.getDestination());
                     startActivity(intent);
                 });
             } else {
-                setTitle(privateMessage.getCreatorName());
+                setTitle(privateMessage.getAuthor());
                 mToolbar.setOnClickListener(view -> {
-
+                    if (privateMessage.isAuthorDeleted()) {
+                        return;
+                    }
                     Intent intent = new Intent(this, ViewUserDetailActivity.class);
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, privateMessage.getCreatorName());
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, privateMessage.getCreatorQualifiedName());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, privateMessage.getAuthor());
                     startActivity(intent);
                 });
             }
         }
         mAdapter = new PrivateMessagesDetailRecyclerViewAdapter(this, mSharedPreferences,
-                getResources().getConfiguration().locale, privateMessage, mAccountQualifiedName, mCustomThemeWrapper);
+                getResources().getConfiguration().locale, privateMessage, mAccountName, mCustomThemeWrapper);
         mLinearLayoutManager = new LinearLayoutManagerBugFixed(this);
         mLinearLayoutManager.setStackFromEnd(true);
         mRecyclerView.setLayoutManager(mLinearLayoutManager);
@@ -199,40 +184,45 @@ public class ViewPrivateMessagesActivity extends BaseActivity implements Activit
                 if (!mEditText.getText().toString().equals("")) {
                     //Send Message
                     if (privateMessage != null) {
-                        List<PrivateMessage> replies = privateMessage.getReplies();
+                        ArrayList<Message> replies = privateMessage.getReplies();
                         if (replyTo == null) {
                             replyTo = privateMessage;
                         }
                         isSendingMessage = true;
                         mSendImageView.setColorFilter(mSecondaryTextColor, android.graphics.PorterDuff.Mode.SRC_IN);
+                        ReplyMessage.replyMessage(mEditText.getText().toString(), replyTo.getFullname(),
+                                getResources().getConfiguration().locale, mOauthRetrofit, mAccessToken,
+                                new ReplyMessage.ReplyMessageListener() {
+                                    @Override
+                                    public void replyMessageSuccess(Message message) {
+                                        if (mAdapter != null) {
+                                            mAdapter.addReply(message);
+                                        }
+                                        goToBottom();
+                                        mEditText.setText("");
+                                        mSendImageView.setColorFilter(mSendMessageIconColor, android.graphics.PorterDuff.Mode.SRC_IN);
+                                        isSendingMessage = false;
+                                        EventBus.getDefault().post(new RepliedToPrivateMessageEvent(message, getIntent().getIntExtra(EXTRA_MESSAGE_POSITION, -1)));
+                                    }
 
-                        mLemmyPrivateMessageAPI.sendPrivateMessage(mAccessToken, replyTo.getCreatorId(), mEditText.getText().toString(), new LemmyPrivateMessageAPI.PrivateMessageSentListener() {
-
-                            @Override
-                            public void onPrivateMessageSentSuccess(@NonNull PrivateMessage privateMessage) {
-                                if (mAdapter != null) {
-                                    mAdapter.addReply(privateMessage);
-                                }
-                                goToBottom();
-                                mEditText.setText("");
-                                isSendingMessage = false;
-                                EventBus.getDefault().post(new RepliedToPrivateMessageEvent(privateMessage, getIntent().getIntExtra(EXTRA_MESSAGE_POSITION, -1)));
-                            }
-
-                            @Override
-                            public void onPrivateMessageSentError() {
-                                Snackbar.make(mCoordinatorLayout, R.string.reply_message_failed, Snackbar.LENGTH_LONG).show();
-                                mSendImageView.setColorFilter(mSendMessageIconColor, android.graphics.PorterDuff.Mode.SRC_IN);
-                                isSendingMessage = false;
-                            }
-                        });
-
-
+                                    @Override
+                                    public void replyMessageFailed(String errorMessage) {
+                                        if (errorMessage != null && !errorMessage.equals("")) {
+                                            Snackbar.make(mCoordinatorLayout, errorMessage, Snackbar.LENGTH_LONG).show();
+                                        } else {
+                                            Snackbar.make(mCoordinatorLayout, R.string.reply_message_failed, Snackbar.LENGTH_LONG).show();
+                                        }
+                                        mSendImageView.setColorFilter(mSendMessageIconColor, android.graphics.PorterDuff.Mode.SRC_IN);
+                                        isSendingMessage = false;
+                                    }
+                                });
                         StringBuilder fullnames = new StringBuilder();
-
+                        if (privateMessage.isNew()) {
+                            fullnames.append(privateMessage.getFullname()).append(",");
+                        }
                         if (replies != null && !replies.isEmpty()) {
-                            for (PrivateMessage m : replies) {
-                                if (!m.getRead()) {
+                            for (Message m : replies) {
+                                if (m.isNew()) {
                                     fullnames.append(m).append(",");
                                 }
                             }

app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java

@@ -1,20 +1,14 @@
 package eu.toldi.infinityforlemmy.activities;
 
-import static android.graphics.BitmapFactory.decodeResource;
-
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
-import android.graphics.Bitmap;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -24,14 +18,12 @@ import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -44,9 +36,6 @@ import androidx.viewpager2.widget.ViewPager2;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.RequestManager;
 import com.bumptech.glide.request.RequestOptions;
-import com.bumptech.glide.request.target.CustomTarget;
-import com.bumptech.glide.request.transition.Transition;
-import com.evernote.android.state.State;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.android.material.appbar.MaterialToolbar;
@@ -93,8 +82,6 @@ import eu.toldi.infinityforlemmy.bottomsheetfragments.RandomBottomSheetFragment;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.SortTimeBottomSheetFragment;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.SortTypeBottomSheetFragment;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.UrlMenuBottomSheetFragment;
-import eu.toldi.infinityforlemmy.community.BlockCommunity;
-import eu.toldi.infinityforlemmy.community.CommunityStats;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.customviews.NavigationWrapper;
 import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
@@ -110,7 +97,6 @@ import eu.toldi.infinityforlemmy.post.MarkPostAsRead;
 import eu.toldi.infinityforlemmy.post.Post;
 import eu.toldi.infinityforlemmy.post.PostPagingSource;
 import eu.toldi.infinityforlemmy.readpost.InsertReadPost;
-import eu.toldi.infinityforlemmy.shortcut.ShortcutManager;
 import eu.toldi.infinityforlemmy.subreddit.CommunitySubscription;
 import eu.toldi.infinityforlemmy.subreddit.FetchSubredditData;
 import eu.toldi.infinityforlemmy.subreddit.ParseSubredditData;
@@ -176,26 +162,12 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
     TextView communityFullNameTextView;
     @BindView(R.id.subscriber_count_text_view_view_subreddit_detail_activity)
     TextView nSubscribersTextView;
-    @BindView(R.id.active_user_count_text_view_view_subreddit_detail_activity)
-    TextView nActiveUsersTextView;
-    @BindView(R.id.post_count_text_view_view_subreddit_detail_activity)
-    TextView nPostsTextView;
-    @BindView(R.id.comment_count_text_view_view_subreddit_detail_activity)
-    TextView nCommentsTextView;
-
-    @BindView(R.id.subscriber_count_image_view_view_subreddit_detail_activity)
-    ImageView nSubscribersImageView;
-    @BindView(R.id.active_user_count_image_view_view_subreddit_detail_activity)
-    ImageView nActiveUsersImageView;
-    @BindView(R.id.post_count_image_view_view_subreddit_detail_activity)
-    ImageView nPostsImageView;
-    @BindView(R.id.comment_count_image_view_view_subreddit_detail_activity)
-    ImageView nCommentsImageView;
-
-    @BindView(R.id.community_statistics_block_view_subreddit_detail_activity)
-    ConstraintLayout communityStatisticsBlock;
-
-
+    @BindView(R.id.online_subscriber_count_text_view_view_subreddit_detail_activity)
+    TextView nOnlineSubscribersTextView;
+    @BindView(R.id.since_text_view_view_subreddit_detail_activity)
+    TextView sinceTextView;
+    @BindView(R.id.creation_time_text_view_view_subreddit_detail_activity)
+    TextView creationTimeTextView;
     @BindView(R.id.description_text_view_view_subreddit_detail_activity)
     TextView descriptionTextView;
     @Inject
@@ -238,11 +210,6 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
     private String communityName;
 
     private int communityId;
-
-    @State
-    SubredditData communityData;
-    @State
-    CommunityStats mCommunityStats;
     private String description;
 
     private String qualifiedName;
@@ -267,14 +234,8 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
     private int subscribedColor;
     private int fabOption;
     private MaterialAlertDialogBuilder nsfwWarningBuilder;
-    private Bitmap subredditIconBitmap;
-
-    private boolean showStatistics;
-
-    private boolean disableImagePreview;
 
     private boolean hideSubredditDescription;
-    private boolean isKbinMagazine = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -287,8 +248,6 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
         ButterKnife.bind(this);
 
         hideFab = mSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_FAB_IN_POST_FEED, false);
-        showStatistics = mSharedPreferences.getBoolean(SharedPreferencesUtils.SHOW_STATISTICS, true);
-        disableImagePreview = mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_IMAGE_PREVIEW, false);
         showBottomAppBar = mSharedPreferences.getBoolean(SharedPreferencesUtils.BOTTOM_APP_BAR_KEY, false);
         navigationWrapper = new NavigationWrapper(findViewById(R.id.bottom_app_bar_bottom_app_bar), findViewById(R.id.linear_layout_bottom_app_bar),
                 findViewById(R.id.option_1_bottom_app_bar), findViewById(R.id.option_2_bottom_app_bar),
@@ -392,14 +351,6 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
         mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
         mAccountQualifiedName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null);
 
-        if (mAccessToken != null) {
-            mRetrofit.setAccessToken(mAccessToken);
-        }
-        String instance = (mAccessToken == null) ? mSharedPreferences.getString(SharedPreferencesUtils.ANONYMOUS_ACCOUNT_INSTANCE, APIUtils.API_BASE_URI) : mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_INSTANCE, null);
-        if (instance != null) {
-            mRetrofit.setBaseURL(instance);
-        }
-
         if (savedInstanceState == null) {
             mMessageFullname = getIntent().getIntExtra(EXTRA_MESSAGE_FULLNAME, 0);
             mNewAccountName = getIntent().getStringExtra(EXTRA_NEW_ACCOUNT_NAME);
@@ -409,33 +360,19 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
             mMessageFullname = savedInstanceState.getInt(MESSAGE_FULLNAME_STATE);
             mNewAccountName = savedInstanceState.getString(NEW_ACCOUNT_NAME_STATE);
 
+            if (mFetchSubredditInfoSuccess) {
+                nOnlineSubscribersTextView.setText(getString(R.string.online_subscribers_number_detail, mNCurrentOnlineSubscribers));
+            }
         }
 
         checkNewAccountAndBindView();
 
         fetchSubredditData();
-        if (communityData != null) {
+        if (communityName != null) {
             setupVisibleElements();
         }
     }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-        Log.e("ViewSubredditDetail", "onStart");
-        if (communityData != null) {
-            setupVisibleElements();
-        } else {
-            fetchSubredditData();
-        }
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        mFetchSubredditInfoSuccess = false;
-    }
-
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (sectionsPagerAdapter != null) {
@@ -477,13 +414,9 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
         subscribeSubredditChip.setTextColor(mCustomThemeWrapper.getChipTextColor());
         int primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
         nSubscribersTextView.setTextColor(primaryTextColor);
-        nActiveUsersTextView.setTextColor(primaryTextColor);
-        nPostsTextView.setTextColor(primaryTextColor);
-        nCommentsTextView.setTextColor(primaryTextColor);
-        nSubscribersImageView.setColorFilter(mCustomThemeWrapper.getPrimaryTextColor(), PorterDuff.Mode.SRC_IN);
-        nActiveUsersImageView.setColorFilter(mCustomThemeWrapper.getPrimaryTextColor(), PorterDuff.Mode.SRC_IN);
-        nPostsImageView.setColorFilter(mCustomThemeWrapper.getPrimaryTextColor(), PorterDuff.Mode.SRC_IN);
-        nCommentsImageView.setColorFilter(mCustomThemeWrapper.getPrimaryTextColor(), PorterDuff.Mode.SRC_IN);
+        nOnlineSubscribersTextView.setTextColor(primaryTextColor);
+        sinceTextView.setTextColor(primaryTextColor);
+        creationTimeTextView.setTextColor(primaryTextColor);
         descriptionTextView.setTextColor(primaryTextColor);
         navigationWrapper.applyCustomTheme(mCustomThemeWrapper.getBottomAppBarIconColor(), mCustomThemeWrapper.getBottomAppBarBackgroundColor());
         applyTabLayoutTheme(tabLayout);
@@ -492,9 +425,9 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
             subredditNameTextView.setTypeface(typeface);
             subscribeSubredditChip.setTypeface(typeface);
             nSubscribersTextView.setTypeface(typeface);
-            nActiveUsersTextView.setTypeface(typeface);
-            nPostsTextView.setTypeface(typeface);
-            nCommentsTextView.setTypeface(typeface);
+            nOnlineSubscribersTextView.setTypeface(typeface);
+            sinceTextView.setTypeface(typeface);
+            creationTimeTextView.setTypeface(typeface);
             descriptionTextView.setTypeface(typeface);
         }
         unsubscribedColor = mCustomThemeWrapper.getUnsubscribed();
@@ -533,7 +466,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
         setSupportActionBar(toolbar);
         setToolbarGoToTop(toolbar);
 
-        glide = Glide.with(getApplication());
+        glide = Glide.with(this);
         Locale locale = getResources().getConfiguration().locale;
 
         MarkwonPlugin miscPlugin = new AbstractMarkwonPlugin() {
@@ -558,7 +491,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
             return true;
         };
 
-        Markwon markwon = MarkdownUtils.createDescriptionMarkwon(this, miscPlugin, onLinkLongClickListener, mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_IMAGE_PREVIEW, false));
+        Markwon markwon = MarkdownUtils.createDescriptionMarkwon(this, miscPlugin, onLinkLongClickListener);
 
         descriptionTextView.setOnLongClickListener(view -> {
             if (description != null && !description.equals("") && descriptionTextView.getSelectionStart() == -1 && descriptionTextView.getSelectionEnd() == -1) {
@@ -566,14 +499,10 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
             }
             return true;
         });
-        String actorID = (!isKbinMagazine) ? LemmyUtils.qualifiedCommunityName2ActorId(qualifiedName) : LemmyUtils.qualifiedMagazineName2ActorId(qualifiedName);
-        mSubredditViewModel = new ViewModelProvider(this,
-                new SubredditViewModel.Factory(getApplication(), mRedditDataRoomDatabase, actorID))
-                .get(SubredditViewModel.class);
-        addObserverToLiveData();
-    }
 
-    private void addObserverToLiveData() {
+        mSubredditViewModel = new ViewModelProvider(this,
+                new SubredditViewModel.Factory(getApplication(), mRedditDataRoomDatabase, LemmyUtils.qualifiedCommunityName2ActorId(qualifiedName)))
+                .get(SubredditViewModel.class);
         mSubredditViewModel.getSubredditLiveData().observe(this, subredditData -> {
             if (subredditData != null) {
                 isNsfwSubreddit = subredditData.isNSFW();
@@ -599,23 +528,11 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                             .into(iconGifImageView);
                     iconGifImageView.setOnClickListener(null);
                 } else {
-                    glide.asBitmap()
-                            .load(subredditData.getIconUrl())
+                    glide.load(subredditData.getIconUrl())
                             .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(216, 0)))
                             .error(glide.load(R.drawable.subreddit_default_icon)
                                     .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(216, 0))))
-                            .into(new CustomTarget<Bitmap>() {
-                                @Override
-                                public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
-                                    subredditIconBitmap = resource;
-                                    iconGifImageView.setImageBitmap(resource);
-                                }
-
-                                @Override
-                                public void onLoadCleared(@Nullable Drawable placeholder) {
-                                    subredditIconBitmap = null;
-                                }
-                            });
+                            .into(iconGifImageView);
                     iconGifImageView.setOnClickListener(view -> {
                         Intent intent = new Intent(ViewSubredditDetailActivity.this, ViewImageOrGifActivity.class);
                         intent.putExtra(ViewImageOrGifActivity.EXTRA_IMAGE_URL_KEY, subredditData.getIconUrl());
@@ -634,18 +551,15 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                 communityFullNameTextView.setText(qualifiedName);
                 String nSubscribers = getString(R.string.subscribers_number_detail, subredditData.getNSubscribers());
                 nSubscribersTextView.setText(nSubscribers);
-
-                if (mCommunityStats != null && showStatistics) {
-                    communityStatisticsBlock.setVisibility(View.VISIBLE);
-                    nActiveUsersTextView.setText(getString(R.string.active_users_number_detail, mCommunityStats.getActiveUsers()));
-                    nPostsTextView.setText(getString(R.string.post_count_detail, mCommunityStats.getPosts()));
-                    nCommentsTextView.setText(getString(R.string.comment_count_detail, mCommunityStats.getComments()));
-                }
+                creationTimeTextView.setText(subredditData.getCreatedUTC());
                 description = subredditData.getDescription();
 
-
-                descriptionTextView.setVisibility(View.GONE);
-
+                if (hideSubredditDescription || description.equals("")) {
+                    descriptionTextView.setVisibility(View.GONE);
+                } else {
+                    descriptionTextView.setVisibility(View.VISIBLE);
+                    markwon.setMarkdown(descriptionTextView, description);
+                }
 
                 if (subredditData.isNSFW()) {
                     if (nsfwWarningBuilder == null
@@ -779,23 +693,14 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                     qualifiedName = LemmyUtils.actorID2FullName(communityData.getActorId());
                     if (communityName == null) {
                         communityName = communityData.getTitle();
+
+                        setupVisibleElements();
                     }
-                    mCommunityStats = communityData.getCommunityStats();
-                    if (communityData.getActorId().contains("/m/")) {
-                        isKbinMagazine = true;
-                        if (mSubredditViewModel != null) {
-                            // Remove current observer
-                            mSubredditViewModel.getSubredditLiveData().removeObservers(ViewSubredditDetailActivity.this);
-                            addObserverToLiveData();
-                        }
-                    }
-                    setupVisibleElements();
                     communityId = communityData.getId();
-                    ViewSubredditDetailActivity.this.communityData = communityData;
                     setupSubscribeChip();
 
                     mNCurrentOnlineSubscribers = nCurrentOnlineSubscribers;
-
+                    nOnlineSubscribersTextView.setText(getString(R.string.online_subscribers_number_detail, nCurrentOnlineSubscribers));
                     InsertSubredditData.insertSubredditData(mExecutor, new Handler(), mRedditDataRoomDatabase,
                             communityData, () -> mFetchSubredditInfoSuccess = true);
                 }
@@ -828,7 +733,6 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
             case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_PROFILE: {
                 Intent intent = new Intent(this, ViewUserDetailActivity.class);
                 intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, mAccountName);
-                intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, mAccountQualifiedName);
                 startActivity(intent);
                 break;
             }
@@ -1192,7 +1096,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
             }
         });
         viewPager2.setAdapter(sectionsPagerAdapter);
-        viewPager2.setOffscreenPageLimit(ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT);
+        viewPager2.setOffscreenPageLimit(2);
         viewPager2.setUserInputEnabled(!mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_SWIPING_BETWEEN_TABS, false));
         new TabLayoutMediator(tabLayout, viewPager2, (tab, position) -> {
             switch (position) {
@@ -1214,7 +1118,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
     private void displaySortTypeBottomSheetFragment() {
         Fragment fragment = fragmentManager.findFragmentByTag("f0");
         if (fragment instanceof PostFragment) {
-            SortTypeBottomSheetFragment sortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(SortTypeBottomSheetFragment.PAGE_TYPE_COMMUNITY, ((PostFragment) fragment).getSortType());
+            SortTypeBottomSheetFragment sortTypeBottomSheetFragment = SortTypeBottomSheetFragment.getNewInstance(true, ((PostFragment) fragment).getSortType());
             sortTypeBottomSheetFragment.show(fragmentManager, sortTypeBottomSheetFragment.getTag());
         }
     }
@@ -1222,11 +1126,6 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.view_subreddit_detail_activity, menu);
-        if (communityData != null && communityData.isBlocked()) {
-            menu.findItem(R.id.block_community_view_subreddit_detail_activity).setVisible(false);
-        } else {
-            menu.findItem(R.id.unblock_community_view_subreddit_detail_activity).setVisible(false);
-        }
         applyMenuItemTheme(menu);
         return true;
     }
@@ -1255,6 +1154,22 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
             PostLayoutBottomSheetFragment postLayoutBottomSheetFragment = new PostLayoutBottomSheetFragment();
             postLayoutBottomSheetFragment.show(getSupportFragmentManager(), postLayoutBottomSheetFragment.getTag());
             return true;
+        } else if (itemId == R.id.action_select_user_flair_view_subreddit_detail_activity) {
+            if (mAccessToken == null) {
+                Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
+                return true;
+            }
+            Intent selectUserFlairIntent = new Intent(this, SelectUserFlairActivity.class);
+            selectUserFlairIntent.putExtra(SelectUserFlairActivity.EXTRA_SUBREDDIT_NAME, communityName);
+            startActivity(selectUserFlairIntent);
+            return true;
+        } else if (itemId == R.id.action_add_to_multireddit_view_subreddit_detail_activity) {
+            if (mAccessToken == null) {
+                Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
+                return true;
+            }
+            Intent intent = new Intent(this, MultiredditSelectionActivity.class);
+            startActivityForResult(intent, ADD_TO_MULTIREDDIT_REQUEST_CODE);
         } else if (itemId == R.id.action_add_to_post_filter_view_subreddit_detail_activity) {
             Intent intent = new Intent(this, PostFilterPreferenceActivity.class);
             intent.putExtra(PostFilterPreferenceActivity.EXTRA_SUBREDDIT_NAME, communityName);
@@ -1264,69 +1179,24 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
             Intent shareIntent = new Intent(Intent.ACTION_SEND);
             shareIntent.setType("text/plain");
             String baseURL = mRetrofit.getBaseURL().endsWith("/") ? mRetrofit.getBaseURL() : mRetrofit.getBaseURL() + "/";
-            shareIntent.putExtra(Intent.EXTRA_TEXT, baseURL + "c/" + qualifiedName);
+            shareIntent.putExtra(Intent.EXTRA_TEXT, baseURL + "/" + qualifiedName);
             if (shareIntent.resolveActivity(getPackageManager()) != null) {
                 startActivity(Intent.createChooser(shareIntent, getString(R.string.share)));
             } else {
                 Toast.makeText(this, R.string.no_app, Toast.LENGTH_SHORT).show();
             }
             return true;
+        } else if (itemId == R.id.action_go_to_wiki_view_subreddit_detail_activity) {
+            Intent wikiIntent = new Intent(this, WikiActivity.class);
+            wikiIntent.putExtra(WikiActivity.EXTRA_SUBREDDIT_NAME, communityName);
+            wikiIntent.putExtra(WikiActivity.EXTRA_WIKI_PATH, "index");
+            startActivity(wikiIntent);
+            return true;
         } else if (itemId == R.id.action_contact_mods_view_subreddit_detail_activity) {
-           /* Intent intent = new Intent(this, SendPrivateMessageActivity.class);
-            intent.putExtra(SendPrivateMessageActivity.EXTRA_RECIPIENT_USERNAME, "r/" + communityName);*/
-            //startActivity(intent);
-            return true;
-        } else if (itemId == R.id.block_community_view_subreddit_detail_activity) {
-            if (mAccessToken == null) {
-                Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
-                return true;
-            }
-            new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
-                    .setTitle(R.string.block_community)
-                    .setMessage(R.string.are_you_sure)
-                    .setPositiveButton(R.string.yes, (dialogInterface, i)
-                            -> BlockCommunity.INSTANCE.blockCommunity(mRetrofit.getRetrofit(), communityId, mAccessToken, new BlockCommunity.BlockCommunityListener() {
-                        @Override
-                        public void onBlockCommunitySuccess() {
-                            communityData.setBlocked(true);
-                            Toast.makeText(ViewSubredditDetailActivity.this, R.string.block_community_success, Toast.LENGTH_SHORT).show();
-                            ViewSubredditDetailActivity.this.invalidateOptionsMenu();
-                            sectionsPagerAdapter.refresh(false);
-                        }
-
-                        @Override
-                        public void onBlockCommunityError() {
-                            Toast.makeText(ViewSubredditDetailActivity.this, R.string.block_community_failed, Toast.LENGTH_SHORT).show();
-                        }
-                    }))
-                    .setNegativeButton(R.string.no, null)
-                    .show();
-            return true;
-        } else if (itemId == R.id.unblock_community_view_subreddit_detail_activity) {
-            BlockCommunity.INSTANCE.unBlockCommunity(mRetrofit.getRetrofit(), communityId, mAccessToken, new BlockCommunity.BlockCommunityListener() {
-                @Override
-                public void onBlockCommunitySuccess() {
-                    communityData.setBlocked(false);
-                    Toast.makeText(ViewSubredditDetailActivity.this, R.string.unblock_community_success, Toast.LENGTH_SHORT).show();
-                    ViewSubredditDetailActivity.this.invalidateOptionsMenu();
-                    sectionsPagerAdapter.refresh(false);
-                }
-
-                @Override
-                public void onBlockCommunityError() {
-                    Toast.makeText(ViewSubredditDetailActivity.this, R.string.unblock_community_failed, Toast.LENGTH_SHORT).show();
-                }
-            });
-            return true;
-        } else if (itemId == R.id.action_add_to_home_screen_view_subreddit_detail_activity) {
-            Bitmap icon = subredditIconBitmap == null ? decodeResource(getResources(), R.drawable.subreddit_default_icon) : subredditIconBitmap;
-            return ShortcutManager.requestPinShortcut(this, qualifiedName, icon);
-        } else if (itemId == R.id.action_view_instance_view_subreddit_detail_activity) {
-            String instance = communityData.getActorId().split("/")[2];
-            Intent intent = new Intent(this,InstanceInfoActivity.class);
-            intent.putExtra(InstanceInfoActivity.EXTRA_INSTANCE_DOMAIN, instance);
-            intent.putExtra(InstanceInfoActivity.EXTRA_INSTANCE_ID, communityData.getInstanceId());
+            Intent intent = new Intent(this, SendPrivateMessageActivity.class);
+            intent.putExtra(SendPrivateMessageActivity.EXTRA_RECIPIENT_USERNAME, "r/" + communityName);
             startActivity(intent);
+            return true;
         }
         return false;
     }
@@ -1418,27 +1288,27 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                 break;
             case PostTypeBottomSheetFragment.TYPE_LINK:
                 intent = new Intent(this, PostLinkActivity.class);
-                intent.putExtra(PostLinkActivity.EXTRA_SUBREDDIT_NAME, qualifiedName);
+                intent.putExtra(PostLinkActivity.EXTRA_SUBREDDIT_NAME, communityName);
                 startActivity(intent);
                 break;
             case PostTypeBottomSheetFragment.TYPE_IMAGE:
                 intent = new Intent(this, PostImageActivity.class);
-                intent.putExtra(PostImageActivity.EXTRA_SUBREDDIT_NAME, qualifiedName);
+                intent.putExtra(PostImageActivity.EXTRA_SUBREDDIT_NAME, communityName);
                 startActivity(intent);
                 break;
             case PostTypeBottomSheetFragment.TYPE_VIDEO:
                 intent = new Intent(this, PostVideoActivity.class);
-                intent.putExtra(PostVideoActivity.EXTRA_SUBREDDIT_NAME, qualifiedName);
+                intent.putExtra(PostVideoActivity.EXTRA_SUBREDDIT_NAME, communityName);
                 startActivity(intent);
                 break;
             case PostTypeBottomSheetFragment.TYPE_GALLERY:
                 intent = new Intent(this, PostGalleryActivity.class);
-                intent.putExtra(PostGalleryActivity.EXTRA_SUBREDDIT_NAME, qualifiedName);
+                intent.putExtra(PostGalleryActivity.EXTRA_SUBREDDIT_NAME, communityName);
                 startActivity(intent);
                 break;
             case PostTypeBottomSheetFragment.TYPE_POLL:
                 intent = new Intent(this, PostPollActivity.class);
-                intent.putExtra(PostPollActivity.EXTRA_SUBREDDIT_NAME, qualifiedName);
+                intent.putExtra(PostPollActivity.EXTRA_SUBREDDIT_NAME, communityName);
                 startActivity(intent);
         }
     }
@@ -1532,6 +1402,10 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                 goToUser();
                 break;
             }
+            case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
+                random();
+                break;
+            }
             case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
                 if (sectionsPagerAdapter != null) {
                     sectionsPagerAdapter.hideReadPosts();
@@ -1571,11 +1445,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
             if (i == EditorInfo.IME_ACTION_DONE) {
                 Utils.hideKeyboard(this);
                 Intent subredditIntent = new Intent(this, ViewSubredditDetailActivity.class);
-                String communityName = thingEditText.getText().toString();
-                if (communityName.startsWith("!")) {
-                    communityName = communityName.substring(1);
-                }
-                subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, communityName);
+                subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, thingEditText.getText().toString());
                 startActivity(subredditIntent);
                 return true;
             }
@@ -1633,11 +1503,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                         -> {
                     Utils.hideKeyboard(this);
                     Intent subredditIntent = new Intent(this, ViewSubredditDetailActivity.class);
-                    String communityName = thingEditText.getText().toString();
-                    if (communityName.startsWith("!")) {
-                        communityName = communityName.substring(1);
-                    }
-                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, communityName);
+                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, thingEditText.getText().toString());
                     startActivity(subredditIntent);
                 })
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) -> {
@@ -1658,11 +1524,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
             if (i == EditorInfo.IME_ACTION_DONE) {
                 Utils.hideKeyboard(this);
                 Intent userIntent = new Intent(this, ViewUserDetailActivity.class);
-                String qualifiedName = thingEditText.getText().toString();
-                if (qualifiedName.startsWith("@")) {
-                    qualifiedName = qualifiedName.substring(1);
-                }
-                userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, qualifiedName);
+                userIntent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, thingEditText.getText().toString());
                 startActivity(userIntent);
                 return true;
             }
@@ -1675,11 +1537,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                         -> {
                     Utils.hideKeyboard(this);
                     Intent userIntent = new Intent(this, ViewUserDetailActivity.class);
-                    String qualifiedName = thingEditText.getText().toString();
-                    if (qualifiedName.startsWith("@")) {
-                        qualifiedName = qualifiedName.substring(1);
-                    }
-                    userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, qualifiedName);
+                    userIntent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, thingEditText.getText().toString());
                     startActivity(userIntent);
                 })
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) -> {
@@ -1751,7 +1609,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                 bundle.putString(PostFragment.EXTRA_NAME, qualifiedName);
                 bundle.putInt(PostFragment.EXTRA_POST_TYPE, PostPagingSource.TYPE_SUBREDDIT);
                 bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
+                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
                 fragment.setArguments(bundle);
                 return fragment;
             }
@@ -1760,8 +1618,6 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
             bundle.putString(SidebarFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
             bundle.putString(SidebarFragment.EXTRA_SUBREDDIT_NAME, communityName);
             bundle.putString(SidebarFragment.EXTRA_COMMUNITY_QUALIFIED_NAME, qualifiedName);
-            bundle.putBoolean(SidebarFragment.EXTRA_SHOW_STATISTICS, !showStatistics);
-            bundle.putBoolean(SidebarFragment.EXTRA_DISABLE_IMAGE_PREVIEW, disableImagePreview);
             fragment.setArguments(bundle);
             return fragment;
         }

app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewUserDetailActivity.java

@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
-import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
@@ -21,15 +20,12 @@ import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -56,7 +52,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.Executor;
 
@@ -76,15 +71,11 @@ import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
 import eu.toldi.infinityforlemmy.RetrofitHolder;
 import eu.toldi.infinityforlemmy.SortType;
 import eu.toldi.infinityforlemmy.SortTypeSelectionCallback;
-import eu.toldi.infinityforlemmy.account.FetchBlockedThings;
 import eu.toldi.infinityforlemmy.adapters.SubredditAutocompleteRecyclerViewAdapter;
 import eu.toldi.infinityforlemmy.apis.RedditAPI;
 import eu.toldi.infinityforlemmy.asynctasks.AddSubredditOrUserToMultiReddit;
 import eu.toldi.infinityforlemmy.asynctasks.CheckIsFollowingUser;
 import eu.toldi.infinityforlemmy.asynctasks.SwitchAccount;
-import eu.toldi.infinityforlemmy.blockedcommunity.BlockedCommunityData;
-import eu.toldi.infinityforlemmy.blockedinstances.BlockedInstanceData;
-import eu.toldi.infinityforlemmy.blockeduser.BlockedUserData;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.CopyTextBottomSheetFragment;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.FABMoreOptionsBottomSheetFragment;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.PostLayoutBottomSheetFragment;
@@ -110,13 +101,11 @@ import eu.toldi.infinityforlemmy.post.PostPagingSource;
 import eu.toldi.infinityforlemmy.readpost.InsertReadPost;
 import eu.toldi.infinityforlemmy.subreddit.ParseSubredditData;
 import eu.toldi.infinityforlemmy.subreddit.SubredditData;
-import eu.toldi.infinityforlemmy.user.BasicUserInfo;
 import eu.toldi.infinityforlemmy.user.BlockUser;
 import eu.toldi.infinityforlemmy.user.FetchUserData;
 import eu.toldi.infinityforlemmy.user.UserDao;
 import eu.toldi.infinityforlemmy.user.UserData;
 import eu.toldi.infinityforlemmy.user.UserFollowing;
-import eu.toldi.infinityforlemmy.user.UserStats;
 import eu.toldi.infinityforlemmy.user.UserViewModel;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
 import eu.toldi.infinityforlemmy.utils.LemmyUtils;
@@ -152,7 +141,6 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
     private static final String FETCH_USER_INFO_STATE = "FSIS";
     private static final String MESSAGE_FULLNAME_STATE = "MFS";
     private static final String NEW_ACCOUNT_NAME_STATE = "NANS";
-    private static final String NEW_ACCOUNT_QUALIFIED_NAME_STATE = "NAQNS";
 
     @BindView(R.id.coordinator_layout_view_user_detail_activity)
     CoordinatorLayout coordinatorLayout;
@@ -177,30 +165,11 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
 
     @BindView(R.id.user_qualified_name_text_view_view_user_detail_activity)
     TextView qualifiedNameTextView;
-
-    @BindView(R.id.loading_user_progress_indicator_view_user_detail_activity)
-    ProgressBar progressBar;
     @BindView(R.id.subscribe_user_chip_view_user_detail_activity)
     Chip subscribeUserChip;
-
-    @BindView(R.id.post_count_text_view_view_user_detail_activity)
-    TextView postCountTextView;
-
-    @BindView(R.id.comment_count_text_view_view_user_detail_activity)
-    TextView commentCountTextView;
-
-    @BindView(R.id.posts_count_icon_image_view_view_user_detail_activity)
-    ImageView postsCountIconImageView;
-    @BindView(R.id.comments_count_icon_image_view_view_user_detail_activity)
-    ImageView commentsCountIconImageView;
-
-    @BindView(R.id.account_created_cake_icon_image_view_view_user_detail_activity)
-    ImageView accountCreatedCakeIconImageView;
-
-    @BindView(R.id.user_statistics_block_view_user_detail_activity)
-    ConstraintLayout userStatisticsBlock;
-
-    @BindView(R.id.cake_day_text_view_view_user_detail_activity)
+    @BindView(R.id.karma_text_view_view_user_detail_activity)
+    TextView karmaTextView;
+    @BindView(R.id.cakeday_text_view_view_user_detail_activity)
     TextView cakedayTextView;
     @BindView(R.id.description_text_view_view_user_detail_activity)
     TextView descriptionTextView;
@@ -247,11 +216,8 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
     private String mAccountName;
     private String mAccountQualifiedName;
     private String username;
-
     private String qualifiedName;
     private String description;
-
-    private boolean showStatistics;
     private boolean subscriptionReady = false;
     private boolean mFetchUserInfoSuccess = false;
     private int expandedTabTextColor;
@@ -272,8 +238,6 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
 
     private UserData mUserData;
 
-    private boolean isBlocked;
-
     //private MaterialAlertDialogBuilder nsfwWarningBuilder;
 
     @Override
@@ -316,7 +280,6 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
         mAccountQualifiedName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null);
         lockBottomAppBar = mSharedPreferences.getBoolean(SharedPreferencesUtils.LOCK_BOTTOM_APP_BAR, false);
 
-        showStatistics = mSharedPreferences.getBoolean(SharedPreferencesUtils.SHOW_STATISTICS, true);
 
         if (savedInstanceState == null) {
             mMessageId = getIntent().getIntExtra(EXTRA_MESSAGE_FULLNAME, 0);
@@ -325,7 +288,6 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
             mFetchUserInfoSuccess = savedInstanceState.getBoolean(FETCH_USER_INFO_STATE);
             mMessageId = savedInstanceState.getInt(MESSAGE_FULLNAME_STATE);
             mNewAccountName = savedInstanceState.getString(NEW_ACCOUNT_NAME_STATE);
-            qualifiedName = savedInstanceState.getString("qualified_name");
         }
 
         checkNewAccountAndInitializeViewPager();
@@ -337,26 +299,9 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
         }
     }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-        if (mUserData != null) {
-            setupVisibleElements();
-        } else {
-            fetchUserInfo();
-        }
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        mFetchUserInfoSuccess = false;
-    }
-
     private void setupVisibleElements() {
         Resources resources = getResources();
         String title = username;
-        progressBar.setVisibility(View.GONE);
         userNameTextView.setText(title);
         qualifiedNameTextView.setText(qualifiedName);
         toolbar.setTitle(title);
@@ -437,7 +382,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
             });
         }
 
-        glide = Glide.with(getApplication());
+        glide = Glide.with(this);
         Locale locale = getResources().getConfiguration().locale;
 
         MarkwonPlugin miscPlugin = new AbstractMarkwonPlugin() {
@@ -461,7 +406,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
             urlMenuBottomSheetFragment.show(getSupportFragmentManager(), null);
             return true;
         };
-        Markwon markwon = MarkdownUtils.createDescriptionMarkwon(this, miscPlugin, onLinkLongClickListener, mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_IMAGE_PREVIEW, false));
+        Markwon markwon = MarkdownUtils.createDescriptionMarkwon(this, miscPlugin, onLinkLongClickListener);
 
         descriptionTextView.setOnLongClickListener(view -> {
             if (description != null && !description.equals("") && descriptionTextView.getSelectionStart() == -1 && descriptionTextView.getSelectionEnd() == -1) {
@@ -614,14 +559,8 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
                     getSupportActionBar().setTitle(userFullName);
                 }
                 String karma = "";//getString(R.string.karma_info_user_detail, userData.getTotalKarma(), userData.getLinkKarma(), userData.getCommentKarma());
-
-                cakedayTextView.setText((String) userData.getCakeday());
-                UserStats userStats = mUserData.getStats();
-                if (userStats != null && showStatistics) {
-                    userStatisticsBlock.setVisibility(View.VISIBLE);
-                    postCountTextView.setText(getString(R.string.post_count_detail, userStats.getPostCount()));
-                    commentCountTextView.setText(getString(R.string.comment_count_detail, userStats.getCommentCount()));
-                }
+                karmaTextView.setText(karma);
+                cakedayTextView.setText(getString(R.string.cakeday_info, userData.getCakeday()));
 
                 if (userData.getDescription() == null || userData.getDescription().equals("")) {
                     descriptionTextView.setVisibility(View.GONE);
@@ -689,11 +628,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
         unsubscribedColor = mCustomThemeWrapper.getUnsubscribed();
         subscribedColor = mCustomThemeWrapper.getSubscribed();
         userNameTextView.setTextColor(mCustomThemeWrapper.getUsername());
-        postCountTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
-        commentCountTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
-        postsCountIconImageView.setColorFilter(mCustomThemeWrapper.getPrimaryTextColor(), PorterDuff.Mode.SRC_IN);
-        commentsCountIconImageView.setColorFilter(mCustomThemeWrapper.getPrimaryTextColor(), PorterDuff.Mode.SRC_IN);
-        accountCreatedCakeIconImageView.setColorFilter(mCustomThemeWrapper.getPrimaryTextColor(), PorterDuff.Mode.SRC_IN);
+        karmaTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
         cakedayTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
         navigationWrapper.applyCustomTheme(mCustomThemeWrapper.getBottomAppBarIconColor(), mCustomThemeWrapper.getBottomAppBarBackgroundColor());
         applyFABTheme(navigationWrapper.floatingActionButton, mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
@@ -702,8 +637,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
         applyTabLayoutTheme(tabLayout);
         if (typeface != null) {
             userNameTextView.setTypeface(typeface);
-            postCountTextView.setTypeface(typeface);
-            commentCountTextView.setTypeface(typeface);
+            karmaTextView.setTypeface(typeface);
             cakedayTextView.setTypeface(typeface);
             subscribeUserChip.setTypeface(typeface);
             descriptionTextView.setTypeface(typeface);
@@ -737,7 +671,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
     private void initializeViewPager() {
         sectionsPagerAdapter = new SectionsPagerAdapter(this);
         viewPager2.setAdapter(sectionsPagerAdapter);
-        viewPager2.setOffscreenPageLimit(ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT);
+        viewPager2.setOffscreenPageLimit(2);
         viewPager2.setUserInputEnabled(!mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_SWIPING_BETWEEN_TABS, false));
         new TabLayoutMediator(tabLayout, viewPager2, (tab, position) -> {
             switch (position) {
@@ -995,7 +929,6 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
             case SharedPreferencesUtils.OTHER_ACTIVITIES_BOTTOM_APP_BAR_OPTION_PROFILE: {
                 Intent intent = new Intent(this, ViewUserDetailActivity.class);
                 intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, mAccountName);
-                intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY,mAccountQualifiedName);
                 startActivity(intent);
                 break;
             }
@@ -1150,27 +1083,8 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
                 @Override
                 public void onFetchUserDataSuccess(UserData userData, int inboxCount) {
                     mUserData = userData;
-                    username = userData.getDisplayName();
+                    username = userData.getName();
                     setupVisibleElements();
-                    FetchBlockedThings.fetchBlockedThings(mRetrofit.getRetrofit(), mAccessToken, mAccountQualifiedName, new FetchBlockedThings.FetchBlockedThingsListener() {
-
-                        @Override
-                        public void onFetchBlockedThingsSuccess(List<BlockedUserData> blockedUsers, List<BlockedCommunityData> blockedCommunities, List<BlockedInstanceData> blockedInstances) {
-                            for (BlockedUserData blockedUserData : blockedUsers) {
-                                if (blockedUserData.getQualifiedName().equals(qualifiedName)) {
-                                    isBlocked = true;
-                                    invalidateOptionsMenu();
-                                    return;
-                                }
-                            }
-                            isBlocked = false;
-                            invalidateOptionsMenu();
-                        }
-
-                        @Override
-                        public void onFetchBlockedThingsFailure() {
-                        }
-                    });
                     new ViewUserDetailActivity.InsertUserDataAsyncTask(mRedditDataRoomDatabase.userDao(), userData,
                             () -> mFetchUserInfoSuccess = true).execute();
                 }
@@ -1209,15 +1123,10 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
         getMenuInflater().inflate(R.menu.view_user_detail_activity, menu);
         if (username.equals(mAccountName)) {
             menu.findItem(R.id.action_send_private_message_view_user_detail_activity).setVisible(false);
+            menu.findItem(R.id.action_report_view_user_detail_activity).setVisible(false);
             menu.findItem(R.id.action_block_user_view_user_detail_activity).setVisible(false);
         } else {
             menu.findItem(R.id.action_edit_profile_view_user_detail_activity).setVisible(false);
-            if (isBlocked) {
-                menu.findItem(R.id.action_block_user_view_user_detail_activity).setVisible(false);
-                menu.findItem(R.id.action_unblock_user_view_user_detail_activity).setVisible(true);
-            } else {
-                menu.findItem(R.id.action_unblock_user_view_user_detail_activity).setVisible(false);
-            }
         }
         applyMenuItemTheme(menu);
         return true;
@@ -1252,7 +1161,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
             Intent shareIntent = new Intent(Intent.ACTION_SEND);
             shareIntent.setType("text/plain");
             String baseURL = mRetrofit.getBaseURL().endsWith("/") ? mRetrofit.getBaseURL() : mRetrofit.getBaseURL() + "/";
-            shareIntent.putExtra(Intent.EXTRA_TEXT, baseURL + "u/" + qualifiedName);
+            shareIntent.putExtra(Intent.EXTRA_TEXT, baseURL + qualifiedName);
             if (shareIntent.resolveActivity(getPackageManager()) != null) {
                 startActivity(Intent.createChooser(shareIntent, getString(R.string.share)));
             } else {
@@ -1266,14 +1175,26 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
             }
 
             Intent pmIntent = new Intent(this, SendPrivateMessageActivity.class);
-            pmIntent.putExtra(SendPrivateMessageActivity.EXTRA_RECIPIENT_USER_INFO, new BasicUserInfo(mUserData.getId(), username, qualifiedName, mUserData.getAvatar(), mUserData.getDisplayName()));
+            pmIntent.putExtra(SendPrivateMessageActivity.EXTRA_RECIPIENT_USERNAME, username);
             startActivity(pmIntent);
             return true;
+        } else if (itemId == R.id.action_add_to_multireddit_view_user_detail_activity) {
+            if (mAccessToken == null) {
+                Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
+                return true;
+            }
+            Intent intent = new Intent(this, MultiredditSelectionActivity.class);
+            startActivityForResult(intent, ADD_TO_MULTIREDDIT_REQUEST_CODE);
         } else if (itemId == R.id.action_add_to_post_filter_view_user_detail_activity) {
             Intent intent = new Intent(this, PostFilterPreferenceActivity.class);
             intent.putExtra(PostFilterPreferenceActivity.EXTRA_USER_NAME, username);
             startActivity(intent);
             return true;
+        } else if (itemId == R.id.action_report_view_user_detail_activity) {
+            Intent reportIntent = new Intent(this, LinkResolverActivity.class);
+            reportIntent.setData(Uri.parse("https://www.reddithelp.com/en/categories/rules-reporting/account-and-community-restrictions/what-should-i-do-if-i-see-something-i"));
+            startActivity(reportIntent);
+            return true;
         } else if (itemId == R.id.action_block_user_view_user_detail_activity) {
             if (mAccessToken == null) {
                 Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
@@ -1284,13 +1205,10 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
                     .setTitle(R.string.block_user)
                     .setMessage(R.string.are_you_sure)
                     .setPositiveButton(R.string.yes, (dialogInterface, i)
-                            -> BlockUser.blockUser(mRetrofit.getRetrofit(), mAccessToken, mUserData.getId(), true, new BlockUser.BlockUserListener() {
+                            -> BlockUser.blockUser(mOauthRetrofit, mAccessToken, username, new BlockUser.BlockUserListener() {
                         @Override
                         public void success() {
                             Toast.makeText(ViewUserDetailActivity.this, R.string.block_user_success, Toast.LENGTH_SHORT).show();
-                            isBlocked = true;
-                            sectionsPagerAdapter.refresh();
-                            invalidateOptionsMenu();
                         }
 
                         @Override
@@ -1304,31 +1222,6 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
         } else if (itemId == R.id.action_edit_profile_view_user_detail_activity) {
             startActivity(new Intent(this, EditProfileActivity.class));
             return true;
-        } else if (itemId == R.id.action_unblock_user_view_user_detail_activity) {
-            if (mAccessToken == null) {
-                Toast.makeText(this, R.string.login_first, Toast.LENGTH_SHORT).show();
-                return true;
-            }
-            BlockUser.blockUser(mRetrofit.getRetrofit(), mAccessToken, mUserData.getId(), false, new BlockUser.BlockUserListener() {
-                @Override
-                public void success() {
-                    isBlocked = false;
-                    Toast.makeText(ViewUserDetailActivity.this, R.string.unblock_user_success, Toast.LENGTH_SHORT).show();
-                    sectionsPagerAdapter.refresh();
-                    invalidateOptionsMenu();
-                }
-
-                @Override
-                public void failed() {
-                    Toast.makeText(ViewUserDetailActivity.this, R.string.unblock_user_failed, Toast.LENGTH_SHORT).show();
-                }
-            });
-        } else if (itemId == R.id.action_view_instance_view_user_detail_activity) {
-            String instance = mUserData.getActorId().split("/")[2];
-            Intent intent = new Intent(this, InstanceInfoActivity.class);
-            intent.putExtra(InstanceInfoActivity.EXTRA_INSTANCE_DOMAIN, instance);
-            intent.putExtra(InstanceInfoActivity.EXTRA_INSTANCE_ID, mUserData.getInstanceId());
-            startActivity(intent);
         }
         return false;
     }
@@ -1377,8 +1270,6 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
         outState.putBoolean(FETCH_USER_INFO_STATE, mFetchUserInfoSuccess);
         outState.putInt(MESSAGE_FULLNAME_STATE, mMessageId);
         outState.putString(NEW_ACCOUNT_NAME_STATE, mNewAccountName);
-        outState.putString(NEW_ACCOUNT_QUALIFIED_NAME_STATE, mAccountQualifiedName);
-        outState.putString("qualified_name", qualifiedName);
     }
 
     @Override
@@ -1450,7 +1341,10 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
                 goToUser();
                 break;
             }
-
+            case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
+                random();
+                break;
+            }
             case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
                 if (sectionsPagerAdapter != null) {
                     sectionsPagerAdapter.hideReadPosts();
@@ -1490,11 +1384,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
             if (i == EditorInfo.IME_ACTION_DONE) {
                 Utils.hideKeyboard(this);
                 Intent subredditIntent = new Intent(this, ViewSubredditDetailActivity.class);
-                String communityName = thingEditText.getText().toString();
-                if (communityName.startsWith("!")) {
-                    communityName = communityName.substring(1);
-                }
-                subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, communityName);
+                subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, thingEditText.getText().toString());
                 startActivity(subredditIntent);
                 return true;
             }
@@ -1552,11 +1442,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
                         -> {
                     Utils.hideKeyboard(this);
                     Intent subredditIntent = new Intent(this, ViewSubredditDetailActivity.class);
-                    String communityName = thingEditText.getText().toString();
-                    if (communityName.startsWith("!")) {
-                        communityName = communityName.substring(1);
-                    }
-                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, communityName);
+                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, thingEditText.getText().toString());
                     startActivity(subredditIntent);
                 })
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) -> {
@@ -1577,11 +1463,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
             if (i == EditorInfo.IME_ACTION_DONE) {
                 Utils.hideKeyboard(this);
                 Intent userIntent = new Intent(this, ViewUserDetailActivity.class);
-                String userName = thingEditText.getText().toString();
-                if (userName.startsWith("@")) {
-                    userName = userName.substring(1);
-                }
-                userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, userName);
+                userIntent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, thingEditText.getText().toString());
                 startActivity(userIntent);
                 return true;
             }
@@ -1594,11 +1476,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
                         -> {
                     Utils.hideKeyboard(this);
                     Intent userIntent = new Intent(this, ViewUserDetailActivity.class);
-                    String userName = thingEditText.getText().toString();
-                    if (userName.startsWith("@")) {
-                        userName = userName.substring(1);
-                    }
-                    userIntent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, userName);
+                    userIntent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, thingEditText.getText().toString());
                     startActivity(userIntent);
                 })
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) -> {
@@ -1765,7 +1643,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
                 bundle.putString(PostFragment.EXTRA_USER_NAME, qualifiedName);
                 bundle.putString(PostFragment.EXTRA_USER_WHERE, PostPagingSource.USER_WHERE_SUBMITTED);
                 bundle.putString(PostFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountQualifiedName);
+                bundle.putString(PostFragment.EXTRA_ACCOUNT_NAME, mAccountName);
                 fragment.setArguments(bundle);
                 return fragment;
             }

app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewVideoActivity.java

@@ -23,11 +23,14 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
+import android.text.Html;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.OrientationEventListener;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -67,7 +70,7 @@ import com.google.android.exoplayer2.upstream.cache.SimpleCache;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.video.VideoSize;
 import com.google.android.material.bottomappbar.BottomAppBar;
-import com.google.android.material.button.MaterialButton;
+import com.google.android.material.snackbar.Snackbar;
 import com.google.common.collect.ImmutableList;
 import com.otaliastudios.zoom.ZoomEngine;
 import com.otaliastudios.zoom.ZoomSurfaceView;
@@ -87,7 +90,7 @@ import app.futured.hauler.LockableNestedScrollView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import eu.toldi.infinityforlemmy.CustomFontReceiver;
-import eu.toldi.infinityforlemmy.FetchRedgifsVideoLinks;
+import eu.toldi.infinityforlemmy.FetchGfycatOrRedgifsVideoLinks;
 import eu.toldi.infinityforlemmy.FetchStreamableVideo;
 import eu.toldi.infinityforlemmy.Infinity;
 import eu.toldi.infinityforlemmy.R;
@@ -105,7 +108,6 @@ import eu.toldi.infinityforlemmy.font.TitleFontFamily;
 import eu.toldi.infinityforlemmy.font.TitleFontStyle;
 import eu.toldi.infinityforlemmy.post.FetchPost;
 import eu.toldi.infinityforlemmy.post.Post;
-import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.services.DownloadMediaService;
 import eu.toldi.infinityforlemmy.services.DownloadRedditVideoService;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
@@ -129,10 +131,10 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
     public static final String EXTRA_VIDEO_DOWNLOAD_URL = "EVDU";
     public static final String EXTRA_SUBREDDIT = "ES";
     public static final String EXTRA_ID = "EI";
-    public static final String EXTRA_POST = "EP";
+    public static final String EXTRA_POST_TITLE = "EPT";
     public static final String EXTRA_PROGRESS_SECONDS = "EPS";
     public static final String EXTRA_VIDEO_TYPE = "EVT";
-    public static final String EXTRA_REDGIFS_ID = "ERI";
+    public static final String EXTRA_GFYCAT_ID = "EGI";
     public static final String EXTRA_V_REDD_IT_URL = "EVRIU";
     public static final String EXTRA_STREAMABLE_SHORT_CODE = "ESSC";
     public static final String EXTRA_IS_NSFW = "EIN";
@@ -141,6 +143,7 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
     public static final int VIDEO_TYPE_V_REDD_IT = 4;
     public static final int VIDEO_TYPE_DIRECT = 3;
     public static final int VIDEO_TYPE_REDGIFS = 2;
+    public static final int VIDEO_TYPE_GFYCAT = 1;
     private static final int VIDEO_TYPE_NORMAL = 0;
     private static final int PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE = 0;
 
@@ -159,19 +162,17 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
     @BindView(R.id.progress_bar_view_video_activity)
     ProgressBar progressBar;
     @BindView(R.id.mute_exo_playback_control_view)
-    MaterialButton muteButton;
+    ImageButton muteButton;
     @BindView(R.id.hd_exo_playback_control_view)
-    MaterialButton hdButton;
+    ImageButton hdButton;
     @BindView(R.id.bottom_navigation_exo_playback_control_view)
     BottomAppBar bottomAppBar;
     @BindView(R.id.title_text_view_exo_playback_control_view)
     TextView titleTextView;
-    @BindView(R.id.back_button_exo_playback_control_view)
-    MaterialButton backButton;
     @BindView(R.id.download_image_view_exo_playback_control_view)
-    MaterialButton downloadButton;
+    ImageView downloadImageView;
     @BindView(R.id.playback_speed_image_view_exo_playback_control_view)
-    MaterialButton playbackSpeedButton;
+    ImageView playbackSpeedImageView;
     @BindView(R.id.lockable_nested_scroll_view_view_video_activity)
     LockableNestedScrollView nestedScrollView;
 
@@ -202,6 +203,10 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
     @Named("no_oauth")
     RetrofitHolder retrofit;
 
+    @Inject
+    @Named("gfycat")
+    Retrofit gfycatRetrofit;
+
     @Inject
     @Named("redgifs")
     Retrofit redgifsRetrofit;
@@ -217,6 +222,10 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
     @Named("default")
     SharedPreferences mSharedPreferences;
 
+    @Inject
+    @Named("current_account")
+    SharedPreferences mCurrentAccountSharedPreferences;
+
     @Inject
     CustomThemeWrapper mCustomThemeWrapper;
 
@@ -226,9 +235,6 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
     @Inject
     SimpleCache mSimpleCache;
 
-    @Inject
-    PostEnricher postEnricher;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -295,12 +301,6 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
         ButterKnife.bind(this);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
-        setTitle(" ");
-
-        if (typeface != null) {
-            titleTextView.setTypeface(typeface);
-        }
-
         Resources resources = getResources();
 
         getWindow().getDecorView().setSystemUiVisibility(
@@ -312,11 +312,7 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
         if (useBottomAppBar) {
             getSupportActionBar().hide();
             bottomAppBar.setVisibility(View.VISIBLE);
-            backButton.setOnClickListener(view -> {
-                finish();
-            });
-
-            downloadButton.setOnClickListener(view -> {
+            downloadImageView.setOnClickListener(view -> {
                 if (isDownloading) {
                     return;
                 }
@@ -330,8 +326,12 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
                 requestPermissionAndDownload();
             });
 
-            playbackSpeedButton.setOnClickListener(view -> {
-                changePlaybackSpeed();
+            playbackSpeedImageView.setOnClickListener(view -> {
+                PlaybackSpeedBottomSheetFragment playbackSpeedBottomSheetFragment = new PlaybackSpeedBottomSheetFragment();
+                Bundle bundle = new Bundle();
+                bundle.putInt(PlaybackSpeedBottomSheetFragment.EXTRA_PLAYBACK_SPEED, playbackSpeed);
+                playbackSpeedBottomSheetFragment.setArguments(bundle);
+                playbackSpeedBottomSheetFragment.show(getSupportFragmentManager(), playbackSpeedBottomSheetFragment.getTag());
             });
         } else {
             ActionBar actionBar = getSupportActionBar();
@@ -402,15 +402,12 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
                         };
                         orientationEventListener.enable();
                     }
-                } catch (Exception ignore) {
-                }
+                } catch (Exception ignore) {}
             }
         }
 
-        Post post = intent.getParcelableExtra(EXTRA_POST);
-        if (post != null) {
-            titleTextView.setText(post.getTitle());
-        }
+        String postTitle = intent.getStringExtra(EXTRA_POST_TITLE);
+        setSmallTitle(postTitle);
 
         trackSelector = new DefaultTrackSelector(this);
         if (videoType == VIDEO_TYPE_NORMAL && isDataSavingMode && dataSavingModeDefaultResolution > 0) {
@@ -542,21 +539,29 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
             }
         } else if (videoType == VIDEO_TYPE_V_REDD_IT) {
             loadVReddItVideo(savedInstanceState);
-        } else if (videoType == VIDEO_TYPE_REDGIFS) {
+        } else if (videoType == VIDEO_TYPE_GFYCAT || videoType == VIDEO_TYPE_REDGIFS) {
             if (savedInstanceState != null) {
                 videoDownloadUrl = savedInstanceState.getString(VIDEO_DOWNLOAD_URL_STATE);
             } else {
                 videoDownloadUrl = intent.getStringExtra(EXTRA_VIDEO_DOWNLOAD_URL);
             }
 
-            String redgifsId = intent.getStringExtra(EXTRA_REDGIFS_ID);
-            if (redgifsId != null && redgifsId.contains("-")) {
-                redgifsId = redgifsId.substring(0, redgifsId.indexOf('-'));
+            String gfycatId = intent.getStringExtra(EXTRA_GFYCAT_ID);
+            if (gfycatId != null && gfycatId.contains("-")) {
+                gfycatId = gfycatId.substring(0, gfycatId.indexOf('-'));
+            }
+            if (videoType == VIDEO_TYPE_GFYCAT) {
+                videoFileName = "Gfycat-" + gfycatId + ".mp4";
+            } else {
+                videoFileName = "Redgifs-" + gfycatId + ".mp4";
             }
-            videoFileName = "Redgifs-" + redgifsId + ".mp4";
 
             if (mVideoUri == null) {
-                loadRedgifsVideo(redgifsId, savedInstanceState);
+                if (videoType == VIDEO_TYPE_GFYCAT) {
+                    loadGfycatOrRedgifsVideo(gfycatRetrofit, gfycatId, true, savedInstanceState, true);
+                } else {
+                    loadGfycatOrRedgifsVideo(redgifsRetrofit, gfycatId, false, savedInstanceState, false);
+                }
             } else {
                 dataSourceFactory = new CacheDataSource.Factory().setCache(mSimpleCache)
                         .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory().setAllowCrossProtocolRedirects(true).setUserAgent(APIUtils.USER_AGENT));
@@ -593,6 +598,20 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
         }
     }
 
+    private void setSmallTitle(String title) {
+        if (title != null) {
+            if (useBottomAppBar) {
+                titleTextView.setText(Html.fromHtml(String.format("<font color=\"#FFFFFF\"><small>%s</small></font>", title)));
+            } else {
+                setTitle(Utils.getTabTextWithCustomFont(typeface, Html.fromHtml(String.format("<font color=\"#FFFFFF\"><small>%s</small></font>", title))));
+            }
+        } else {
+            if (!useBottomAppBar) {
+                setTitle("");
+            }
+        }
+    }
+
     private void preparePlayer(Bundle savedInstanceState) {
         if (mSharedPreferences.getBoolean(SharedPreferencesUtils.LOOP_VIDEO, true)) {
             player.setRepeatMode(Player.REPEAT_MODE_ALL);
@@ -612,17 +631,17 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
             isMute = savedInstanceState.getBoolean(IS_MUTE_STATE);
             if (isMute) {
                 player.setVolume(0f);
-                muteButton.setIconResource(R.drawable.ic_mute_24dp);
+                muteButton.setImageResource(R.drawable.ic_mute_24dp);
             } else {
                 player.setVolume(1f);
-                muteButton.setIconResource(R.drawable.ic_unmute_24dp);
+                muteButton.setImageResource(R.drawable.ic_unmute_24dp);
             }
         } else if (muteVideo) {
             isMute = true;
             player.setVolume(0f);
-            muteButton.setIconResource(R.drawable.ic_mute_24dp);
+            muteButton.setImageResource(R.drawable.ic_mute_24dp);
         } else {
-            muteButton.setIconResource(R.drawable.ic_unmute_24dp);
+            muteButton.setImageResource(R.drawable.ic_unmute_24dp);
         }
 
         player.addListener(new Player.Listener() {
@@ -666,11 +685,11 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
                                     if (isMute) {
                                         isMute = false;
                                         player.setVolume(1f);
-                                        muteButton.setIconResource(R.drawable.ic_unmute_24dp);
+                                        muteButton.setImageResource(R.drawable.ic_unmute_24dp);
                                     } else {
                                         isMute = true;
                                         player.setVolume(0f);
-                                        muteButton.setIconResource(R.drawable.ic_mute_24dp);
+                                        muteButton.setImageResource(R.drawable.ic_mute_24dp);
                                     }
                                 });
                             }
@@ -683,14 +702,6 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
         });
     }
 
-    private void changePlaybackSpeed() {
-        PlaybackSpeedBottomSheetFragment playbackSpeedBottomSheetFragment = new PlaybackSpeedBottomSheetFragment();
-        Bundle bundle = new Bundle();
-        bundle.putInt(PlaybackSpeedBottomSheetFragment.EXTRA_PLAYBACK_SPEED, playbackSpeed);
-        playbackSpeedBottomSheetFragment.setArguments(bundle);
-        playbackSpeedBottomSheetFragment.show(getSupportFragmentManager(), playbackSpeedBottomSheetFragment.getTag());
-    }
-
     private int inferPrimaryTrackType(Format format) {
         int trackType = MimeTypes.getTrackType(format.sampleMimeType);
         if (trackType != C.TRACK_TYPE_UNKNOWN) {
@@ -711,28 +722,61 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
         return C.TRACK_TYPE_UNKNOWN;
     }
 
-    private void loadRedgifsVideo(String redgifsId, Bundle savedInstanceState) {
+    private void loadGfycatOrRedgifsVideo(Retrofit retrofit, String gfycatId, boolean isGfycatVideo,
+                                          Bundle savedInstanceState, boolean needErrorHandling) {
         progressBar.setVisibility(View.VISIBLE);
-        FetchRedgifsVideoLinks.fetchRedgifsVideoLinks(mExecutor, new Handler(), redgifsRetrofit,
-                redgifsId, new FetchRedgifsVideoLinks.FetchRedgifsVideoLinksListener() {
-                    @Override
-                    public void success(String webm, String mp4) {
-                        progressBar.setVisibility(View.GONE);
-                        mVideoUri = Uri.parse(webm);
-                        videoDownloadUrl = mp4;
-                        dataSourceFactory = new CacheDataSource.Factory().setCache(mSimpleCache)
-                                .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory().setAllowCrossProtocolRedirects(true).setUserAgent(APIUtils.USER_AGENT));
-                        preparePlayer(savedInstanceState);
-                        player.prepare();
-                        player.setMediaSource(new ProgressiveMediaSource.Factory(dataSourceFactory).createMediaSource(MediaItem.fromUri(mVideoUri)));
-                    }
+        if (isGfycatVideo) {
+            FetchGfycatOrRedgifsVideoLinks.fetchGfycatVideoLinks(mExecutor, new Handler(), retrofit, gfycatId,
+                    new FetchGfycatOrRedgifsVideoLinks.FetchGfycatOrRedgifsVideoLinksListener() {
+                        @Override
+                        public void success(String webm, String mp4) {
+                            progressBar.setVisibility(View.GONE);
+                            mVideoUri = Uri.parse(webm);
+                            videoDownloadUrl = mp4;
+                            dataSourceFactory = new CacheDataSource.Factory().setCache(mSimpleCache)
+                                    .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory().setAllowCrossProtocolRedirects(true).setUserAgent(APIUtils.USER_AGENT));
+                            preparePlayer(savedInstanceState);
+                            player.prepare();
+                            player.setMediaSource(new ProgressiveMediaSource.Factory(dataSourceFactory).createMediaSource(MediaItem.fromUri(mVideoUri)));
+                        }
 
-                    @Override
-                    public void failed(int errorCode) {
-                        progressBar.setVisibility(View.GONE);
-                        Toast.makeText(ViewVideoActivity.this, R.string.fetch_redgifs_video_failed, Toast.LENGTH_SHORT).show();
-                    }
-                });
+                        @Override
+                        public void failed(int errorCode) {
+                            if (errorCode == 404 && needErrorHandling) {
+                                if (mSharedPreferences.getBoolean(SharedPreferencesUtils.AUTOMATICALLY_TRY_REDGIFS, true)) {
+                                    loadGfycatOrRedgifsVideo(redgifsRetrofit, gfycatId, false, savedInstanceState, false);
+                                } else {
+                                    Snackbar.make(coordinatorLayout, R.string.load_video_in_redgifs, Snackbar.LENGTH_INDEFINITE).setAction(R.string.yes,
+                                            view -> loadGfycatOrRedgifsVideo(redgifsRetrofit, gfycatId, false, savedInstanceState, false)).show();
+                                }
+                            } else {
+                                progressBar.setVisibility(View.GONE);
+                                Toast.makeText(ViewVideoActivity.this, R.string.fetch_gfycat_video_failed, Toast.LENGTH_SHORT).show();
+                            }
+                        }
+                    });
+        } else {
+            FetchGfycatOrRedgifsVideoLinks.fetchRedgifsVideoLinks(this, mExecutor, new Handler(), redgifsRetrofit,
+                    mCurrentAccountSharedPreferences, gfycatId, new FetchGfycatOrRedgifsVideoLinks.FetchGfycatOrRedgifsVideoLinksListener() {
+                        @Override
+                        public void success(String webm, String mp4) {
+                            progressBar.setVisibility(View.GONE);
+                            mVideoUri = Uri.parse(webm);
+                            videoDownloadUrl = mp4;
+                            dataSourceFactory = new CacheDataSource.Factory().setCache(mSimpleCache)
+                                    .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory().setAllowCrossProtocolRedirects(true).setUserAgent(APIUtils.USER_AGENT));
+                            preparePlayer(savedInstanceState);
+                            player.prepare();
+                            player.setMediaSource(new ProgressiveMediaSource.Factory(dataSourceFactory).createMediaSource(MediaItem.fromUri(mVideoUri)));
+                        }
+
+                        @Override
+                        public void failed(int errorCode) {
+                            progressBar.setVisibility(View.GONE);
+                            Toast.makeText(ViewVideoActivity.this, R.string.fetch_redgifs_video_failed, Toast.LENGTH_SHORT).show();
+                        }
+                    });
+        }
     }
 
     private void loadVReddItVideo(Bundle savedInstanceState) {
@@ -747,17 +791,33 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
                     int commentsIndex = segments.lastIndexOf("comments");
                     String postId = segments.get(commentsIndex + 1);
                     FetchPost.fetchPost(mExecutor, new Handler(), retrofit.getRetrofit(), postId, null,
-                            postEnricher, new FetchPost.FetchPostListener() {
+                            new FetchPost.FetchPostListener() {
                                 @Override
                                 public void fetchPostSuccess(Post post) {
-                                    if (post.isRedgifs()) {
-                                        videoType = VIDEO_TYPE_REDGIFS;
-                                        String redgifsId = post.getRedgifsId();
-                                        if (redgifsId != null && redgifsId.contains("-")) {
-                                            redgifsId = redgifsId.substring(0, redgifsId.indexOf('-'));
+                                    if (post.isGfycat()) {
+                                        videoType = VIDEO_TYPE_GFYCAT;
+                                        String gfycatId = post.getGfycatId();
+                                        if (gfycatId != null && gfycatId.contains("-")) {
+                                            gfycatId = gfycatId.substring(0, gfycatId.indexOf('-'));
                                         }
-                                        videoFileName = "Redgifs-" + redgifsId + ".mp4";
-                                        loadRedgifsVideo(redgifsId, savedInstanceState);
+                                        if (videoType == VIDEO_TYPE_GFYCAT) {
+                                            videoFileName = "Gfycat-" + gfycatId + ".mp4";
+                                        } else {
+                                            videoFileName = "Redgifs-" + gfycatId + ".mp4";
+                                        }
+                                        loadGfycatOrRedgifsVideo(gfycatRetrofit, gfycatId, true, savedInstanceState, true);
+                                    } else if (post.isRedgifs()) {
+                                        videoType = VIDEO_TYPE_REDGIFS;
+                                        String gfycatId = post.getGfycatId();
+                                        if (gfycatId != null && gfycatId.contains("-")) {
+                                            gfycatId = gfycatId.substring(0, gfycatId.indexOf('-'));
+                                        }
+                                        if (videoType == VIDEO_TYPE_GFYCAT) {
+                                            videoFileName = "Gfycat-" + gfycatId + ".mp4";
+                                        } else {
+                                            videoFileName = "Redgifs-" + gfycatId + ".mp4";
+                                        }
+                                        loadGfycatOrRedgifsVideo(redgifsRetrofit, gfycatId, false, savedInstanceState, false);
                                     } else if (post.isStreamable()) {
                                         videoType = VIDEO_TYPE_STREAMABLE;
                                         String shortCode = post.getStreamableShortCode();
@@ -824,7 +884,7 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
                             Toast.makeText(ViewVideoActivity.this, R.string.fetch_streamable_video_failed, Toast.LENGTH_SHORT).show();
                             return;
                         }
-                        titleTextView.setText(streamableVideo.title);
+                        setSmallTitle(streamableVideo.title);
                         progressBar.setVisibility(View.GONE);
                         videoDownloadUrl = streamableVideo.mp4 == null ? streamableVideo.mp4Mobile.url : streamableVideo.mp4.url;
                         mVideoUri = Uri.parse(videoDownloadUrl);
@@ -879,7 +939,11 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
             requestPermissionAndDownload();
             return true;
         } else if (itemId == R.id.action_playback_speed_view_video_activity) {
-            changePlaybackSpeed();
+            PlaybackSpeedBottomSheetFragment playbackSpeedBottomSheetFragment = new PlaybackSpeedBottomSheetFragment();
+            Bundle bundle = new Bundle();
+            bundle.putInt(PlaybackSpeedBottomSheetFragment.EXTRA_PLAYBACK_SPEED, playbackSpeed);
+            playbackSpeedBottomSheetFragment.setArguments(bundle);
+            playbackSpeedBottomSheetFragment.show(getSupportFragmentManager(), playbackSpeedBottomSheetFragment.getTag());
             return true;
         }
 

app/src/main/java/eu/toldi/infinityforlemmy/activities/WikiActivity.java

@@ -35,9 +35,16 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import eu.toldi.infinityforlemmy.RetrofitHolder;
+import io.noties.markwon.AbstractMarkwonPlugin;
+import io.noties.markwon.Markwon;
+import io.noties.markwon.MarkwonConfiguration;
+import io.noties.markwon.MarkwonPlugin;
+import io.noties.markwon.core.MarkwonTheme;
+import io.noties.markwon.recycler.MarkwonAdapter;
+import me.saket.bettermovementmethod.BetterLinkMovementMethod;
 import eu.toldi.infinityforlemmy.Infinity;
 import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.RetrofitHolder;
 import eu.toldi.infinityforlemmy.apis.RedditAPI;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.UrlMenuBottomSheetFragment;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
@@ -50,16 +57,10 @@ import eu.toldi.infinityforlemmy.markdown.MarkdownUtils;
 import eu.toldi.infinityforlemmy.utils.JSONUtils;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
-import io.noties.markwon.AbstractMarkwonPlugin;
-import io.noties.markwon.Markwon;
-import io.noties.markwon.MarkwonConfiguration;
-import io.noties.markwon.MarkwonPlugin;
-import io.noties.markwon.core.MarkwonTheme;
-import io.noties.markwon.recycler.MarkwonAdapter;
-import me.saket.bettermovementmethod.BetterLinkMovementMethod;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
+import retrofit2.Retrofit;
 
 public class WikiActivity extends BaseActivity {
 
@@ -138,7 +139,7 @@ public class WikiActivity extends BaseActivity {
             }
         }
 
-        mGlide = Glide.with(getApplication());
+        mGlide = Glide.with(this);
 
         swipeRefreshLayout.setEnabled(mSharedPreferences.getBoolean(SharedPreferencesUtils.PULL_TO_REFRESH, true));
         swipeRefreshLayout.setOnRefreshListener(this::loadWiki);
@@ -176,7 +177,7 @@ public class WikiActivity extends BaseActivity {
             return true;
         };
         markwon = MarkdownUtils.createFullRedditMarkwon(this,
-                miscPlugin, markdownColor, spoilerBackgroundColor, mGlide, onLinkLongClickListener, mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_IMAGE_PREVIEW, false));
+                miscPlugin, markdownColor, spoilerBackgroundColor, onLinkLongClickListener);
 
         markwonAdapter = MarkdownUtils.createTablesAdapter();
         LinearLayoutManagerBugFixed linearLayoutManager = new SwipeLockLinearLayoutManager(this, new SwipeLockInterface() {
@@ -218,7 +219,7 @@ public class WikiActivity extends BaseActivity {
 
         swipeRefreshLayout.setRefreshing(true);
 
-        Glide.with(getApplication()).clear(mFetchWikiInfoImageView);
+        Glide.with(this).clear(mFetchWikiInfoImageView);
         mFetchWikiInfoLinearLayout.setVisibility(View.GONE);
 
         retrofit.getRetrofit().create(RedditAPI.class).getWikiPage(getIntent().getStringExtra(EXTRA_SUBREDDIT_NAME), getIntent().getStringExtra(EXTRA_WIKI_PATH)).enqueue(new Callback<String>() {
@@ -259,7 +260,7 @@ public class WikiActivity extends BaseActivity {
         swipeRefreshLayout.setRefreshing(false);
         mFetchWikiInfoLinearLayout.setVisibility(View.VISIBLE);
         mFetchWikiInfoTextView.setText(stringResId);
-        mGlide.load(R.mipmap.ic_launcher_round).into(mFetchWikiInfoImageView);
+        mGlide.load(R.drawable.error_image).into(mFetchWikiInfoImageView);
     }
 
     @Override

app/src/main/java/eu/toldi/infinityforlemmy/adapters/AdminRecyclerViewAdapter.java

@@ -1,22 +0,0 @@
-package eu.toldi.infinityforlemmy.adapters;
-
-import eu.toldi.infinityforlemmy.activities.BaseActivity;
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import eu.toldi.infinityforlemmy.user.BasicUserRecyclerViewAdapter;
-
-public class AdminRecyclerViewAdapter extends BasicUserRecyclerViewAdapter {
-
-    CustomThemeWrapper mCustomThemeWrapper;
-
-    public AdminRecyclerViewAdapter(BaseActivity activity, CustomThemeWrapper customThemeWrapper) {
-        super(activity, customThemeWrapper);
-        mCustomThemeWrapper = customThemeWrapper;
-    }
-
-    @Override
-    protected int getUserNameTextColor() {
-        return mCustomThemeWrapper.getAdmin();
-    }
-
-
-}

app/src/main/java/eu/toldi/infinityforlemmy/adapters/BlockedCommunitiesRecyclerViewAdapter.java

@@ -1,385 +0,0 @@
-package eu.toldi.infinityforlemmy.adapters;
-
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.RequestManager;
-import com.bumptech.glide.request.RequestOptions;
-
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.regex.Pattern;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
-import eu.toldi.infinityforlemmy.activities.BaseActivity;
-import eu.toldi.infinityforlemmy.activities.ViewSubredditDetailActivity;
-import eu.toldi.infinityforlemmy.blockedcommunity.BlockedCommunityData;
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import me.zhanghai.android.fastscroll.PopupTextProvider;
-import pl.droidsonroids.gif.GifImageView;
-import retrofit2.Retrofit;
-
-public class BlockedCommunitiesRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements PopupTextProvider {
-    private static final int VIEW_TYPE_FAVORITE_SUBREDDIT_DIVIDER = 0;
-    private static final int VIEW_TYPE_FAVORITE_SUBREDDIT = 1;
-    private static final int VIEW_TYPE_SUBREDDIT_DIVIDER = 2;
-    private static final int VIEW_TYPE_SUBREDDIT = 3;
-
-    private BaseActivity mActivity;
-    private Executor mExecutor;
-    private Retrofit mOauthRetrofit;
-    private RedditDataRoomDatabase mRedditDataRoomDatabase;
-    private List<BlockedCommunityData> mBlockedCommunityData;
-    private List<BlockedCommunityData> mFavoriteBlockedCommunityData;
-    private RequestManager glide;
-    private ItemClickListener itemClickListener;
-
-    private String accessToken;
-    private String username;
-    private String userIconUrl;
-    private boolean hasClearSelectionRow;
-
-    private int primaryTextColor;
-    private int secondaryTextColor;
-
-    public BlockedCommunitiesRecyclerViewAdapter(BaseActivity activity, Executor executor, Retrofit oauthRetrofit,
-                                                 RedditDataRoomDatabase redditDataRoomDatabase,
-                                                 CustomThemeWrapper customThemeWrapper,
-                                                 String accessToken) {
-        mActivity = activity;
-        mExecutor = executor;
-        glide = Glide.with(activity);
-        mOauthRetrofit = oauthRetrofit;
-        mRedditDataRoomDatabase = redditDataRoomDatabase;
-        this.accessToken = accessToken;
-        primaryTextColor = customThemeWrapper.getPrimaryTextColor();
-        secondaryTextColor = customThemeWrapper.getSecondaryTextColor();
-    }
-
-    public BlockedCommunitiesRecyclerViewAdapter(BaseActivity activity, Executor executor, Retrofit oauthRetrofit,
-                                                 RedditDataRoomDatabase redditDataRoomDatabase,
-                                                 CustomThemeWrapper customThemeWrapper,
-                                                 String accessToken, boolean hasClearSelectionRow,
-                                                 ItemClickListener itemClickListener) {
-        this(activity, executor, oauthRetrofit, redditDataRoomDatabase, customThemeWrapper, accessToken);
-        this.hasClearSelectionRow = hasClearSelectionRow;
-        this.itemClickListener = itemClickListener;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        if (mFavoriteBlockedCommunityData != null && mFavoriteBlockedCommunityData.size() > 0) {
-            if (itemClickListener != null && !hasClearSelectionRow) {
-                if (position == 0) {
-                    return VIEW_TYPE_SUBREDDIT;
-                } else if (position == 1) {
-                    return VIEW_TYPE_FAVORITE_SUBREDDIT_DIVIDER;
-                } else if (position == mFavoriteBlockedCommunityData.size() + 2) {
-                    return VIEW_TYPE_SUBREDDIT_DIVIDER;
-                } else if (position <= mFavoriteBlockedCommunityData.size() + 1) {
-                    return VIEW_TYPE_FAVORITE_SUBREDDIT;
-                } else {
-                    return VIEW_TYPE_SUBREDDIT;
-                }
-            } else if (hasClearSelectionRow) {
-                if (position == 0) {
-                    return VIEW_TYPE_SUBREDDIT;
-                } else if (position == 1) {
-                    return VIEW_TYPE_SUBREDDIT;
-                } else if (position == 2) {
-                    return VIEW_TYPE_FAVORITE_SUBREDDIT_DIVIDER;
-                } else if (position == mFavoriteBlockedCommunityData.size() + 3) {
-                    return VIEW_TYPE_SUBREDDIT_DIVIDER;
-                } else if (position <= mFavoriteBlockedCommunityData.size() + 2) {
-                    return VIEW_TYPE_FAVORITE_SUBREDDIT;
-                } else {
-                    return VIEW_TYPE_SUBREDDIT;
-                }
-            } else {
-                if (position == 0) {
-                    return VIEW_TYPE_FAVORITE_SUBREDDIT_DIVIDER;
-                } else if (position == mFavoriteBlockedCommunityData.size() + 1) {
-                    return VIEW_TYPE_SUBREDDIT_DIVIDER;
-                } else if (position <= mFavoriteBlockedCommunityData.size()) {
-                    return VIEW_TYPE_FAVORITE_SUBREDDIT;
-                } else {
-                    return VIEW_TYPE_SUBREDDIT;
-                }
-            }
-        } else {
-            return VIEW_TYPE_SUBREDDIT;
-        }
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-        switch (i) {
-            case VIEW_TYPE_FAVORITE_SUBREDDIT_DIVIDER:
-                return new FavoriteSubredditsDividerViewHolder(LayoutInflater.from(viewGroup.getContext())
-                        .inflate(R.layout.item_favorite_thing_divider, viewGroup, false));
-            case VIEW_TYPE_FAVORITE_SUBREDDIT:
-                return new FavoriteSubredditViewHolder(LayoutInflater.from(viewGroup.getContext())
-                        .inflate(R.layout.item_subscribed_thing, viewGroup, false));
-            case VIEW_TYPE_SUBREDDIT_DIVIDER:
-                return new AllSubredditsDividerViewHolder(LayoutInflater.from(viewGroup.getContext())
-                        .inflate(R.layout.item_favorite_thing_divider, viewGroup, false));
-            default:
-                return new SubredditViewHolder(LayoutInflater.from(viewGroup.getContext())
-                        .inflate(R.layout.item_subscribed_thing, viewGroup, false));
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder viewHolder, int i) {
-        if (viewHolder instanceof SubredditViewHolder) {
-            String name;
-            String fullname = "";
-            String iconUrl;
-
-            if (hasClearSelectionRow && viewHolder.getBindingAdapterPosition() == 0) {
-                ((SubredditViewHolder) viewHolder).subredditNameTextView.setText(R.string.all_communities);
-                viewHolder.itemView.setOnClickListener(view -> itemClickListener.onClick(null));
-                return;
-            } else {
-                int offset = hasClearSelectionRow ? 1 : 0;
-                BlockedCommunityData communityData = mBlockedCommunityData.get(viewHolder.getBindingAdapterPosition() - offset);
-                name = mBlockedCommunityData.get(viewHolder.getBindingAdapterPosition() - offset).getName();
-                fullname = mBlockedCommunityData.get(viewHolder.getBindingAdapterPosition() - offset).getQualified_name();
-                iconUrl = mBlockedCommunityData.get(viewHolder.getBindingAdapterPosition() - offset).getIconUrl();
-
-                if (itemClickListener != null) {
-                    viewHolder.itemView.setOnClickListener(view -> itemClickListener.onClick(communityData));
-                }
-            }
-
-            if (itemClickListener == null) {
-                String finalFullname = fullname;
-                viewHolder.itemView.setOnClickListener(view -> {
-                    Intent intent = new Intent(mActivity, ViewSubredditDetailActivity.class);
-                    intent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, name);
-                    intent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY,
-                            finalFullname);
-                    mActivity.startActivity(intent);
-                });
-            }
-
-            if (iconUrl != null && !iconUrl.equals("")) {
-                glide.load(iconUrl)
-                        .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
-                        .error(glide.load(R.drawable.subreddit_default_icon)
-                                .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
-                        .into(((SubredditViewHolder) viewHolder).iconGifImageView);
-            } else {
-                glide.load(R.drawable.subreddit_default_icon)
-                        .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
-                        .into(((SubredditViewHolder) viewHolder).iconGifImageView);
-            }
-            ((SubredditViewHolder) viewHolder).subredditNameTextView.setText(name);
-            if (fullname.contains("@")) {
-                ((SubredditViewHolder) viewHolder).communityInstanceTextView.setText("@" + fullname.split(Pattern.quote("@"), 2)[1]);
-                ((SubredditViewHolder) viewHolder).communityInstanceTextView.setTextColor(CustomThemeWrapper.darkenColor(primaryTextColor, 0.7f));
-            }
-        } else if (viewHolder instanceof FavoriteSubredditViewHolder) {
-            int offset;
-            if (itemClickListener != null) {
-                if (hasClearSelectionRow) {
-                    offset = 3;
-                } else {
-                    offset = 2;
-                }
-            } else {
-                offset = 1;
-            }
-            BlockedCommunityData communityData = mFavoriteBlockedCommunityData.get(viewHolder.getBindingAdapterPosition() - offset);
-            String name = mFavoriteBlockedCommunityData.get(viewHolder.getBindingAdapterPosition() - offset).getName();
-            String iconUrl = mFavoriteBlockedCommunityData.get(viewHolder.getBindingAdapterPosition() - offset).getIconUrl();
-
-            if (itemClickListener != null) {
-                viewHolder.itemView.setOnClickListener(view -> itemClickListener.onClick(communityData));
-            } else {
-                viewHolder.itemView.setOnClickListener(view -> {
-                    Intent intent = new Intent(mActivity, ViewSubredditDetailActivity.class);
-                    intent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, name);
-                    mActivity.startActivity(intent);
-                });
-            }
-
-            if (iconUrl != null && !iconUrl.equals("")) {
-                glide.load(iconUrl)
-                        .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
-                        .error(glide.load(R.drawable.subreddit_default_icon)
-                                .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
-                        .into(((FavoriteSubredditViewHolder) viewHolder).iconGifImageView);
-            } else {
-                glide.load(R.drawable.subreddit_default_icon)
-                        .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
-                        .into(((FavoriteSubredditViewHolder) viewHolder).iconGifImageView);
-            }
-            ((FavoriteSubredditViewHolder) viewHolder).subredditNameTextView.setText(name);
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        if (mBlockedCommunityData != null) {
-
-            if (itemClickListener != null) {
-                return mBlockedCommunityData.size() > 0 ? mBlockedCommunityData.size() + ((hasClearSelectionRow) ? 1 : 0) : 0;
-            }
-
-            return mBlockedCommunityData.size();
-        }
-        return 0;
-    }
-
-    @Override
-    public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
-        if (holder instanceof SubredditViewHolder) {
-            glide.clear(((SubredditViewHolder) holder).iconGifImageView);
-        } else if (holder instanceof FavoriteSubredditViewHolder) {
-            glide.clear(((FavoriteSubredditViewHolder) holder).iconGifImageView);
-        }
-    }
-
-    public void setSubscribedSubreddits(List<BlockedCommunityData> subscribedSubreddits) {
-        mBlockedCommunityData = subscribedSubreddits;
-        notifyDataSetChanged();
-    }
-
-    public void setFavoriteSubscribedSubreddits(List<BlockedCommunityData> favoriteBlockedCommunityData) {
-        mFavoriteBlockedCommunityData = favoriteBlockedCommunityData;
-        notifyDataSetChanged();
-    }
-
-    public void addUser(String username, String userIconUrl) {
-        this.username = username;
-        this.userIconUrl = userIconUrl;
-    }
-
-    @NonNull
-    @Override
-    public String getPopupText(int position) {
-        switch (getItemViewType(position)) {
-            case VIEW_TYPE_SUBREDDIT:
-                if (hasClearSelectionRow && position == 0) {
-                    return "";
-                } else if (itemClickListener != null && !hasClearSelectionRow && position == 0) {
-                    return "";
-                } else if (hasClearSelectionRow && position == 1) {
-                    return "";
-                } else {
-                    int offset;
-                    if (itemClickListener != null) {
-                        if (hasClearSelectionRow) {
-                            offset = (mFavoriteBlockedCommunityData != null && mFavoriteBlockedCommunityData.size() > 0) ?
-                                    mFavoriteBlockedCommunityData.size() + 4 : 0;
-                        } else {
-                            offset = (mFavoriteBlockedCommunityData != null && mFavoriteBlockedCommunityData.size() > 0) ?
-                                    mFavoriteBlockedCommunityData.size() + 3 : 0;
-                        }
-                    } else {
-                        offset = (mFavoriteBlockedCommunityData != null && mFavoriteBlockedCommunityData.size() > 0) ?
-                                mFavoriteBlockedCommunityData.size() + 2 : 0;
-                    }
-
-                    return mBlockedCommunityData.get(position - offset).getName().substring(0, 1).toUpperCase();
-                }
-            case VIEW_TYPE_FAVORITE_SUBREDDIT:
-                int offset;
-                if (itemClickListener != null) {
-                    if (hasClearSelectionRow) {
-                        offset = 3;
-                    } else {
-                        offset = 2;
-                    }
-                } else {
-                    offset = 1;
-                }
-                return mFavoriteBlockedCommunityData.get(position - offset).getName().substring(0, 1).toUpperCase();
-            default:
-                return "";
-        }
-    }
-
-    public interface ItemClickListener {
-        void onClick(BlockedCommunityData subredditData);
-    }
-
-    class SubredditViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.thing_icon_gif_image_view_item_subscribed_thing)
-        GifImageView iconGifImageView;
-        @BindView(R.id.thing_name_text_view_item_subscribed_thing)
-        TextView subredditNameTextView;
-
-        @BindView(R.id.thing_instance_text_view_item_subscribed_thing)
-        TextView communityInstanceTextView;
-
-        SubredditViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            if (mActivity.typeface != null) {
-                subredditNameTextView.setTypeface(mActivity.typeface);
-            }
-            subredditNameTextView.setTextColor(primaryTextColor);
-        }
-    }
-
-    class FavoriteSubredditViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.thing_icon_gif_image_view_item_subscribed_thing)
-        GifImageView iconGifImageView;
-        @BindView(R.id.thing_name_text_view_item_subscribed_thing)
-        TextView subredditNameTextView;
-
-        FavoriteSubredditViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            if (mActivity.typeface != null) {
-                subredditNameTextView.setTypeface(mActivity.typeface);
-            }
-            subredditNameTextView.setTextColor(primaryTextColor);
-        }
-    }
-
-    class FavoriteSubredditsDividerViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.divider_text_view_item_favorite_thing_divider)
-        TextView dividerTextView;
-
-        FavoriteSubredditsDividerViewHolder(@NonNull View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            if (mActivity.typeface != null) {
-                dividerTextView.setTypeface(mActivity.typeface);
-            }
-            dividerTextView.setText(R.string.favorites);
-            dividerTextView.setTextColor(secondaryTextColor);
-        }
-    }
-
-    class AllSubredditsDividerViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.divider_text_view_item_favorite_thing_divider)
-        TextView dividerTextView;
-
-        AllSubredditsDividerViewHolder(@NonNull View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            if (mActivity.typeface != null) {
-                dividerTextView.setTypeface(mActivity.typeface);
-            }
-            dividerTextView.setText(R.string.all);
-            dividerTextView.setTextColor(secondaryTextColor);
-        }
-    }
-}
-

app/src/main/java/eu/toldi/infinityforlemmy/adapters/BlockedInstancesRecyclerViewAdapter.java

@@ -1,279 +0,0 @@
-package eu.toldi.infinityforlemmy.adapters;
-
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.RequestManager;
-import com.bumptech.glide.request.RequestOptions;
-
-import java.util.List;
-import java.util.concurrent.Executor;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
-import eu.toldi.infinityforlemmy.activities.BaseActivity;
-import eu.toldi.infinityforlemmy.activities.InstanceInfoActivity;
-import eu.toldi.infinityforlemmy.blockedinstances.BlockedInstanceData;
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import me.zhanghai.android.fastscroll.PopupTextProvider;
-import pl.droidsonroids.gif.GifImageView;
-import retrofit2.Retrofit;
-
-public class BlockedInstancesRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements PopupTextProvider {
-    private static final int VIEW_TYPE_FAVORITE_SUBREDDIT_DIVIDER = 0;
-    private static final int VIEW_TYPE_FAVORITE_SUBREDDIT = 1;
-    private static final int VIEW_TYPE_SUBREDDIT_DIVIDER = 2;
-    private static final int VIEW_TYPE_SUBREDDIT = 3;
-
-    private BaseActivity mActivity;
-    private Executor mExecutor;
-    private Retrofit mOauthRetrofit;
-    private RedditDataRoomDatabase mRedditDataRoomDatabase;
-    private List<BlockedInstanceData> mBlockedInstanceData;
-    private List<BlockedInstanceData> mFavoriteBlockedInstanceData;
-    private RequestManager glide;
-    private ItemClickListener itemClickListener;
-
-    private String accessToken;
-    private String instancename;
-    private String instanceIconUrl;
-    private boolean hasClearSelectionRow;
-
-    private int primaryTextColor;
-    private int secondaryTextColor;
-
-    public BlockedInstancesRecyclerViewAdapter(BaseActivity activity, Executor executor, Retrofit oauthRetrofit,
-                                               RedditDataRoomDatabase redditDataRoomDatabase,
-                                               CustomThemeWrapper customThemeWrapper,
-                                               String accessToken) {
-        mActivity = activity;
-        mExecutor = executor;
-        glide = Glide.with(activity);
-        mOauthRetrofit = oauthRetrofit;
-        mRedditDataRoomDatabase = redditDataRoomDatabase;
-        this.accessToken = accessToken;
-        primaryTextColor = customThemeWrapper.getPrimaryTextColor();
-        secondaryTextColor = customThemeWrapper.getSecondaryTextColor();
-    }
-
-    public BlockedInstancesRecyclerViewAdapter(BaseActivity activity, Executor executor, Retrofit oauthRetrofit,
-                                               RedditDataRoomDatabase redditDataRoomDatabase,
-                                               CustomThemeWrapper customThemeWrapper,
-                                               String accessToken, boolean hasClearSelectionRow,
-                                               ItemClickListener itemClickListener) {
-        this(activity, executor, oauthRetrofit, redditDataRoomDatabase, customThemeWrapper, accessToken);
-        this.hasClearSelectionRow = hasClearSelectionRow;
-        this.itemClickListener = itemClickListener;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        if (mFavoriteBlockedInstanceData != null && mFavoriteBlockedInstanceData.size() > 0) {
-            if (itemClickListener != null && !hasClearSelectionRow) {
-                if (position == 0) {
-                    return VIEW_TYPE_SUBREDDIT;
-                } else if (position == 1) {
-                    return VIEW_TYPE_FAVORITE_SUBREDDIT_DIVIDER;
-                } else if (position == mFavoriteBlockedInstanceData.size() + 2) {
-                    return VIEW_TYPE_SUBREDDIT_DIVIDER;
-                } else if (position <= mFavoriteBlockedInstanceData.size() + 1) {
-                    return VIEW_TYPE_FAVORITE_SUBREDDIT;
-                } else {
-                    return VIEW_TYPE_SUBREDDIT;
-                }
-            } else if (hasClearSelectionRow) {
-                if (position == 0) {
-                    return VIEW_TYPE_SUBREDDIT;
-                } else if (position == 1) {
-                    return VIEW_TYPE_SUBREDDIT;
-                } else if (position == 2) {
-                    return VIEW_TYPE_FAVORITE_SUBREDDIT_DIVIDER;
-                } else if (position == mFavoriteBlockedInstanceData.size() + 3) {
-                    return VIEW_TYPE_SUBREDDIT_DIVIDER;
-                } else if (position <= mFavoriteBlockedInstanceData.size() + 2) {
-                    return VIEW_TYPE_FAVORITE_SUBREDDIT;
-                } else {
-                    return VIEW_TYPE_SUBREDDIT;
-                }
-            } else {
-                if (position == 0) {
-                    return VIEW_TYPE_FAVORITE_SUBREDDIT_DIVIDER;
-                } else if (position == mFavoriteBlockedInstanceData.size() + 1) {
-                    return VIEW_TYPE_SUBREDDIT_DIVIDER;
-                } else if (position <= mFavoriteBlockedInstanceData.size()) {
-                    return VIEW_TYPE_FAVORITE_SUBREDDIT;
-                } else {
-                    return VIEW_TYPE_SUBREDDIT;
-                }
-            }
-        } else {
-            return VIEW_TYPE_SUBREDDIT;
-        }
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-        return new InstanceViewHolder(LayoutInflater.from(viewGroup.getContext())
-                .inflate(R.layout.item_subscribed_thing, viewGroup, false));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder viewHolder, int i) {
-
-        String name;
-        String iconUrl;
-
-        if (hasClearSelectionRow && viewHolder.getBindingAdapterPosition() == 0) {
-            ((InstanceViewHolder) viewHolder).subredditNameTextView.setText(R.string.all_communities);
-            viewHolder.itemView.setOnClickListener(view -> itemClickListener.onClick(null));
-            return;
-        } else {
-            int offset = hasClearSelectionRow ? 1 : 0;
-            BlockedInstanceData instanceData = mBlockedInstanceData.get(viewHolder.getBindingAdapterPosition() - offset);
-            String domain = mBlockedInstanceData.get(viewHolder.getBindingAdapterPosition() - offset).getDomain();
-            String instanceName = mBlockedInstanceData.get(viewHolder.getBindingAdapterPosition() - offset).getName();
-            name = instanceName != null ? instanceName + " (" + domain + ")" : domain;
-            iconUrl = mBlockedInstanceData.get(viewHolder.getBindingAdapterPosition() - offset).getIcon();
-        }
-
-
-        ((InstanceViewHolder) viewHolder).itemView.setOnClickListener(view -> {
-            if (mBlockedInstanceData != null) {
-                BlockedInstanceData instanceData = mBlockedInstanceData.get(viewHolder.getBindingAdapterPosition());
-                Intent intent = new Intent(mActivity, InstanceInfoActivity.class);
-                intent.putExtra(InstanceInfoActivity.EXTRA_INSTANCE_DOMAIN, instanceData.getDomain());
-                intent.putExtra(InstanceInfoActivity.EXTRA_INSTANCE_ID, instanceData.getId());
-                mActivity.startActivity(intent);
-            }
-        });
-
-
-        if (iconUrl == null || iconUrl.equals("")) {
-            ((InstanceViewHolder) viewHolder).iconGifImageView.setVisibility(View.GONE);
-        } else {
-            ((InstanceViewHolder) viewHolder).iconGifImageView.setVisibility(View.VISIBLE);
-            glide.load(iconUrl)
-                    .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
-                    .error(glide.load(R.drawable.subreddit_default_icon)
-                            .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
-                    .into(((InstanceViewHolder) viewHolder).iconGifImageView);
-        }
-
-
-        ((InstanceViewHolder) viewHolder).subredditNameTextView.setText(name);
-
-
-    }
-
-    @Override
-    public int getItemCount() {
-        if (mBlockedInstanceData != null) {
-
-            if (itemClickListener != null) {
-                return mBlockedInstanceData.size() > 0 ? mBlockedInstanceData.size() + ((hasClearSelectionRow) ? 1 : 0) : 0;
-            }
-
-            return mBlockedInstanceData.size();
-        }
-        return 0;
-    }
-
-    @Override
-    public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
-        glide.clear(((InstanceViewHolder) holder).iconGifImageView);
-    }
-
-    public void blockedInstances(List<BlockedInstanceData> subscribedSubreddits) {
-        mBlockedInstanceData = subscribedSubreddits;
-        notifyDataSetChanged();
-    }
-
-    public void setFavoriteSubscribedSubreddits(List<BlockedInstanceData> favoriteBlockedInstanceData) {
-        mFavoriteBlockedInstanceData = favoriteBlockedInstanceData;
-        notifyDataSetChanged();
-    }
-
-    public void addInstance(String instancename, String instanceIconUrl) {
-        this.instancename = instancename;
-        this.instanceIconUrl = instanceIconUrl;
-    }
-
-    @NonNull
-    @Override
-    public String getPopupText(int position) {
-        switch (getItemViewType(position)) {
-            case VIEW_TYPE_SUBREDDIT:
-                if (hasClearSelectionRow && position == 0) {
-                    return "";
-                } else if (itemClickListener != null && !hasClearSelectionRow && position == 0) {
-                    return "";
-                } else if (hasClearSelectionRow && position == 1) {
-                    return "";
-                } else {
-                    int offset;
-                    if (itemClickListener != null) {
-                        if (hasClearSelectionRow) {
-                            offset = (mFavoriteBlockedInstanceData != null && mFavoriteBlockedInstanceData.size() > 0) ?
-                                    mFavoriteBlockedInstanceData.size() + 4 : 0;
-                        } else {
-                            offset = (mFavoriteBlockedInstanceData != null && mFavoriteBlockedInstanceData.size() > 0) ?
-                                    mFavoriteBlockedInstanceData.size() + 3 : 0;
-                        }
-                    } else {
-                        offset = (mFavoriteBlockedInstanceData != null && mFavoriteBlockedInstanceData.size() > 0) ?
-                                mFavoriteBlockedInstanceData.size() + 2 : 0;
-                    }
-
-                    return mBlockedInstanceData.get(position - offset).getDomain().substring(0, 1).toUpperCase();
-                }
-            case VIEW_TYPE_FAVORITE_SUBREDDIT:
-                int offset;
-                if (itemClickListener != null) {
-                    if (hasClearSelectionRow) {
-                        offset = 3;
-                    } else {
-                        offset = 2;
-                    }
-                } else {
-                    offset = 1;
-                }
-                return mFavoriteBlockedInstanceData.get(position - offset).getDomain().substring(0, 1).toUpperCase();
-            default:
-                return "";
-        }
-    }
-
-    public interface ItemClickListener {
-        void onClick(BlockedInstanceData subredditData);
-    }
-
-    class InstanceViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.thing_icon_gif_image_view_item_subscribed_thing)
-        GifImageView iconGifImageView;
-        @BindView(R.id.thing_name_text_view_item_subscribed_thing)
-        TextView subredditNameTextView;
-
-        @BindView(R.id.thing_instance_text_view_item_subscribed_thing)
-        TextView instanceInstanceTextView;
-
-        InstanceViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            if (mActivity.typeface != null) {
-                subredditNameTextView.setTypeface(mActivity.typeface);
-            }
-            subredditNameTextView.setTextColor(primaryTextColor);
-        }
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/adapters/BlockedUsersRecyclerViewAdapter.java

@@ -1,216 +0,0 @@
-package eu.toldi.infinityforlemmy.adapters;
-
-import android.content.Intent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.RequestManager;
-import com.bumptech.glide.request.RequestOptions;
-
-import java.util.List;
-import java.util.concurrent.Executor;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
-import eu.toldi.infinityforlemmy.activities.BaseActivity;
-import eu.toldi.infinityforlemmy.activities.ViewUserDetailActivity;
-import eu.toldi.infinityforlemmy.blockeduser.BlockedUserData;
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import me.zhanghai.android.fastscroll.PopupTextProvider;
-import pl.droidsonroids.gif.GifImageView;
-import retrofit2.Retrofit;
-
-public class BlockedUsersRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements PopupTextProvider {
-    private static final int VIEW_TYPE_FAVORITE_USER_DIVIDER = 0;
-    private static final int VIEW_TYPE_FAVORITE_USER = 1;
-    private static final int VIEW_TYPE_USER_DIVIDER = 2;
-    private static final int VIEW_TYPE_USER = 3;
-
-    private List<BlockedUserData> mBlockedUserData;
-    private List<BlockedUserData> mFavoriteBlockedUserData;
-    private BaseActivity mActivity;
-    private Executor mExecutor;
-    private Retrofit mOauthRetrofit;
-    private RedditDataRoomDatabase mRedditDataRoomDatabase;
-    private String mAccessToken;
-    private RequestManager glide;
-    private int mPrimaryTextColor;
-    private int mSecondaryTextColor;
-
-    public BlockedUsersRecyclerViewAdapter(BaseActivity activity, Executor executor, Retrofit oauthRetrofit,
-                                           RedditDataRoomDatabase redditDataRoomDatabase,
-                                           CustomThemeWrapper customThemeWrapper,
-                                           String accessToken) {
-        mActivity = activity;
-        mExecutor = executor;
-        mOauthRetrofit = oauthRetrofit;
-        mRedditDataRoomDatabase = redditDataRoomDatabase;
-        mAccessToken = accessToken;
-        glide = Glide.with(activity);
-        mPrimaryTextColor = customThemeWrapper.getPrimaryTextColor();
-        mSecondaryTextColor = customThemeWrapper.getSecondaryTextColor();
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        if (mFavoriteBlockedUserData != null && mFavoriteBlockedUserData.size() > 0) {
-            if (position == 0) {
-                return VIEW_TYPE_FAVORITE_USER_DIVIDER;
-            } else if (position == mFavoriteBlockedUserData.size() + 1) {
-                return VIEW_TYPE_USER_DIVIDER;
-            } else if (position <= mFavoriteBlockedUserData.size()) {
-                return VIEW_TYPE_FAVORITE_USER;
-            } else {
-                return VIEW_TYPE_USER;
-            }
-        } else {
-            return VIEW_TYPE_USER;
-        }
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-        switch (i) {
-            case VIEW_TYPE_FAVORITE_USER_DIVIDER:
-                return new FavoriteUsersDividerViewHolder(LayoutInflater.from(viewGroup.getContext())
-                        .inflate(R.layout.item_favorite_thing_divider, viewGroup, false));
-            case VIEW_TYPE_USER_DIVIDER:
-                return new AllUsersDividerViewHolder(LayoutInflater.from(viewGroup.getContext())
-                        .inflate(R.layout.item_favorite_thing_divider, viewGroup, false));
-            default:
-                return new UserViewHolder(LayoutInflater.from(viewGroup.getContext())
-                        .inflate(R.layout.item_subscribed_thing, viewGroup, false));
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder viewHolder, int i) {
-        if (viewHolder instanceof UserViewHolder) {
-            int offset = 0;
-
-            if (!mBlockedUserData.get(viewHolder.getBindingAdapterPosition() - offset).getAvatar().equals("")) {
-                glide.load(mBlockedUserData.get(viewHolder.getBindingAdapterPosition() - offset).getAvatar())
-                        .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
-                        .error(glide.load(R.drawable.subreddit_default_icon)
-                                .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
-                        .into(((UserViewHolder) viewHolder).iconGifImageView);
-            } else {
-                glide.load(R.drawable.subreddit_default_icon)
-                        .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
-                        .into(((UserViewHolder) viewHolder).iconGifImageView);
-            }
-            ((UserViewHolder) viewHolder).userNameTextView.setText(mBlockedUserData.get(viewHolder.getBindingAdapterPosition() - offset).getName());
-
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        if (mBlockedUserData != null && mBlockedUserData.size() > 0) {
-            return mBlockedUserData.size();
-        }
-        return 0;
-    }
-
-    @Override
-    public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
-        if (holder instanceof UserViewHolder) {
-            glide.clear(((UserViewHolder) holder).iconGifImageView);
-        }
-    }
-
-    public void setSubscribedUsers(List<BlockedUserData> subscribedUsers) {
-        mBlockedUserData = subscribedUsers;
-        notifyDataSetChanged();
-    }
-
-    public void setFavoriteSubscribedUsers(List<BlockedUserData> favoriteSubscribedUsers) {
-        mFavoriteBlockedUserData = favoriteSubscribedUsers;
-        notifyDataSetChanged();
-    }
-
-    @NonNull
-    @Override
-    public String getPopupText(int position) {
-        switch (getItemViewType(position)) {
-            case VIEW_TYPE_USER:
-                int offset = (mFavoriteBlockedUserData != null && mFavoriteBlockedUserData.size() > 0) ?
-                        mFavoriteBlockedUserData.size() + 2 : 0;
-                return mBlockedUserData.get(position - offset).getName().substring(0, 1).toUpperCase();
-            case VIEW_TYPE_FAVORITE_USER:
-                return mFavoriteBlockedUserData.get(position - 1).getName().substring(0, 1).toUpperCase();
-            default:
-                return "";
-        }
-    }
-
-
-    class UserViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.thing_icon_gif_image_view_item_subscribed_thing)
-        GifImageView iconGifImageView;
-        @BindView(R.id.thing_name_text_view_item_subscribed_thing)
-        TextView userNameTextView;
-
-        UserViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            if (mActivity.typeface != null) {
-                userNameTextView.setTypeface(mActivity.typeface);
-            }
-            userNameTextView.setTextColor(mPrimaryTextColor);
-
-            itemView.setOnClickListener(view -> {
-                int offset = (mFavoriteBlockedUserData != null && mFavoriteBlockedUserData.size() > 0) ?
-                        mFavoriteBlockedUserData.size() + 2 : 0;
-                int position = getBindingAdapterPosition() - offset;
-                if (position >= 0 && mBlockedUserData.size() > position) {
-                    Intent intent = new Intent(mActivity, ViewUserDetailActivity.class);
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, mBlockedUserData.get(position).getName());
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, mBlockedUserData.get(position).getQualifiedName());
-                    mActivity.startActivity(intent);
-                }
-            });
-
-        }
-    }
-
-    class FavoriteUsersDividerViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.divider_text_view_item_favorite_thing_divider)
-        TextView dividerTextView;
-
-        FavoriteUsersDividerViewHolder(@NonNull View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            if (mActivity.typeface != null) {
-                dividerTextView.setTypeface(mActivity.typeface);
-            }
-            dividerTextView.setText(R.string.favorites);
-            dividerTextView.setTextColor(mSecondaryTextColor);
-        }
-    }
-
-    class AllUsersDividerViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.divider_text_view_item_favorite_thing_divider)
-        TextView dividerTextView;
-
-        AllUsersDividerViewHolder(@NonNull View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            if (mActivity.typeface != null) {
-                dividerTextView.setTypeface(mActivity.typeface);
-            }
-            dividerTextView.setText(R.string.all);
-            dividerTextView.setTextColor(mSecondaryTextColor);
-        }
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/adapters/CommentFilterUsageEmbeddedRecyclerViewAdapter.java

@@ -1,76 +0,0 @@
-package eu.toldi.infinityforlemmy.adapters;
-
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.List;
-
-import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.activities.BaseActivity;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilterUsage;
-import eu.toldi.infinityforlemmy.databinding.ItemCommentFilterUsageEmbeddedBinding;
-
-
-public class CommentFilterUsageEmbeddedRecyclerViewAdapter extends RecyclerView.Adapter<CommentFilterUsageEmbeddedRecyclerViewAdapter.EntryViewHolder> {
-    private BaseActivity baseActivity;
-    private List<CommentFilterUsage> commentFilterUsageList;
-
-    public CommentFilterUsageEmbeddedRecyclerViewAdapter(BaseActivity baseActivity) {
-        this.baseActivity = baseActivity;
-    }
-
-    @NonNull
-    @Override
-    public EntryViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new EntryViewHolder(ItemCommentFilterUsageEmbeddedBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull EntryViewHolder holder, int position) {
-        if (commentFilterUsageList == null || commentFilterUsageList.isEmpty()) {
-            holder.textView.setText(R.string.comment_filter_applied_to_all_subreddits);
-        } else if (holder.getBindingAdapterPosition() > 4) {
-            holder.textView.setText(baseActivity.getString(R.string.comment_filter_usage_embedded_more_count, commentFilterUsageList.size() - 5));
-        } else {
-            CommentFilterUsage commentFilterUsage = commentFilterUsageList.get(holder.getBindingAdapterPosition());
-            switch (commentFilterUsage.usage) {
-                case CommentFilterUsage.SUBREDDIT_TYPE:
-                    holder.textView.setText("r/" + commentFilterUsage.nameOfUsage);
-                    break;
-            }
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return commentFilterUsageList == null || commentFilterUsageList.isEmpty() ? 1 : (commentFilterUsageList.size() > 5 ? 6 : commentFilterUsageList.size());
-    }
-
-    public void setCommentFilterUsageList(List<CommentFilterUsage> commentFilterUsageList) {
-        this.commentFilterUsageList = commentFilterUsageList;
-        notifyDataSetChanged();
-    }
-
-    class EntryViewHolder extends RecyclerView.ViewHolder {
-        TextView textView;
-
-        public EntryViewHolder(@NonNull ItemCommentFilterUsageEmbeddedBinding binding) {
-            super(binding.getRoot());
-            textView = binding.getRoot();
-            textView.setTextColor(baseActivity.customThemeWrapper.getSecondaryTextColor());
-
-            if (baseActivity.typeface != null) {
-                textView.setTypeface(baseActivity.typeface);
-            }
-
-            textView.setOnClickListener(view -> {
-                Toast.makeText(baseActivity, textView.getText(), Toast.LENGTH_SHORT).show();
-            });
-        }
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/adapters/CommentFilterUsageRecyclerViewAdapter.java

@@ -1,80 +0,0 @@
-package eu.toldi.infinityforlemmy.adapters;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.List;
-
-import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.activities.BaseActivity;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilterUsage;
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-
-
-public class CommentFilterUsageRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-    private List<CommentFilterUsage> commentFilterUsages;
-    private BaseActivity activity;
-    private CustomThemeWrapper customThemeWrapper;
-    private CommentFilterUsageRecyclerViewAdapter.OnItemClickListener onItemClickListener;
-
-    public interface OnItemClickListener {
-        void onClick(CommentFilterUsage commentFilterUsage);
-    }
-
-    public CommentFilterUsageRecyclerViewAdapter(BaseActivity activity, CustomThemeWrapper customThemeWrapper,
-                                                 CommentFilterUsageRecyclerViewAdapter.OnItemClickListener onItemClickListener) {
-        this.activity = activity;
-        this.customThemeWrapper = customThemeWrapper;
-        this.onItemClickListener = onItemClickListener;
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new CommentFilterUsageRecyclerViewAdapter.CommentFilterUsageViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_post_filter_usage, parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        CommentFilterUsage commentFilterUsage = commentFilterUsages.get(position);
-        switch (commentFilterUsage.usage) {
-            case CommentFilterUsage.SUBREDDIT_TYPE:
-                ((CommentFilterUsageRecyclerViewAdapter.CommentFilterUsageViewHolder) holder).usageTextView.setText(activity.getString(R.string.post_filter_usage_community, commentFilterUsage.nameOfUsage));
-                break;
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return commentFilterUsages == null ? 0 : commentFilterUsages.size();
-    }
-
-    public void setCommentFilterUsages(List<CommentFilterUsage> commentFilterUsages) {
-        this.commentFilterUsages = commentFilterUsages;
-        notifyDataSetChanged();
-    }
-
-    private class CommentFilterUsageViewHolder extends RecyclerView.ViewHolder {
-        TextView usageTextView;
-
-        public CommentFilterUsageViewHolder(@NonNull View itemView) {
-            super(itemView);
-            usageTextView = (TextView) itemView;
-
-            usageTextView.setTextColor(customThemeWrapper.getPrimaryTextColor());
-
-            if (activity.typeface != null) {
-                usageTextView.setTypeface(activity.typeface);
-            }
-
-            usageTextView.setOnClickListener(view -> {
-                onItemClickListener.onClick(commentFilterUsages.get(getBindingAdapterPosition()));
-            });
-        }
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/adapters/CommentFilterWithUsageRecyclerViewAdapter.java

@@ -1,81 +0,0 @@
-package eu.toldi.infinityforlemmy.adapters;
-
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.List;
-
-import eu.toldi.infinityforlemmy.activities.BaseActivity;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilter;
-import eu.toldi.infinityforlemmy.commentfilter.CommentFilterWithUsage;
-import eu.toldi.infinityforlemmy.customviews.LinearLayoutManagerBugFixed;
-import eu.toldi.infinityforlemmy.databinding.ItemCommentFilterWithUsageBinding;
-
-
-public class CommentFilterWithUsageRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-    private BaseActivity activity;
-    private final OnItemClickListener onItemClickListener;
-    private List<CommentFilterWithUsage> commentFilterWithUsageList;
-    private RecyclerView.RecycledViewPool recycledViewPool;
-
-    public interface OnItemClickListener {
-        void onItemClick(CommentFilter commentFilter);
-    }
-
-    public CommentFilterWithUsageRecyclerViewAdapter(BaseActivity activity, OnItemClickListener onItemClickListener) {
-        this.activity = activity;
-        this.recycledViewPool = new RecyclerView.RecycledViewPool();
-        this.onItemClickListener = onItemClickListener;
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new CommentFilterViewHolder(ItemCommentFilterWithUsageBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        if (holder instanceof CommentFilterViewHolder) {
-            ((CommentFilterViewHolder) holder).binding.commentFilterNameTextViewItemCommentFilter.setText(commentFilterWithUsageList.get(position).commentFilter.name);
-            ((CommentFilterViewHolder) holder).adapter.setCommentFilterUsageList(commentFilterWithUsageList.get(position).commentFilterUsageList);
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return commentFilterWithUsageList == null ? 0 : commentFilterWithUsageList.size();
-    }
-
-    public void setCommentFilterWithUsageList(List<CommentFilterWithUsage> commentFilterWithUsageList) {
-        this.commentFilterWithUsageList = commentFilterWithUsageList;
-        notifyDataSetChanged();
-    }
-
-    private class CommentFilterViewHolder extends RecyclerView.ViewHolder {
-        ItemCommentFilterWithUsageBinding binding;
-        CommentFilterUsageEmbeddedRecyclerViewAdapter adapter;
-
-        public CommentFilterViewHolder(@NonNull ItemCommentFilterWithUsageBinding binding) {
-            super(binding.getRoot());
-            this.binding = binding;
-            binding.commentFilterNameTextViewItemCommentFilter.setTextColor(activity.customThemeWrapper.getPrimaryTextColor());
-
-            if (activity.typeface != null) {
-                binding.commentFilterNameTextViewItemCommentFilter.setTypeface(activity.typeface);
-            }
-
-            binding.getRoot().setOnClickListener(view -> {
-                onItemClickListener.onItemClick(commentFilterWithUsageList.get(getBindingAdapterPosition()).commentFilter);
-            });
-
-            binding.commentFilterUsageRecyclerViewItemCommentFilter.setRecycledViewPool(recycledViewPool);
-            binding.commentFilterUsageRecyclerViewItemCommentFilter.setLayoutManager(new LinearLayoutManagerBugFixed(activity));
-            adapter = new CommentFilterUsageEmbeddedRecyclerViewAdapter(activity);
-            binding.commentFilterUsageRecyclerViewItemCommentFilter.setAdapter(adapter);
-        }
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/adapters/CommentsListingRecyclerViewAdapter.java

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.Spanned;
@@ -11,6 +12,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -24,9 +26,6 @@ import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.bumptech.glide.Glide;
-import com.google.android.material.button.MaterialButton;
-
 import java.util.Locale;
 
 import butterknife.BindView;
@@ -50,7 +49,6 @@ import eu.toldi.infinityforlemmy.customviews.LinearLayoutManagerBugFixed;
 import eu.toldi.infinityforlemmy.customviews.SpoilerOnClickTextView;
 import eu.toldi.infinityforlemmy.customviews.SwipeLockInterface;
 import eu.toldi.infinityforlemmy.customviews.SwipeLockLinearLayoutManager;
-import eu.toldi.infinityforlemmy.databinding.ItemCommentBinding;
 import eu.toldi.infinityforlemmy.markdown.MarkdownUtils;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
@@ -171,7 +169,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
             return true;
         };
         mMarkwon = MarkdownUtils.createFullRedditMarkwon(mActivity,
-                miscPlugin, mCommentColor, commentSpoilerBackgroundColor, Glide.with(mActivity.getApplication()), onLinkLongClickListener, sharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_IMAGE_PREVIEW, false));
+                miscPlugin, mCommentColor, commentSpoilerBackgroundColor, onLinkLongClickListener);
         recycledViewPool = new RecyclerView.RecycledViewPool();
     }
 
@@ -179,7 +177,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         if (viewType == VIEW_TYPE_DATA) {
-            return new CommentViewHolder(ItemCommentBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
+            return new CommentViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_comment, parent, false));
         } else if (viewType == VIEW_TYPE_ERROR) {
             return new ErrorViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_footer_error, parent, false));
         } else {
@@ -189,24 +187,24 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        if (holder instanceof CommentBaseViewHolder) {
+        if (holder instanceof CommentViewHolder) {
             Comment comment = getItem(holder.getBindingAdapterPosition());
             if (comment != null) {
                 String name = comment.getCommunityQualifiedName();
-                ((CommentBaseViewHolder) holder).authorTextView.setText(name);
-                ((CommentBaseViewHolder) holder).authorTextView.setTextColor(mSubredditColor);
+                ((CommentViewHolder) holder).authorTextView.setText(name);
+                ((CommentViewHolder) holder).authorTextView.setTextColor(mSubredditColor);
 
 
                 if (mShowElapsedTime) {
-                    ((CommentBaseViewHolder) holder).commentTimeTextView.setText(
+                    ((CommentViewHolder) holder).commentTimeTextView.setText(
                             Utils.getElapsedTime(mActivity, comment.getCommentTimeMillis()));
                 } else {
-                    ((CommentBaseViewHolder) holder).commentTimeTextView.setText(Utils.getFormattedTime(mLocale, comment.getCommentTimeMillis(), mTimeFormatPattern));
+                    ((CommentViewHolder) holder).commentTimeTextView.setText(Utils.getFormattedTime(mLocale, comment.getCommentTimeMillis(), mTimeFormatPattern));
                 }
 
                 ((CommentViewHolder) holder).markwonAdapter.setMarkdown(mMarkwon, comment.getCommentMarkdown());
                 // noinspection NotifyDataSetChanged
-                ((CommentBaseViewHolder) holder).markwonAdapter.notifyDataSetChanged();
+                ((CommentViewHolder) holder).markwonAdapter.notifyDataSetChanged();
 
                 String commentText = Utils.getNVotes(mShowAbsoluteNumberOfVotes,
                         comment.getScore() + comment.getVoteType());
@@ -215,21 +213,21 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
 
                 switch (comment.getVoteType()) {
                     case Comment.VOTE_TYPE_UPVOTE:
-                        ((CommentBaseViewHolder) holder).upvoteButton.setIconResource(R.drawable.ic_upvote_filled_24dp);
-                        ((CommentBaseViewHolder) holder).upvoteButton.setIconTint(ColorStateList.valueOf(mUpvotedColor));
-                        ((CommentBaseViewHolder) holder).scoreTextView.setTextColor(mUpvotedColor);
+                        ((CommentViewHolder) holder).upvoteButton
+                                .setColorFilter(mUpvotedColor, PorterDuff.Mode.SRC_IN);
+                        ((CommentViewHolder) holder).scoreTextView.setTextColor(mUpvotedColor);
                         break;
                     case Comment.VOTE_TYPE_DOWNVOTE:
-                        ((CommentBaseViewHolder) holder).downvoteButton.setIconResource(R.drawable.ic_downvote_filled_24dp);
-                        ((CommentBaseViewHolder) holder).downvoteButton.setIconTint(ColorStateList.valueOf(mDownvotedColor));
-                        ((CommentBaseViewHolder) holder).scoreTextView.setTextColor(mDownvotedColor);
+                        ((CommentViewHolder) holder).downvoteButton
+                                .setColorFilter(mDownvotedColor, PorterDuff.Mode.SRC_IN);
+                        ((CommentViewHolder) holder).scoreTextView.setTextColor(mDownvotedColor);
                         break;
                 }
 
                 if (comment.isSaved()) {
-                    ((CommentBaseViewHolder) holder).saveButton.setIconResource(R.drawable.ic_bookmark_grey_24dp);
+                    ((CommentViewHolder) holder).saveButton.setImageResource(R.drawable.ic_bookmark_grey_24dp);
                 } else {
-                    ((CommentBaseViewHolder) holder).saveButton.setIconResource(R.drawable.ic_bookmark_border_grey_24dp);
+                    ((CommentViewHolder) holder).saveButton.setImageResource(R.drawable.ic_bookmark_border_grey_24dp);
                 }
             }
         }
@@ -251,16 +249,14 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
 
     @Override
     public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
-        if (holder instanceof CommentBaseViewHolder) {
-            ((CommentBaseViewHolder) holder).authorFlairTextView.setText("");
-            ((CommentBaseViewHolder) holder).authorFlairTextView.setVisibility(View.GONE);
-            ((CommentBaseViewHolder) holder).awardsTextView.setText("");
-            ((CommentBaseViewHolder) holder).awardsTextView.setVisibility(View.GONE);
-            ((CommentBaseViewHolder) holder).upvoteButton.setIconResource(R.drawable.ic_upvote_24dp);
-            ((CommentBaseViewHolder) holder).upvoteButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
-            ((CommentBaseViewHolder) holder).scoreTextView.setTextColor(mCommentIconAndInfoColor);
-            ((CommentBaseViewHolder) holder).downvoteButton.setIconResource(R.drawable.ic_downvote_24dp);
-            ((CommentBaseViewHolder) holder).downvoteButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
+        if (holder instanceof CommentViewHolder) {
+            ((CommentViewHolder) holder).authorFlairTextView.setText("");
+            ((CommentViewHolder) holder).authorFlairTextView.setVisibility(View.GONE);
+            ((CommentViewHolder) holder).awardsTextView.setText("");
+            ((CommentViewHolder) holder).awardsTextView.setVisibility(View.GONE);
+            ((CommentViewHolder) holder).upvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
+            ((CommentViewHolder) holder).downvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
+            ((CommentViewHolder) holder).scoreTextView.setTextColor(mCommentIconAndInfoColor);
         }
     }
 
@@ -293,18 +289,18 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
     }
 
     public void onItemSwipe(RecyclerView.ViewHolder viewHolder, int direction, int swipeLeftAction, int swipeRightAction) {
-        if (viewHolder instanceof CommentBaseViewHolder) {
+        if (viewHolder instanceof CommentViewHolder) {
             if (direction == ItemTouchHelper.LEFT || direction == ItemTouchHelper.START) {
                 if (swipeLeftAction == SharedPreferencesUtils.SWIPE_ACITON_UPVOTE) {
-                    ((CommentBaseViewHolder) viewHolder).upvoteButton.performClick();
+                    ((CommentViewHolder) viewHolder).upvoteButton.performClick();
                 } else if (swipeLeftAction == SharedPreferencesUtils.SWIPE_ACITON_DOWNVOTE) {
-                    ((CommentBaseViewHolder) viewHolder).downvoteButton.performClick();
+                    ((CommentViewHolder) viewHolder).downvoteButton.performClick();
                 }
             } else {
                 if (swipeRightAction == SharedPreferencesUtils.SWIPE_ACITON_UPVOTE) {
-                    ((CommentBaseViewHolder) viewHolder).upvoteButton.performClick();
+                    ((CommentViewHolder) viewHolder).upvoteButton.performClick();
                 } else if (swipeRightAction == SharedPreferencesUtils.SWIPE_ACITON_DOWNVOTE) {
-                    ((CommentBaseViewHolder) viewHolder).downvoteButton.performClick();
+                    ((CommentViewHolder) viewHolder).downvoteButton.performClick();
                 }
             }
         }
@@ -322,60 +318,46 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
         void retryLoadingMore();
     }
 
-    public class CommentBaseViewHolder extends RecyclerView.ViewHolder {
+    public class CommentViewHolder extends RecyclerView.ViewHolder {
+        @BindView(R.id.vertical_block_indentation_item_comment)
+        CommentIndentationView commentIndentationView;
+        @BindView(R.id.linear_layout_item_comment)
         LinearLayout linearLayout;
+        @BindView(R.id.author_text_view_item_post_comment)
         TextView authorTextView;
+        @BindView(R.id.author_flair_text_view_item_post_comment)
         TextView authorFlairTextView;
+        @BindView(R.id.comment_time_text_view_item_post_comment)
         TextView commentTimeTextView;
+        @BindView(R.id.awards_text_view_item_comment)
         TextView awardsTextView;
+        @BindView(R.id.comment_markdown_view_item_post_comment)
         RecyclerView commentMarkdownView;
+        @BindView(R.id.bottom_constraint_layout_item_post_comment)
         ConstraintLayout bottomConstraintLayout;
-        MaterialButton upvoteButton;
+        @BindView(R.id.up_vote_button_item_post_comment)
+        ImageView upvoteButton;
+        @BindView(R.id.score_text_view_item_post_comment)
         TextView scoreTextView;
-        MaterialButton downvoteButton;
+        @BindView(R.id.down_vote_button_item_post_comment)
+        ImageView downvoteButton;
+        @BindView(R.id.placeholder_item_post_comment)
         View placeholder;
-        MaterialButton moreButton;
-        MaterialButton saveButton;
-        MaterialButton replyButton;
+        @BindView(R.id.more_button_item_post_comment)
+        ImageView moreButton;
+        @BindView(R.id.save_button_item_post_comment)
+        ImageView saveButton;
+        @BindView(R.id.expand_button_item_post_comment)
+        TextView expandButton;
+        @BindView(R.id.reply_button_item_post_comment)
+        ImageView replyButton;
+        @BindView(R.id.divider_item_comment)
         View commentDivider;
         CustomMarkwonAdapter markwonAdapter;
 
-        CommentBaseViewHolder(@NonNull View itemView) {
+        CommentViewHolder(View itemView) {
             super(itemView);
-        }
-
-        void setBaseView(LinearLayout linearLayout,
-                         TextView authorTextView,
-                         TextView authorFlairTextView,
-                         TextView commentTimeTextView,
-                         TextView awardsTextView,
-                         RecyclerView commentMarkdownView,
-                         ConstraintLayout bottomConstraintLayout,
-                         MaterialButton upvoteButton,
-                         TextView scoreTextView,
-                         MaterialButton downvoteButton,
-                         View placeholder,
-                         MaterialButton moreButton,
-                         MaterialButton saveButton,
-                         TextView expandButton,
-                         MaterialButton replyButton,
-                         CommentIndentationView commentIndentationView,
-                         View commentDivider) {
-            this.linearLayout = linearLayout;
-            this.authorTextView = authorTextView;
-            this.authorFlairTextView = authorFlairTextView;
-            this.commentTimeTextView = commentTimeTextView;
-            this.awardsTextView = awardsTextView;
-            this.commentMarkdownView = commentMarkdownView;
-            this.bottomConstraintLayout = bottomConstraintLayout;
-            this.upvoteButton = upvoteButton;
-            this.scoreTextView = scoreTextView;
-            this.downvoteButton = downvoteButton;
-            this.placeholder = placeholder;
-            this.moreButton = moreButton;
-            this.saveButton = saveButton;
-            this.replyButton = replyButton;
-            this.commentDivider = commentDivider;
+            ButterKnife.bind(this, itemView);
 
             replyButton.setVisibility(View.GONE);
 
@@ -431,19 +413,19 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
                 authorFlairTextView.setTypeface(mActivity.typeface);
                 commentTimeTextView.setTypeface(mActivity.typeface);
                 awardsTextView.setTypeface(mActivity.typeface);
-                upvoteButton.setTypeface(mActivity.typeface);
+                scoreTextView.setTypeface(mActivity.typeface);
             }
             itemView.setBackgroundColor(mCommentBackgroundColor);
             authorTextView.setTextColor(mUsernameColor);
             authorFlairTextView.setTextColor(mAuthorFlairColor);
             commentTimeTextView.setTextColor(mSecondaryTextColor);
             awardsTextView.setTextColor(mSecondaryTextColor);
-            upvoteButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
+            upvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
             scoreTextView.setTextColor(mCommentIconAndInfoColor);
-            downvoteButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
-            moreButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
-            saveButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
-            replyButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
+            downvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
+            moreButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
+            saveButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
+            replyButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
             commentDivider.setBackgroundColor(mDividerColor);
 
             authorTextView.setOnClickListener(view -> {
@@ -468,7 +450,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
                 Comment comment = getItem(getBindingAdapterPosition());
                 if (comment != null) {
                     Bundle bundle = new Bundle();
-                    if (comment.getAuthorName().equals(mAccountName)) {
+                    if (comment.getAuthor().equals(mAccountName)) {
                         bundle.putBoolean(CommentMoreBottomSheetFragment.EXTRA_EDIT_AND_DELETE_AVAILABLE, true);
                     }
                     bundle.putString(CommentMoreBottomSheetFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
@@ -490,7 +472,6 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
                     Intent intent = new Intent(mActivity, ViewPostDetailActivity.class);
                     intent.putExtra(ViewPostDetailActivity.EXTRA_POST_ID, comment.getPostId());
                     intent.putExtra(ViewPostDetailActivity.EXTRA_SINGLE_COMMENT_ID, comment.getId());
-                    intent.putExtra(ViewPostDetailActivity.EXTRA_SINGLE_COMMENT_PARENT_ID, comment.getParentId());
                     mActivity.startActivity(intent);
                 }
             });
@@ -535,22 +516,20 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
                     int previousVoteType = comment.getVoteType();
                     int newVoteType;
 
-                    downvoteButton.setIconResource(R.drawable.ic_downvote_24dp);
-                    downvoteButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
+                    downvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
 
                     if (previousVoteType != Comment.VOTE_TYPE_UPVOTE) {
                         //Not upvoted before
                         comment.setVoteType(Comment.VOTE_TYPE_UPVOTE);
                         newVoteType = Integer.parseInt(APIUtils.DIR_UPVOTE);
-                        upvoteButton.setIconResource(R.drawable.ic_upvote_filled_24dp);
-                        upvoteButton.setIconTint(ColorStateList.valueOf(mUpvotedColor));
+                        upvoteButton
+                                .setColorFilter(mUpvotedColor, PorterDuff.Mode.SRC_IN);
                         scoreTextView.setTextColor(mUpvotedColor);
                     } else {
                         //Upvoted before
                         comment.setVoteType(Comment.VOTE_TYPE_NO_VOTE);
                         newVoteType = Integer.parseInt(APIUtils.DIR_UNVOTE);
-                        upvoteButton.setIconResource(R.drawable.ic_upvote_24dp);
-                        upvoteButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
+                        upvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                         scoreTextView.setTextColor(mCommentIconAndInfoColor);
                     }
 
@@ -559,32 +538,30 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
                             comment.getScore() + comment.getVoteType()));
 
 
-                    VoteThing.voteComment(mActivity, retrofit, mAccessToken, new VoteThing.VoteThingListener() {
+                    VoteThing.votePost(mActivity, retrofit, mAccessToken, new VoteThing.VoteThingListener() {
                         @Override
                         public void onVoteThingSuccess(int position1) {
                             int currentPosition = getBindingAdapterPosition();
                             if (newVoteType == Integer.parseInt(APIUtils.DIR_UPVOTE)) {
                                 comment.setVoteType(Comment.VOTE_TYPE_UPVOTE);
                                 if (currentPosition == position) {
-                                    upvoteButton.setIconResource(R.drawable.ic_upvote_filled_24dp);
-                                    upvoteButton.setIconTint(ColorStateList.valueOf(mUpvotedColor));
+                                    upvoteButton.setColorFilter(mUpvotedColor, PorterDuff.Mode.SRC_IN);
                                     scoreTextView.setTextColor(mUpvotedColor);
                                 }
                             } else {
                                 comment.setVoteType(Comment.VOTE_TYPE_NO_VOTE);
                                 if (currentPosition == position) {
-                                    upvoteButton.setIconResource(R.drawable.ic_upvote_24dp);
-                                    upvoteButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
+                                    upvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                                     scoreTextView.setTextColor(mCommentIconAndInfoColor);
                                 }
                             }
 
                             if (currentPosition == position) {
-                                downvoteButton.setIconResource(R.drawable.ic_downvote_24dp);
-                                downvoteButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
+                                downvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
 
                                 scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
                                         comment.getScore() + comment.getVoteType()));
+
                             }
                         }
 
@@ -595,10 +572,6 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
                 }
             });
 
-            scoreTextView.setOnClickListener(view -> {
-                upvoteButton.performClick();
-            });
-
             downvoteButton.setOnClickListener(view -> {
                 if (mAccessToken == null) {
                     Toast.makeText(mActivity, R.string.login_first, Toast.LENGTH_SHORT).show();
@@ -614,22 +587,19 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
                     int previousVoteType = comment.getVoteType();
                     int newVoteType;
 
-                    upvoteButton.setIconResource(R.drawable.ic_upvote_24dp);
-                    upvoteButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
+                    upvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
 
                     if (previousVoteType != Comment.VOTE_TYPE_DOWNVOTE) {
                         //Not downvoted before
                         comment.setVoteType(Comment.VOTE_TYPE_DOWNVOTE);
                         newVoteType = Integer.parseInt(APIUtils.DIR_DOWNVOTE);
-                        downvoteButton.setIconResource(R.drawable.ic_downvote_filled_24dp);
-                        downvoteButton.setIconTint(ColorStateList.valueOf(mDownvotedColor));
+                        downvoteButton.setColorFilter(mDownvotedColor, PorterDuff.Mode.SRC_IN);
                         scoreTextView.setTextColor(mDownvotedColor);
                     } else {
                         //Downvoted before
                         comment.setVoteType(Comment.VOTE_TYPE_NO_VOTE);
                         newVoteType = Integer.parseInt(APIUtils.DIR_UNVOTE);
-                        downvoteButton.setIconResource(R.drawable.ic_downvote_24dp);
-                        downvoteButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
+                        downvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                         scoreTextView.setTextColor(mCommentIconAndInfoColor);
                     }
 
@@ -638,31 +608,29 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
                             comment.getScore() + comment.getVoteType()));
 
 
-                    VoteThing.voteComment(mActivity, retrofit, mAccessToken, new VoteThing.VoteThingListener() {
+                    VoteThing.votePost(mActivity, retrofit, mAccessToken, new VoteThing.VoteThingListener() {
                         @Override
                         public void onVoteThingSuccess(int position1) {
                             int currentPosition = getBindingAdapterPosition();
                             if (newVoteType == Integer.parseInt(APIUtils.DIR_DOWNVOTE)) {
                                 comment.setVoteType(Comment.VOTE_TYPE_DOWNVOTE);
                                 if (currentPosition == position) {
-                                    downvoteButton.setIconResource(R.drawable.ic_downvote_filled_24dp);
-                                    downvoteButton.setIconTint(ColorStateList.valueOf(mDownvotedColor));
+                                    downvoteButton.setColorFilter(mDownvotedColor, PorterDuff.Mode.SRC_IN);
                                     scoreTextView.setTextColor(mDownvotedColor);
                                 }
                             } else {
                                 comment.setVoteType(Comment.VOTE_TYPE_NO_VOTE);
                                 if (currentPosition == position) {
-                                    downvoteButton.setIconResource(R.drawable.ic_downvote_24dp);
-                                    downvoteButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
+                                    downvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                                     scoreTextView.setTextColor(mCommentIconAndInfoColor);
                                 }
                             }
 
                             if (currentPosition == position) {
-                                upvoteButton.setIconResource(R.drawable.ic_upvote_24dp);
-                                upvoteButton.setIconTint(ColorStateList.valueOf(mCommentIconAndInfoColor));
+                                upvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                                 scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
                                         comment.getScore() + comment.getVoteType()));
+
                             }
                         }
 
@@ -688,7 +656,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
                             public void success() {
                                 comment.setSaved(false);
                                 if (getBindingAdapterPosition() == position) {
-                                    saveButton.setIconResource(R.drawable.ic_bookmark_border_grey_24dp);
+                                    saveButton.setImageResource(R.drawable.ic_bookmark_border_grey_24dp);
                                 }
                                 Toast.makeText(mActivity, R.string.comment_unsaved_success, Toast.LENGTH_SHORT).show();
                             }
@@ -697,7 +665,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
                             public void failed() {
                                 comment.setSaved(true);
                                 if (getBindingAdapterPosition() == position) {
-                                    saveButton.setIconResource(R.drawable.ic_bookmark_grey_24dp);
+                                    saveButton.setImageResource(R.drawable.ic_bookmark_grey_24dp);
                                 }
                                 Toast.makeText(mActivity, R.string.comment_unsaved_failed, Toast.LENGTH_SHORT).show();
                             }
@@ -709,7 +677,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
                             public void success() {
                                 comment.setSaved(true);
                                 if (getBindingAdapterPosition() == position) {
-                                    saveButton.setIconResource(R.drawable.ic_bookmark_grey_24dp);
+                                    saveButton.setImageResource(R.drawable.ic_bookmark_grey_24dp);
                                 }
                                 Toast.makeText(mActivity, R.string.comment_saved_success, Toast.LENGTH_SHORT).show();
                             }
@@ -718,7 +686,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
                             public void failed() {
                                 comment.setSaved(false);
                                 if (getBindingAdapterPosition() == position) {
-                                    saveButton.setIconResource(R.drawable.ic_bookmark_border_grey_24dp);
+                                    saveButton.setImageResource(R.drawable.ic_bookmark_border_grey_24dp);
                                 }
                                 Toast.makeText(mActivity, R.string.comment_saved_failed, Toast.LENGTH_SHORT).show();
                             }
@@ -729,32 +697,6 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
         }
     }
 
-    class CommentViewHolder extends CommentBaseViewHolder {
-        ItemCommentBinding binding;
-
-        CommentViewHolder(ItemCommentBinding binding) {
-            super(binding.getRoot());
-            this.binding = binding;
-            setBaseView(binding.linearLayoutItemComment,
-                    binding.authorTextViewItemPostComment,
-                    binding.authorFlairTextViewItemPostComment,
-                    binding.commentTimeTextViewItemPostComment,
-                    binding.awardsTextViewItemComment,
-                    binding.commentMarkdownViewItemPostComment,
-                    binding.bottomConstraintLayoutItemPostComment,
-                    binding.upvoteButtonItemPostComment,
-                    binding.scoreTextViewItemPostComment,
-                    binding.downvoteButtonItemPostComment,
-                    binding.placeholderItemPostComment,
-                    binding.moreButtonItemPostComment,
-                    binding.saveButtonItemPostComment,
-                    binding.expandButtonItemPostComment,
-                    binding.replyButtonItemPostComment,
-                    binding.verticalBlockIndentationItemComment,
-                    binding.dividerItemComment);
-        }
-    }
-
     class ErrorViewHolder extends RecyclerView.ViewHolder {
         @BindView(R.id.error_text_view_item_footer_error)
         TextView errorTextView;

app/src/main/java/eu/toldi/infinityforlemmy/adapters/CustomArrayAdapter.java

@@ -1,41 +0,0 @@
-package eu.toldi.infinityforlemmy.adapters;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-
-import java.util.List;
-
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-
-public class CustomArrayAdapter extends ArrayAdapter<String> {
-
-    CustomThemeWrapper customThemeWrapper;
-
-    public CustomArrayAdapter(@NonNull Context context, int textViewResourceId, @NonNull List<String> objects, CustomThemeWrapper customThemeWrapper) {
-        super(context, textViewResourceId, objects);
-        this.customThemeWrapper = customThemeWrapper;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        TextView itemView = (TextView) super.getView(position, convertView, parent);
-        itemView.setTextColor(customThemeWrapper.getPrimaryTextColor()); // Set the text color
-        itemView.setBackgroundColor(customThemeWrapper.getBackgroundColor()); // Set the background color
-        // Apply any other styling as needed
-        return itemView;
-    }
-
-    @Override
-    public View getDropDownView(int position, View convertView, ViewGroup parent) {
-        TextView itemView = (TextView) super.getDropDownView(position, convertView, parent);
-        itemView.setTextColor(customThemeWrapper.getPrimaryTextColor()); // Set the text color
-        itemView.setBackgroundColor(customThemeWrapper.getBackgroundColor()); // Set the background color
-        // Apply any other styling as needed
-        return itemView;
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/adapters/MessageRecyclerViewAdapter.java

@@ -156,7 +156,7 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<CommentInteract
             CommentInteraction message = getItem(holder.getBindingAdapterPosition());
             if (message != null) {
 
-                if (!message.isRead()) {
+                if (message.isRead()) {
                     if (markAllMessagesAsRead) {
                         message.markAsRead();
                     } else {
@@ -182,9 +182,6 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<CommentInteract
 
                         intent.putExtra(ViewPostDetailActivity.EXTRA_POST_ID, message.getComment().getPostId());
                         intent.putExtra(ViewPostDetailActivity.EXTRA_SINGLE_COMMENT_ID, message.getComment().getId());
-                        if(message.getComment().getDepth() > 0) {
-                            intent.putExtra(ViewPostDetailActivity.EXTRA_SINGLE_COMMENT_PARENT_ID, message.getComment().getParentId());
-                        }
                         mActivity.startActivity(intent);
                     } else if (mMessageType == FetchMessage.MESSAGE_TYPE_PRIVATE_MESSAGE) {
                         Intent intent = new Intent(mActivity, ViewPrivateMessagesActivity.class);
@@ -193,7 +190,7 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<CommentInteract
                         mActivity.startActivity(intent);
                     }
 
-                    if (!message.isRead()) {
+                    if (message.isRead()) {
                         holder.itemView.setBackgroundColor(mMessageBackgroundColor);
 
 
@@ -217,8 +214,8 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<CommentInteract
                 ((DataViewHolder) holder).authorTextView.setOnClickListener(view -> {
 
                     Intent intent = new Intent(mActivity, ViewUserDetailActivity.class);
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, message.getComment().getAuthorName());
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, message.getComment().getAuthorQualifiedName());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, message.getComment().getAuthor());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, message.getComment().getCommunityQualifiedName());
                     mActivity.startActivity(intent);
                 });
             }

app/src/main/java/eu/toldi/infinityforlemmy/adapters/ModeratorRecyclerViewAdapter.java

@@ -1,20 +0,0 @@
-package eu.toldi.infinityforlemmy.adapters;
-
-import eu.toldi.infinityforlemmy.activities.BaseActivity;
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import eu.toldi.infinityforlemmy.user.BasicUserRecyclerViewAdapter;
-
-public class ModeratorRecyclerViewAdapter extends BasicUserRecyclerViewAdapter {
-
-    private final int mModeratorColor;
-
-    public ModeratorRecyclerViewAdapter(BaseActivity activity, CustomThemeWrapper customThemeWrapper) {
-        super(activity, customThemeWrapper);
-        mModeratorColor = customThemeWrapper.getModerator();
-    }
-
-    @Override
-    protected int getUserNameTextColor() {
-        return mModeratorColor;
-    }
-}

app/src/main/java/eu/toldi/infinityforlemmy/adapters/MultiRedditListingRecyclerViewAdapter.java

@@ -6,6 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
@@ -19,18 +20,19 @@ import java.util.concurrent.Executor;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
+import me.zhanghai.android.fastscroll.PopupTextProvider;
 import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
 import eu.toldi.infinityforlemmy.activities.BaseActivity;
 import eu.toldi.infinityforlemmy.asynctasks.InsertMultireddit;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
+import eu.toldi.infinityforlemmy.multireddit.FavoriteMultiReddit;
 import eu.toldi.infinityforlemmy.multireddit.MultiReddit;
-import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
-import me.zhanghai.android.fastscroll.PopupTextProvider;
 import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
-public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements PopupTextProvider {
+public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>  implements PopupTextProvider {
 
     private static final int VIEW_TYPE_FAVORITE_MULTI_REDDIT_DIVIDER = 0;
     private static final int VIEW_TYPE_FAVORITE_MULTI_REDDIT = 1;
@@ -52,7 +54,6 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
 
     public interface OnItemClickListener {
         void onClick(MultiReddit multiReddit);
-
         void onLongClick(MultiReddit multiReddit);
     }
 
@@ -119,31 +120,80 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
             MultiReddit multiReddit = mMultiReddits.get(holder.getBindingAdapterPosition() - offset);
             name = multiReddit.getDisplayName();
             iconUrl = multiReddit.getIconUrl();
-            if (multiReddit.isFavorite()) {
+            if(multiReddit.isFavorite()) {
                 ((MultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
             } else {
                 ((MultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
             }
 
             ((MultiRedditViewHolder) holder).favoriteImageView.setOnClickListener(view -> {
-                if (multiReddit.isFavorite()) {
+                if(multiReddit.isFavorite()) {
                     ((MultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
                     multiReddit.setFavorite(false);
+                    if (mAccessToken == null) {
+                        InsertMultireddit.insertMultireddit(mExecutor, new Handler(), mRedditDataRoomDatabase, multiReddit,
+                                () -> {
+                                    //Do nothing
+                                });
+                    } else {
+                        FavoriteMultiReddit.favoriteMultiReddit(mExecutor, new Handler(), mOauthRetrofit, mRedditDataRoomDatabase,
+                                mAccessToken, false, multiReddit,
+                                new FavoriteMultiReddit.FavoriteMultiRedditListener() {
+                                    @Override
+                                    public void success() {
+                                        int position = holder.getBindingAdapterPosition() - offset;
+                                        if(position >= 0 && mMultiReddits.size() > position) {
+                                            mMultiReddits.get(position).setFavorite(false);
+                                        }
+                                        ((MultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
+                                    }
 
-                    InsertMultireddit.insertMultireddit(mExecutor, new Handler(), mRedditDataRoomDatabase, multiReddit,
-                            () -> {
-                                //Do nothing
-                            });
+                                    @Override
+                                    public void failed() {
+                                        Toast.makeText(mActivity, R.string.thing_unfavorite_failed, Toast.LENGTH_SHORT).show();
+                                        int position = holder.getBindingAdapterPosition() - offset;
+                                        if(position >= 0 && mMultiReddits.size() > position) {
+                                            mMultiReddits.get(position).setFavorite(true);
+                                        }
+                                        ((MultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
+                                    }
+                                }
+                        );
+                    }
                 } else {
                     ((MultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
                     multiReddit.setFavorite(true);
+                    if (mAccessToken == null) {
+                        InsertMultireddit.insertMultireddit(mExecutor, new Handler(), mRedditDataRoomDatabase, multiReddit,
+                                () -> {
+                                    //Do nothing
+                                });
+                    } else {
+                        FavoriteMultiReddit.favoriteMultiReddit(mExecutor, new Handler(), mOauthRetrofit, mRedditDataRoomDatabase,
+                                mAccessToken, true, multiReddit,
+                                new FavoriteMultiReddit.FavoriteMultiRedditListener() {
+                                    @Override
+                                    public void success() {
+                                        int position = holder.getBindingAdapterPosition() - offset;
+                                        if(position >= 0 && mMultiReddits.size() > position) {
+                                            mMultiReddits.get(position).setFavorite(true);
+                                        }
+                                        ((MultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
+                                    }
 
-                    InsertMultireddit.insertMultireddit(mExecutor, new Handler(), mRedditDataRoomDatabase, multiReddit,
-                            () -> {
-                                //Do nothing
-                            });
+                                    @Override
+                                    public void failed() {
+                                        Toast.makeText(mActivity, R.string.thing_favorite_failed, Toast.LENGTH_SHORT).show();
+                                        int position = holder.getBindingAdapterPosition() - offset;
+                                        if(position >= 0 && mMultiReddits.size() > position) {
+                                            mMultiReddits.get(position).setFavorite(false);
+                                        }
+                                        ((MultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
+                                    }
+                                }
+                        );
+                    }
                 }
-
             });
             holder.itemView.setOnClickListener(view -> {
                 mOnItemClickListener.onClick(multiReddit);
@@ -170,29 +220,79 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
             MultiReddit multiReddit = mFavoriteMultiReddits.get(holder.getBindingAdapterPosition() - 1);
             String name = multiReddit.getDisplayName();
             String iconUrl = multiReddit.getIconUrl();
-            if (multiReddit.isFavorite()) {
+            if(multiReddit.isFavorite()) {
                 ((FavoriteMultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
             } else {
                 ((FavoriteMultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
             }
 
             ((FavoriteMultiRedditViewHolder) holder).favoriteImageView.setOnClickListener(view -> {
-                if (multiReddit.isFavorite()) {
+                if(multiReddit.isFavorite()) {
                     ((FavoriteMultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
                     multiReddit.setFavorite(false);
-                    InsertMultireddit.insertMultireddit(mExecutor, new Handler(), mRedditDataRoomDatabase, multiReddit,
-                            () -> {
-                                //Do nothing
-                            });
+                    if (mAccessToken == null) {
+                        InsertMultireddit.insertMultireddit(mExecutor, new Handler(), mRedditDataRoomDatabase, multiReddit,
+                                () -> {
+                                    //Do nothing
+                                });
+                    } else {
+                        FavoriteMultiReddit.favoriteMultiReddit(mExecutor, new Handler(), mOauthRetrofit, mRedditDataRoomDatabase,
+                                mAccessToken, false, multiReddit,
+                                new FavoriteMultiReddit.FavoriteMultiRedditListener() {
+                                    @Override
+                                    public void success() {
+                                        int position = holder.getBindingAdapterPosition() - 1;
+                                        if(position >= 0 && mFavoriteMultiReddits.size() > position) {
+                                            mFavoriteMultiReddits.get(position).setFavorite(false);
+                                        }
+                                        ((FavoriteMultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
+                                    }
 
+                                    @Override
+                                    public void failed() {
+                                        Toast.makeText(mActivity, R.string.thing_unfavorite_failed, Toast.LENGTH_SHORT).show();
+                                        int position = holder.getBindingAdapterPosition() - 1;
+                                        if(position >= 0 && mFavoriteMultiReddits.size() > position) {
+                                            mFavoriteMultiReddits.get(position).setFavorite(true);
+                                        }
+                                        ((FavoriteMultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
+                                    }
+                                }
+                        );
+                    }
                 } else {
                     ((FavoriteMultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
                     multiReddit.setFavorite(true);
+                    if (mAccessToken == null) {
+                        InsertMultireddit.insertMultireddit(mExecutor, new Handler(), mRedditDataRoomDatabase, multiReddit,
+                                () -> {
+                                    //Do nothing
+                                });
+                    } else {
+                        FavoriteMultiReddit.favoriteMultiReddit(mExecutor, new Handler(), mOauthRetrofit, mRedditDataRoomDatabase,
+                                mAccessToken, true, multiReddit,
+                                new FavoriteMultiReddit.FavoriteMultiRedditListener() {
+                                    @Override
+                                    public void success() {
+                                        int position = holder.getBindingAdapterPosition() - 1;
+                                        if(position >= 0 && mFavoriteMultiReddits.size() > position) {
+                                            mFavoriteMultiReddits.get(position).setFavorite(true);
+                                        }
+                                        ((FavoriteMultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
+                                    }
 
-                    InsertMultireddit.insertMultireddit(mExecutor, new Handler(), mRedditDataRoomDatabase, multiReddit,
-                            () -> {
-                                //Do nothing
-                            });
+                                    @Override
+                                    public void failed() {
+                                        Toast.makeText(mActivity, R.string.thing_favorite_failed, Toast.LENGTH_SHORT).show();
+                                        int position = holder.getBindingAdapterPosition() - 1;
+                                        if(position >= 0 && mFavoriteMultiReddits.size() > position) {
+                                            mFavoriteMultiReddits.get(position).setFavorite(false);
+                                        }
+                                        ((FavoriteMultiRedditViewHolder) holder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
+                                    }
+                                }
+                        );
+                    }
                 }
             });
             holder.itemView.setOnClickListener(view -> {
@@ -222,7 +322,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
     @Override
     public int getItemCount() {
         if (mMultiReddits != null) {
-            if (mFavoriteMultiReddits != null && mFavoriteMultiReddits.size() > 0) {
+            if(mFavoriteMultiReddits != null && mFavoriteMultiReddits.size() > 0) {
                 return mMultiReddits.size() > 0 ?
                         mFavoriteMultiReddits.size() + mMultiReddits.size() + 2 : 0;
             }
@@ -234,7 +334,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
 
     @Override
     public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
-        if (holder instanceof MultiRedditViewHolder) {
+        if(holder instanceof MultiRedditViewHolder) {
             mGlide.clear(((MultiRedditViewHolder) holder).iconImageView);
         } else if (holder instanceof FavoriteMultiRedditViewHolder) {
             mGlide.clear(((FavoriteMultiRedditViewHolder) holder).iconImageView);
@@ -303,8 +403,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
     }
 
     class FavoriteMultiRedditsDividerViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.divider_text_view_item_favorite_thing_divider)
-        TextView dividerTextView;
+        @BindView(R.id.divider_text_view_item_favorite_thing_divider) TextView dividerTextView;
 
         FavoriteMultiRedditsDividerViewHolder(@NonNull View itemView) {
             super(itemView);
@@ -318,8 +417,7 @@ public class MultiRedditListingRecyclerViewAdapter extends RecyclerView.Adapter<
     }
 
     class AllMultiRedditsDividerViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.divider_text_view_item_favorite_thing_divider)
-        TextView dividerTextView;
+        @BindView(R.id.divider_text_view_item_favorite_thing_divider) TextView dividerTextView;
 
         AllMultiRedditsDividerViewHolder(@NonNull View itemView) {
             super(itemView);

app/src/main/java/eu/toldi/infinityforlemmy/adapters/PostFilterRecyclerViewAdapter.java

@@ -12,15 +12,11 @@ import java.util.List;
 
 import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.activities.BaseActivity;
-import eu.toldi.infinityforlemmy.adapters.navigationdrawer.PostFilterUsageEmbeddedRecyclerViewAdapter;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import eu.toldi.infinityforlemmy.customviews.LinearLayoutManagerBugFixed;
-import eu.toldi.infinityforlemmy.databinding.ItemPostFilterWithUsageBinding;
 import eu.toldi.infinityforlemmy.postfilter.PostFilter;
-import eu.toldi.infinityforlemmy.postfilter.PostFilterWithUsage;
 import eu.toldi.infinityforlemmy.utils.Utils;
 
-public class PostFilterWithUsageRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class PostFilterRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private static final int VIEW_TYPE_HEADER = 1;
     private static final int VIEW_TYPE_POST_FILTER = 2;
@@ -28,18 +24,16 @@ public class PostFilterWithUsageRecyclerViewAdapter extends RecyclerView.Adapter
     private BaseActivity activity;
     private CustomThemeWrapper customThemeWrapper;
     private final OnItemClickListener onItemClickListener;
-    private List<PostFilterWithUsage> postFilterWithUsageList;
-    private RecyclerView.RecycledViewPool recycledViewPool;
+    private List<PostFilter> postFilterList;
 
     public interface OnItemClickListener {
         void onItemClick(PostFilter postFilter);
     }
 
-    public PostFilterWithUsageRecyclerViewAdapter(BaseActivity activity, CustomThemeWrapper customThemeWrapper,
-                                                  OnItemClickListener onItemClickListener) {
+    public PostFilterRecyclerViewAdapter(BaseActivity activity, CustomThemeWrapper customThemeWrapper,
+                                         OnItemClickListener onItemClickListener) {
         this.activity = activity;
         this.customThemeWrapper = customThemeWrapper;
-        this.recycledViewPool = new RecyclerView.RecycledViewPool();
         this.onItemClickListener = onItemClickListener;
     }
 
@@ -57,49 +51,43 @@ public class PostFilterWithUsageRecyclerViewAdapter extends RecyclerView.Adapter
         if (viewType == VIEW_TYPE_HEADER) {
             return new HeaderViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_filter_fragment_header, parent, false));
         } else {
-            return new PostFilterViewHolder(ItemPostFilterWithUsageBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
+            return new PostFilterViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_post_filter, parent, false));
         }
     }
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
         if (holder instanceof PostFilterViewHolder) {
-            ((PostFilterViewHolder) holder).binding.postFilterNameTextViewItemPostFilter.setText(postFilterWithUsageList.get(position - 1).postFilter.name);
-            ((PostFilterViewHolder) holder).adapter.setPostFilterUsageList(postFilterWithUsageList.get(position - 1).postFilterUsages);
+            ((PostFilterViewHolder) holder).textView.setText(postFilterList.get(position - 1).name);
         }
     }
 
     @Override
     public int getItemCount() {
-        return postFilterWithUsageList == null ? 1 : 1 + postFilterWithUsageList.size();
+        return postFilterList == null ? 1 : 1 + postFilterList.size();
     }
 
-    public void setPostFilterWithUsageList(List<PostFilterWithUsage> postFilterWithUsageList) {
-        this.postFilterWithUsageList = postFilterWithUsageList;
+    public void setPostFilterList(List<PostFilter> postFilterList) {
+        this.postFilterList = postFilterList;
         notifyDataSetChanged();
     }
 
     private class PostFilterViewHolder extends RecyclerView.ViewHolder {
-        ItemPostFilterWithUsageBinding binding;
-        PostFilterUsageEmbeddedRecyclerViewAdapter adapter;
+        TextView textView;
 
-        public PostFilterViewHolder(@NonNull ItemPostFilterWithUsageBinding binding) {
-            super(binding.getRoot());
-            this.binding = binding;
-            binding.postFilterNameTextViewItemPostFilter.setTextColor(customThemeWrapper.getPrimaryTextColor());
+        public PostFilterViewHolder(@NonNull View itemView) {
+            super(itemView);
+            textView = (TextView) itemView;
+
+            textView.setTextColor(customThemeWrapper.getPrimaryTextColor());
 
             if (activity.typeface != null) {
-                binding.postFilterNameTextViewItemPostFilter.setTypeface(activity.typeface);
+                textView.setTypeface(activity.typeface);
             }
 
-            binding.getRoot().setOnClickListener(view -> {
-                onItemClickListener.onItemClick(postFilterWithUsageList.get(getBindingAdapterPosition() - 1).postFilter);
+            itemView.setOnClickListener(view -> {
+                onItemClickListener.onItemClick(postFilterList.get(getBindingAdapterPosition() - 1));
             });
-
-            binding.postFilterUsageRecyclerViewItemPostFilter.setRecycledViewPool(recycledViewPool);
-            binding.postFilterUsageRecyclerViewItemPostFilter.setLayoutManager(new LinearLayoutManagerBugFixed(activity));
-            adapter = new PostFilterUsageEmbeddedRecyclerViewAdapter(activity);
-            binding.postFilterUsageRecyclerViewItemPostFilter.setAdapter(adapter);
         }
     }
 
@@ -112,4 +100,4 @@ public class PostFilterWithUsageRecyclerViewAdapter extends RecyclerView.Adapter
             infoTextView.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(activity, R.drawable.ic_info_preference_24dp, activity.customThemeWrapper.getPrimaryIconColor()), null, null, null);
         }
     }
-}
+}

app/src/main/java/eu/toldi/infinityforlemmy/adapters/PostGalleryTypeImageRecyclerViewAdapter.java

@@ -18,18 +18,17 @@ import com.bumptech.glide.RequestBuilder;
 import com.bumptech.glide.RequestManager;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
 
 import java.util.ArrayList;
 
+import io.noties.markwon.Markwon;
+import jp.wasabeef.glide.transformations.BlurTransformation;
 import eu.toldi.infinityforlemmy.SaveMemoryCenterInisdeDownsampleStrategy;
 import eu.toldi.infinityforlemmy.databinding.ItemGalleryImageInPostFeedBinding;
 import eu.toldi.infinityforlemmy.post.Post;
-import io.noties.markwon.Markwon;
-import jp.wasabeef.glide.transformations.BlurTransformation;
 
 public class PostGalleryTypeImageRecyclerViewAdapter extends RecyclerView.Adapter<PostGalleryTypeImageRecyclerViewAdapter.ImageViewHolder> {
     private RequestManager glide;
@@ -129,7 +128,7 @@ public class PostGalleryTypeImageRecyclerViewAdapter extends RecyclerView.Adapte
             return;
         }
 
-        RequestBuilder<Drawable> imageRequestBuilder = glide.load(galleryImages.get(index).url).override(1024).listener(new RequestListener<>() {
+        RequestBuilder<Drawable> imageRequestBuilder = glide.load(galleryImages.get(index).url).listener(new RequestListener<>() {
             @Override
             public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
                 holder.binding.progressBarItemGalleryImageInPostFeed.setVisibility(View.GONE);
@@ -145,10 +144,10 @@ public class PostGalleryTypeImageRecyclerViewAdapter extends RecyclerView.Adapte
             }
         });
         if (blurImage) {
-            imageRequestBuilder.apply(RequestOptions.bitmapTransform(new BlurTransformation(50, 10))).thumbnail(0.1f).downsample(DownsampleStrategy.CENTER_INSIDE).override(1024)
+            imageRequestBuilder.apply(RequestOptions.bitmapTransform(new BlurTransformation(50, 10)))
                     .into(holder.binding.imageViewItemGalleryImageInPostFeed);
         } else {
-            imageRequestBuilder.centerInside().downsample(saveMemoryCenterInisdeDownsampleStrategy).override(1024).thumbnail(0.1f).downsample(DownsampleStrategy.CENTER_INSIDE).into(holder.binding.imageViewItemGalleryImageInPostFeed);
+            imageRequestBuilder.centerInside().downsample(saveMemoryCenterInisdeDownsampleStrategy).into(holder.binding.imageViewItemGalleryImageInPostFeed);
         }
     }
 

app/src/main/java/eu/toldi/infinityforlemmy/adapters/PrivateMessageRecycleViewAdapter.java

@@ -1,343 +0,0 @@
-package eu.toldi.infinityforlemmy.adapters;
-
-import android.content.Intent;
-import android.content.res.ColorStateList;
-import android.net.Uri;
-import android.text.method.LinkMovementMethod;
-import android.text.util.Linkify;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.paging.PagedListAdapter;
-import androidx.recyclerview.widget.DiffUtil;
-import androidx.recyclerview.widget.RecyclerView;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import eu.toldi.infinityforlemmy.NetworkState;
-import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.activities.BaseActivity;
-import eu.toldi.infinityforlemmy.activities.LinkResolverActivity;
-import eu.toldi.infinityforlemmy.activities.ViewPrivateMessagesActivity;
-import eu.toldi.infinityforlemmy.activities.ViewUserDetailActivity;
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import eu.toldi.infinityforlemmy.markdown.RedditHeadingPlugin;
-import eu.toldi.infinityforlemmy.markdown.SpoilerAwareMovementMethod;
-import eu.toldi.infinityforlemmy.markdown.SpoilerParserPlugin;
-import eu.toldi.infinityforlemmy.markdown.SuperscriptPlugin;
-import eu.toldi.infinityforlemmy.privatemessage.LemmyPrivateMessageAPI;
-import eu.toldi.infinityforlemmy.privatemessage.PrivateMessage;
-import io.noties.markwon.AbstractMarkwonPlugin;
-import io.noties.markwon.Markwon;
-import io.noties.markwon.MarkwonConfiguration;
-import io.noties.markwon.core.MarkwonTheme;
-import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-import io.noties.markwon.image.glide.GlideImagesPlugin;
-import io.noties.markwon.inlineparser.HtmlInlineProcessor;
-import io.noties.markwon.inlineparser.MarkwonInlineParserPlugin;
-import io.noties.markwon.linkify.LinkifyPlugin;
-import io.noties.markwon.movement.MovementMethodPlugin;
-import retrofit2.Retrofit;
-
-public class PrivateMessageRecycleViewAdapter extends PagedListAdapter<PrivateMessage, RecyclerView.ViewHolder> {
-    private static final int VIEW_TYPE_DATA = 0;
-    private static final int VIEW_TYPE_ERROR = 1;
-    private static final int VIEW_TYPE_LOADING = 2;
-    private static final DiffUtil.ItemCallback<PrivateMessage> DIFF_CALLBACK = new DiffUtil.ItemCallback<>() {
-        @Override
-        public boolean areItemsTheSame(@NonNull PrivateMessage message, @NonNull PrivateMessage t1) {
-            return message.getId() == t1.getId();
-        }
-
-        @Override
-        public boolean areContentsTheSame(@NonNull PrivateMessage message, @NonNull PrivateMessage t1) {
-            return message.getContent().equals(t1.getContent());
-        }
-    };
-    private BaseActivity mActivity;
-    private Retrofit retrofit;
-    private Markwon mMarkwon;
-    private String mAccessToken;
-
-    private final LemmyPrivateMessageAPI lemmyPrivateMessageAPI;
-    private int mMessageType;
-    private NetworkState networkState;
-    private RetryLoadingMoreCallback mRetryLoadingMoreCallback;
-    private int mColorAccent;
-    private int mMessageBackgroundColor;
-    private int mUsernameColor;
-    private int mPrimaryTextColor;
-    private int mSecondaryTextColor;
-    private int mUnreadMessageBackgroundColor;
-    private int mColorPrimaryLightTheme;
-    private int mButtonTextColor;
-    private boolean markAllMessagesAsRead = false;
-
-    public PrivateMessageRecycleViewAdapter(BaseActivity activity, Retrofit oauthRetrofit,
-                                            CustomThemeWrapper customThemeWrapper,
-                                            String accessToken,
-                                            LemmyPrivateMessageAPI lemmyPrivateMessageAPI, RetryLoadingMoreCallback retryLoadingMoreCallback) {
-        super(DIFF_CALLBACK);
-        mActivity = activity;
-        retrofit = oauthRetrofit;
-        this.lemmyPrivateMessageAPI = lemmyPrivateMessageAPI;
-        mRetryLoadingMoreCallback = retryLoadingMoreCallback;
-
-        mColorAccent = customThemeWrapper.getColorAccent();
-        mMessageBackgroundColor = customThemeWrapper.getCardViewBackgroundColor();
-        mUsernameColor = customThemeWrapper.getUsername();
-        mPrimaryTextColor = customThemeWrapper.getPrimaryTextColor();
-        mSecondaryTextColor = customThemeWrapper.getSecondaryTextColor();
-        int spoilerBackgroundColor = mSecondaryTextColor | 0xFF000000;
-        mUnreadMessageBackgroundColor = customThemeWrapper.getUnreadMessageBackgroundColor();
-        mColorPrimaryLightTheme = customThemeWrapper.getColorPrimaryLightTheme();
-        mButtonTextColor = customThemeWrapper.getButtonTextColor();
-
-        // todo:https://github.com/Docile-Alligator/Infinity-For-Reddit/issues/1027
-        //  add tables support and replace with MarkdownUtils#commonPostMarkwonBuilder
-        mMarkwon = Markwon.builder(mActivity)
-                .usePlugin(MarkwonInlineParserPlugin.create(plugin -> {
-                    plugin.excludeInlineProcessor(HtmlInlineProcessor.class);
-                }))
-                .usePlugin(new AbstractMarkwonPlugin() {
-                    @Override
-                    public void configureConfiguration(@NonNull MarkwonConfiguration.Builder builder) {
-                        builder.linkResolver((view, link) -> {
-                            Intent intent = new Intent(mActivity, LinkResolverActivity.class);
-                            Uri uri = Uri.parse(link);
-                            intent.setData(uri);
-                            mActivity.startActivity(intent);
-                        });
-                    }
-
-                    @Override
-                    public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
-                        builder.linkColor(customThemeWrapper.getLinkColor());
-                    }
-                })
-                .usePlugin(SuperscriptPlugin.create())
-                .usePlugin(SpoilerParserPlugin.create(mSecondaryTextColor, spoilerBackgroundColor))
-                .usePlugin(RedditHeadingPlugin.create())
-                .usePlugin(StrikethroughPlugin.create())
-                .usePlugin(MovementMethodPlugin.create(new SpoilerAwareMovementMethod()))
-                .usePlugin(LinkifyPlugin.create(Linkify.WEB_URLS))
-                .usePlugin(GlideImagesPlugin.create(mActivity))
-                .build();
-        mAccessToken = accessToken;
-
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        if (viewType == VIEW_TYPE_DATA) {
-            return new DataViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_message, parent, false));
-        } else if (viewType == VIEW_TYPE_ERROR) {
-            return new ErrorViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_footer_error, parent, false));
-        } else {
-            return new LoadingViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_footer_loading, parent, false));
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        if (holder instanceof DataViewHolder) {
-            PrivateMessage message = getItem(holder.getBindingAdapterPosition());
-            if (message != null) {
-
-                if (!message.getRead()) {
-                    if (markAllMessagesAsRead) {
-                        message.setRead(true);
-                    } else {
-                        holder.itemView.setBackgroundColor(
-                                mUnreadMessageBackgroundColor);
-                    }
-                }
-
-
-                ((DataViewHolder) holder).titleTextView.setVisibility(View.GONE);
-
-
-                ((DataViewHolder) holder).authorTextView.setText(message.getCreatorQualifiedName());
-                String subject = message.getRecipientQualifiedName();
-                ((DataViewHolder) holder).subjectTextView.setText(subject);
-                mMarkwon.setMarkdown(((DataViewHolder) holder).contentCustomMarkwonView, message.getContent());
-
-                holder.itemView.setOnClickListener(view -> {
-
-                    Intent intent = new Intent(mActivity, ViewPrivateMessagesActivity.class);
-                    intent.putExtra(ViewPrivateMessagesActivity.EXTRA_PRIVATE_MESSAGE, message);
-                    mActivity.startActivity(intent);
-
-
-                    if (message.getRead()) {
-                        holder.itemView.setBackgroundColor(mMessageBackgroundColor);
-
-
-                        lemmyPrivateMessageAPI.markPrivateMessageAsRead(mAccessToken, message.getId(), new LemmyPrivateMessageAPI.PrivateMessageMarkedAsReadListener() {
-
-                            @Override
-                            public void onPrivateMessageMarkedAsReadError() {
-                                message.setRead(false);
-                            }
-
-                            @Override
-                            public void onPrivateMessageMarkedAsReadSuccess() {
-                                message.setRead(true);
-                            }
-                        });
-                    }
-                });
-
-                ((DataViewHolder) holder).authorTextView.setOnClickListener(view -> {
-
-                    Intent intent = new Intent(mActivity, ViewUserDetailActivity.class);
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, message.getCreatorName());
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, message.getCreatorQualifiedName());
-                    mActivity.startActivity(intent);
-                });
-            }
-        }
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        // Reached at the end
-        if (hasExtraRow() && position == getItemCount() - 1) {
-            if (networkState.getStatus() == NetworkState.Status.LOADING) {
-                return VIEW_TYPE_LOADING;
-            } else {
-                return VIEW_TYPE_ERROR;
-            }
-        } else {
-            return VIEW_TYPE_DATA;
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        if (hasExtraRow()) {
-            return super.getItemCount() + 1;
-        }
-        return super.getItemCount();
-    }
-
-    @Override
-    public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
-        super.onViewRecycled(holder);
-        if (holder instanceof DataViewHolder) {
-            ((DataViewHolder) holder).itemView.setBackgroundColor(mMessageBackgroundColor);
-            ((DataViewHolder) holder).titleTextView.setVisibility(View.VISIBLE);
-        }
-    }
-
-    private boolean hasExtraRow() {
-        return networkState != null && networkState.getStatus() != NetworkState.Status.SUCCESS;
-    }
-
-    public void setNetworkState(NetworkState newNetworkState) {
-        NetworkState previousState = this.networkState;
-        boolean previousExtraRow = hasExtraRow();
-        this.networkState = newNetworkState;
-        boolean newExtraRow = hasExtraRow();
-        if (previousExtraRow != newExtraRow) {
-            if (previousExtraRow) {
-                notifyItemRemoved(super.getItemCount());
-            } else {
-                notifyItemInserted(super.getItemCount());
-            }
-        } else if (newExtraRow && !previousState.equals(newNetworkState)) {
-            notifyItemChanged(getItemCount() - 1);
-        }
-    }
-
-    public void updateMessageReply(PrivateMessage newReply, int position) {
-        if (position >= 0 && position < super.getItemCount()) {
-            PrivateMessage message = getItem(position);
-            if (message != null) {
-                notifyItemChanged(position);
-            }
-        }
-    }
-
-    public void setMarkAllMessagesAsRead(boolean markAllMessagesAsRead) {
-        this.markAllMessagesAsRead = markAllMessagesAsRead;
-    }
-
-    public interface RetryLoadingMoreCallback {
-        void retryLoadingMore();
-    }
-
-    class DataViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.author_text_view_item_message)
-        TextView authorTextView;
-        @BindView(R.id.subject_text_view_item_message)
-        TextView subjectTextView;
-        @BindView(R.id.title_text_view_item_message)
-        TextView titleTextView;
-        @BindView(R.id.content_custom_markwon_view_item_message)
-        TextView contentCustomMarkwonView;
-
-        DataViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            if (mActivity.typeface != null) {
-                authorTextView.setTypeface(mActivity.typeface);
-                subjectTextView.setTypeface(mActivity.typeface);
-                titleTextView.setTypeface(mActivity.titleTypeface);
-                contentCustomMarkwonView.setTypeface(mActivity.contentTypeface);
-            }
-            itemView.setBackgroundColor(mMessageBackgroundColor);
-            authorTextView.setTextColor(mUsernameColor);
-            subjectTextView.setTextColor(mPrimaryTextColor);
-            titleTextView.setTextColor(mPrimaryTextColor);
-            contentCustomMarkwonView.setTextColor(mSecondaryTextColor);
-
-            contentCustomMarkwonView.setMovementMethod(LinkMovementMethod.getInstance());
-
-            contentCustomMarkwonView.setOnClickListener(view -> {
-                if (contentCustomMarkwonView.getSelectionStart() == -1 && contentCustomMarkwonView.getSelectionEnd() == -1) {
-                    itemView.performClick();
-                }
-            });
-        }
-    }
-
-    class ErrorViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.error_text_view_item_footer_error)
-        TextView errorTextView;
-        @BindView(R.id.retry_button_item_footer_error)
-        Button retryButton;
-
-        ErrorViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            if (mActivity.typeface != null) {
-                errorTextView.setTypeface(mActivity.typeface);
-                retryButton.setTypeface(mActivity.typeface);
-            }
-            errorTextView.setText(R.string.load_comments_failed);
-            errorTextView.setTextColor(mSecondaryTextColor);
-            retryButton.setOnClickListener(view -> mRetryLoadingMoreCallback.retryLoadingMore());
-            retryButton.setBackgroundTintList(ColorStateList.valueOf(mColorPrimaryLightTheme));
-            retryButton.setTextColor(mButtonTextColor);
-        }
-    }
-
-    class LoadingViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.progress_bar_item_footer_loading)
-        ProgressBar progressBar;
-
-        LoadingViewHolder(@NonNull View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            progressBar.setIndeterminateTintList(ColorStateList.valueOf(mColorAccent));
-        }
-    }
-}
-

app/src/main/java/eu/toldi/infinityforlemmy/adapters/PrivateMessagesDetailRecyclerViewAdapter.java

@@ -27,35 +27,34 @@ import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import eu.toldi.infinityforlemmy.R;
-import eu.toldi.infinityforlemmy.activities.LinkResolverActivity;
-import eu.toldi.infinityforlemmy.activities.ViewPrivateMessagesActivity;
-import eu.toldi.infinityforlemmy.activities.ViewUserDetailActivity;
-import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import eu.toldi.infinityforlemmy.markdown.ClickableGlideImagesPlugin;
-import eu.toldi.infinityforlemmy.markdown.RedditHeadingPlugin;
-import eu.toldi.infinityforlemmy.markdown.SpoilerAwareMovementMethod;
-import eu.toldi.infinityforlemmy.markdown.SpoilerParserPlugin;
-import eu.toldi.infinityforlemmy.markdown.SuperscriptPlugin;
-import eu.toldi.infinityforlemmy.privatemessage.PrivateMessage;
-import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
-import eu.toldi.infinityforlemmy.utils.Utils;
 import io.noties.markwon.AbstractMarkwonPlugin;
 import io.noties.markwon.Markwon;
 import io.noties.markwon.MarkwonConfiguration;
 import io.noties.markwon.core.MarkwonTheme;
 import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-import io.noties.markwon.image.glide.GlideImagesPlugin;
+import io.noties.markwon.inlineparser.BangInlineProcessor;
 import io.noties.markwon.inlineparser.HtmlInlineProcessor;
 import io.noties.markwon.inlineparser.MarkwonInlineParserPlugin;
 import io.noties.markwon.linkify.LinkifyPlugin;
 import io.noties.markwon.movement.MovementMethodPlugin;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
+import eu.toldi.infinityforlemmy.R;
+import eu.toldi.infinityforlemmy.activities.LinkResolverActivity;
+import eu.toldi.infinityforlemmy.activities.ViewPrivateMessagesActivity;
+import eu.toldi.infinityforlemmy.activities.ViewUserDetailActivity;
+import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
+import eu.toldi.infinityforlemmy.markdown.RedditHeadingPlugin;
+import eu.toldi.infinityforlemmy.markdown.SpoilerAwareMovementMethod;
+import eu.toldi.infinityforlemmy.markdown.SpoilerParserPlugin;
+import eu.toldi.infinityforlemmy.markdown.SuperscriptPlugin;
+import eu.toldi.infinityforlemmy.message.Message;
+import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
+import eu.toldi.infinityforlemmy.utils.Utils;
 
 public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private static final int VIEW_TYPE_MESSAGE_SENT = 0;
     private static final int VIEW_TYPE_MESSAGE_RECEIVED = 1;
-    private PrivateMessage mMessage;
+    private Message mMessage;
     private ViewPrivateMessagesActivity mViewPrivateMessagesActivity;
     private RequestManager mGlide;
     private Locale mLocale;
@@ -71,7 +70,7 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
 
     public PrivateMessagesDetailRecyclerViewAdapter(ViewPrivateMessagesActivity viewPrivateMessagesActivity,
                                                     SharedPreferences sharedPreferences, Locale locale,
-                                                    PrivateMessage message, String accountName,
+                                                    Message message, String accountName,
                                                     CustomThemeWrapper customThemeWrapper) {
         mMessage = message;
         mViewPrivateMessagesActivity = viewPrivateMessagesActivity;
@@ -84,6 +83,7 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
         mMarkwon = Markwon.builder(viewPrivateMessagesActivity)
                 .usePlugin(MarkwonInlineParserPlugin.create(plugin -> {
                     plugin.excludeInlineProcessor(HtmlInlineProcessor.class);
+                    plugin.excludeInlineProcessor(BangInlineProcessor.class);
                 }))
                 .usePlugin(new AbstractMarkwonPlugin() {
                     @Override
@@ -108,8 +108,6 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
                         builder.linkColor(customThemeWrapper.getLinkColor());
                     }
                 })
-                .usePlugin(GlideImagesPlugin.create(viewPrivateMessagesActivity))
-                .usePlugin(ClickableGlideImagesPlugin.create(viewPrivateMessagesActivity))
                 .usePlugin(SuperscriptPlugin.create())
                 .usePlugin(StrikethroughPlugin.create())
                 .usePlugin(SpoilerParserPlugin.create(commentColor, commentColor | 0xFF000000))
@@ -129,9 +127,9 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
     @Override
     public int getItemViewType(int position) {
         if (position == 0) {
-            return mMessage.getCreatorQualifiedName().equals(mAccountName) ? VIEW_TYPE_MESSAGE_SENT : VIEW_TYPE_MESSAGE_RECEIVED;
+            return mMessage.getAuthor().equals(mAccountName) ? VIEW_TYPE_MESSAGE_SENT : VIEW_TYPE_MESSAGE_RECEIVED;
         } else {
-            return mMessage.getReplies().get(position - 1).getCreatorQualifiedName().equals(mAccountName) ? VIEW_TYPE_MESSAGE_SENT : VIEW_TYPE_MESSAGE_RECEIVED;
+            return mMessage.getReplies().get(position - 1).getAuthor().equals(mAccountName) ? VIEW_TYPE_MESSAGE_SENT : VIEW_TYPE_MESSAGE_RECEIVED;
         }
     }
 
@@ -147,7 +145,7 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        PrivateMessage message;
+        Message message;
         if (holder.getBindingAdapterPosition() == 0) {
             message = mMessage;
         } else {
@@ -155,12 +153,12 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
         }
         if (message != null) {
             if (holder instanceof MessageViewHolder) {
-                mMarkwon.setMarkdown(((MessageViewHolder) holder).messageTextView, message.getContent());
+                mMarkwon.setMarkdown(((MessageViewHolder) holder).messageTextView, message.getBody());
 
                 if (mShowElapsedTime) {
-                    ((MessageViewHolder) holder).timeTextView.setText(Utils.getElapsedTime(mViewPrivateMessagesActivity, message.getPublished()));
+                    ((MessageViewHolder) holder).timeTextView.setText(Utils.getElapsedTime(mViewPrivateMessagesActivity, message.getTimeUTC()));
                 } else {
-                    ((MessageViewHolder) holder).timeTextView.setText(Utils.getFormattedTime(mLocale, message.getPublished(), mTimeFormatPattern));
+                    ((MessageViewHolder) holder).timeTextView.setText(Utils.getFormattedTime(mLocale, message.getTimeUTC(), mTimeFormatPattern));
                 }
             }
 
@@ -168,33 +166,26 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
                 ((SentMessageViewHolder) holder).messageTextView.setBackground(Utils.getTintedDrawable(mViewPrivateMessagesActivity,
                         R.drawable.private_message_ballon, mSentMessageBackgroundColor));
             } else if (holder instanceof ReceivedMessageViewHolder) {
-                if (!message.getCreatorAvatar().equals("")) {
-                    mGlide.load(message.getCreatorAvatar())
-                            .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
-                            .error(mGlide.load(R.drawable.subreddit_default_icon)
-                                    .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
-                            .into(((ReceivedMessageViewHolder) holder).userAvatarImageView);
-                } else {
-                    mViewPrivateMessagesActivity.fetchUserAvatar(message.getCreatorQualifiedName(), userAvatarUrl -> {
-                        if (userAvatarUrl == null || userAvatarUrl.equals("")) {
-                            mGlide.load(R.drawable.subreddit_default_icon)
-                                    .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
-                                    .into(((ReceivedMessageViewHolder) holder).userAvatarImageView);
-                        } else {
-                            mGlide.load(userAvatarUrl)
-                                    .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
-                                    .error(mGlide.load(R.drawable.subreddit_default_icon)
-                                            .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
-                                    .into(((ReceivedMessageViewHolder) holder).userAvatarImageView);
-                        }
-                    });
-                }
+                mViewPrivateMessagesActivity.fetchUserAvatar(message.getAuthor(), userAvatarUrl -> {
+                    if (userAvatarUrl == null || userAvatarUrl.equals("")) {
+                        mGlide.load(R.drawable.subreddit_default_icon)
+                                .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
+                                .into(((ReceivedMessageViewHolder) holder).userAvatarImageView);
+                    } else {
+                        mGlide.load(userAvatarUrl)
+                                .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
+                                .error(mGlide.load(R.drawable.subreddit_default_icon)
+                                        .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
+                                .into(((ReceivedMessageViewHolder) holder).userAvatarImageView);
+                    }
+                });
 
                 ((ReceivedMessageViewHolder) holder).userAvatarImageView.setOnClickListener(view -> {
-
+                    if (message.isAuthorDeleted()) {
+                        return;
+                    }
                     Intent intent = new Intent(mViewPrivateMessagesActivity, ViewUserDetailActivity.class);
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, message.getCreatorName());
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, message.getCreatorQualifiedName());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, message.getAuthor());
                     mViewPrivateMessagesActivity.startActivity(intent);
                 });
 
@@ -216,12 +207,12 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
         }
     }
 
-    public void setMessage(PrivateMessage message) {
+    public void setMessage(Message message) {
         mMessage = message;
         notifyDataSetChanged();
     }
 
-    public void addReply(PrivateMessage reply) {
+    public void addReply(Message reply) {
         int currentSize = getItemCount();
 
         if (mMessage != null) {
@@ -282,7 +273,7 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
             copyImageView.setColorFilter(mSecondaryTextColor, android.graphics.PorterDuff.Mode.SRC_IN);
 
             copyImageView.setOnClickListener(view -> {
-                PrivateMessage message;
+                Message message;
                 if (getBindingAdapterPosition() == 0) {
                     message = mMessage;
                 } else {
@@ -291,7 +282,7 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
                 if (message != null) {
                     ClipboardManager clipboard = (ClipboardManager) mViewPrivateMessagesActivity.getSystemService(Context.CLIPBOARD_SERVICE);
                     if (clipboard != null) {
-                        ClipData clip = ClipData.newPlainText("simple text", message.getContent());
+                        ClipData clip = ClipData.newPlainText("simple text", message.getBody());
                         clipboard.setPrimaryClip(clip);
                         if (android.os.Build.VERSION.SDK_INT < 33) {
                             Toast.makeText(mViewPrivateMessagesActivity, R.string.copy_success, Toast.LENGTH_SHORT).show();

app/src/main/java/eu/toldi/infinityforlemmy/adapters/RulesRecyclerViewAdapter.java

@@ -12,12 +12,17 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.bumptech.glide.Glide;
-
 import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import io.noties.markwon.AbstractMarkwonPlugin;
+import io.noties.markwon.Markwon;
+import io.noties.markwon.MarkwonConfiguration;
+import io.noties.markwon.MarkwonPlugin;
+import io.noties.markwon.core.MarkwonTheme;
+import io.noties.markwon.recycler.MarkwonAdapter;
+import me.saket.bettermovementmethod.BetterLinkMovementMethod;
 import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.Rule;
 import eu.toldi.infinityforlemmy.activities.BaseActivity;
@@ -28,18 +33,10 @@ import eu.toldi.infinityforlemmy.customviews.SwipeLockInterface;
 import eu.toldi.infinityforlemmy.customviews.SwipeLockLinearLayoutManager;
 import eu.toldi.infinityforlemmy.customviews.slidr.widget.SliderPanel;
 import eu.toldi.infinityforlemmy.markdown.MarkdownUtils;
-import io.noties.markwon.AbstractMarkwonPlugin;
-import io.noties.markwon.Markwon;
-import io.noties.markwon.MarkwonConfiguration;
-import io.noties.markwon.MarkwonPlugin;
-import io.noties.markwon.core.MarkwonTheme;
-import io.noties.markwon.recycler.MarkwonAdapter;
-import me.saket.bettermovementmethod.BetterLinkMovementMethod;
 
 public class RulesRecyclerViewAdapter extends RecyclerView.Adapter<RulesRecyclerViewAdapter.RuleViewHolder> {
     private BaseActivity activity;
     private Markwon markwon;
-    private boolean mDisableImagePreview;
     @Nullable
     private final SliderPanel sliderPanel;
     private ArrayList<Rule> rules;
@@ -47,11 +44,10 @@ public class RulesRecyclerViewAdapter extends RecyclerView.Adapter<RulesRecycler
 
     public RulesRecyclerViewAdapter(@NonNull BaseActivity activity,
                                     @NonNull CustomThemeWrapper customThemeWrapper,
-                                    @Nullable SliderPanel sliderPanel, boolean disableImagePreview) {
+                                    @Nullable SliderPanel sliderPanel) {
         this.activity = activity;
         this.sliderPanel = sliderPanel;
         mPrimaryTextColor = customThemeWrapper.getPrimaryTextColor();
-        mDisableImagePreview = disableImagePreview;
         int spoilerBackgroundColor = mPrimaryTextColor | 0xFF000000;
         MarkwonPlugin miscPlugin = new AbstractMarkwonPlugin() {
             @Override
@@ -86,7 +82,7 @@ public class RulesRecyclerViewAdapter extends RecyclerView.Adapter<RulesRecycler
             return true;
         };
         markwon = MarkdownUtils.createFullRedditMarkwon(activity,
-                miscPlugin, mPrimaryTextColor, spoilerBackgroundColor, Glide.with(activity.getApplication()), onLinkLongClickListener, mDisableImagePreview);
+                miscPlugin, mPrimaryTextColor, spoilerBackgroundColor, onLinkLongClickListener);
     }
 
     @NonNull