Added option to show displayname and hide the instance for comment author names

Reviewed-on: https://codeberg.org/Bazsalanszky/Eternity/pulls/147
Reviewed-by: Bazsalanszky <bazsalanszky@noreply.codeberg.org>

.gitea/issue_template/bug_report.md

@@ -0,0 +1,49 @@
+---
+
+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. -->

.github/CODE_OF_CONDUCT.md

@@ -1 +0,0 @@
-

.github/CONTRIBUTING.md

@@ -1 +0,0 @@
-

.github/DISCUSSION_TEMPLATE/announcements.yml

@@ -1,14 +0,0 @@
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to read this announcement!
-
-  - type: textarea
-    id: description
-    attributes:
-      label: description
-      description: Please describe the announcement in as much detail as possible.
-      placeholder: Make an announcement here...
-    validations:
-      required: true

.github/DISCUSSION_TEMPLATE/ideas.yml

@@ -1,74 +0,0 @@
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Have an idea for a new feature or an improvement? Let us know here!
-
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      options:
-        - label: I have used the search function for [open](https://github.com/Docile-Alligator/Infinity-For-Reddit/discussions/categories/ideas) **and** [closed](https://github.com/Docile-Alligator/Infinity-For-Reddit/discussions/categories/completed-ideas) ideas to see if someone else has already submitted the same request.
-          required: true
-        - label: I will describe the feature with as much detail as possible.
-          required: true
-
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to share your idea!
-
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Please describe your idea in as much detail as possible.
-      placeholder: I think it would be great if...
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: Alternatives
-      description: Please describe any alternative solutions or features you've considered.
-      placeholder: I've considered...
-    validations:
-      required: false
-
-  - type: textarea
-    id: additional
-    attributes:
-      label: Additional context
-      description: Add your use-case, screenshots, mock-up, or anything else you think might be helpful.
-      placeholder: I think this would be a great addition because...
-    validations:
-      required: true
-
-  - type: dropdown
-    id: importance
-    attributes:
-      label: How important is this feature?
-      multiple: false
-      options:
-        - Critical
-        - Important
-        - Nice to have
-
-  - type: textarea
-    id: other
-    attributes:
-      label: Anything else?
-      description: Is there anything else you'd like to add?
-    validations:
-      required: false
-
-  - type: textarea
-    id: solution
-    attributes:
-      label: Solution
-      description: If you have an idea of how this can be implemented, please share it here.
-      placeholder: I think this could be done by...
-    validations:
-      required: false

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-github: Docile-Alligator
-patreon: docile_alligator

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -1,94 +0,0 @@
-name: Bug Report
-description: Create a report to help us improve existing features
-labels: ['type: possible bug']
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      options:
-        - label: I have used the search function for [open](https://github.com/Docile-Alligator/Infinity-For-Reddit/issues) **and** [closed](https://github.com/Docile-Alligator/Infinity-For-Reddit/issues?q=is%3Aissue+is%3Aclosed) issues to see if someone else has already submitted the same bug report.
-          required: true
-        - label: I will describe the problem with as much detail as possible.
-          required: true
-        - label: If the bug only occurs with a certain link, post, image..., I will include the URL.
-          required: true
-
-  - type: input
-    id: version
-    attributes:
-      label: App version
-      description: We need the actual version number found on the settings screen.
-      placeholder: x.y.z
-    validations:
-      required: true
-
-  - type: dropdown
-    id: source
-    attributes:
-      label: Where did you get the app from
-      multiple: false
-      options:
-        - Google Play
-        - F-Droid
-        - Other
-    validations:
-      required: true
-
-  - type: input
-    id: android_version
-    attributes:
-      label: Android version
-      description: Please mention if you are using a custom rom!
-    validations:
-      required: true
-
-  - type: input
-    id: device
-    attributes:
-      label: Device model
-
-  - type: input
-    id: first
-    attributes:
-      label: First occurred
-      placeholder: about x days/weeks ago
-
-  - type: textarea
-    id: steps
-    attributes:
-      label: Steps to reproduce
-      placeholder: |
-        1. This
-        2. Then that
-        3. Then this
-        4. Etc.
-
-  - type: textarea
-    id: links
-    attributes:
-      label: Example post, link, markdown...
-
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected behaviour
-      description: After following the steps, what did you think Infinity would do?
-
-  - type: textarea
-    id: current
-    attributes:
-      label: Current behaviour
-      description: What did Infinity do instead? Screenshots might help. Usually, you can take a screenshot of your smartphone by pressing *Power* + *Volume down* for a few seconds.
-
-  - type: textarea
-    id: logs
-    attributes:
-      label: Logs
-      description: If you are experiencing a crash, including the stacktrace will likely get it fixed sooner.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Feature Request
-    url: https://github.com/Docile-Alligator/Infinity-For-Reddit/discussions/categories/ideas
-    about: Discuss ideas for new features of changes
-  - name: Questions
-    url: https://github.com/Docile-Alligator/Infinity-For-Reddit/discussions/categories/q-a
-    about: Please ask and answer questions here.
-  - name: Help needed
-    url: https://github.com/Docile-Alligator/Infinity-For-Reddit/discussions/categories/help-needed
-    about: Please ask for help here

.github/dependabot.yml

@@ -1,23 +0,0 @@
-version: 2
-updates:
-  # Updates for Gradle dependencies used in the app
-  - package-ecosystem: gradle
-    directory: "/"
-    schedule:
-      interval: "daily"
-    commit-message:
-      prefix: "⬆[Gradle]"
-    reviewers:
-      - "Wladefant"
-      - "Docile-Alligator"
-
-  # Updates for GitHub Actions used in the repository
-  - package-ecosystem: github-actions
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "⬆[GitHub Actions]"
-    reviewers:
-      - "Wladefant"
-      - "Docile-Alligator"

.github/workflows/build.yml

@@ -1,32 +0,0 @@
-name: Build
-
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  Build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v3
-
-    - name: Set-up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-
-    - name: Setup and build with Gradle
-      uses: gradle/gradle-build-action@v2
-      with:
-        arguments: build -x lint
-
-    - name: Upload apk
-      uses: actions/upload-artifact@v3
-      with:
-        name: Infinity-${{github.sha}}
-        path: app/build/outputs/apk/
-        if-no-files-found: error

.github/workflows/codeql-analysis.yml

@@ -1,34 +0,0 @@
-name: CodeQL
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 12 * * *'
-
-jobs:
-  Analyze:
-    runs-on: ubuntu-latest
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: java
-
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2

.woodpecker/build.yaml

@@ -1,4 +1,4 @@
-pipeline:
+steps:
   build:
     image: alvrme/alpine-android:android-33-jdk11
     commands:
@@ -24,4 +24,6 @@ pipeline:
       prerelease: true
       note: "This is an alpha release. Expect many bugs and unfinished features!"
     when:
-      event: [ tag ]
+      event: [ tag ]
+when:
+  event: [ push, tag, pull_request ]

.woodpecker/nightly.yaml

@@ -0,0 +1,76 @@
+clone:
+  git:
+    image: woodpeckerci/plugin-git
+    settings:
+      partial: false
+
+steps:
+  build:
+    image: alvrme/alpine-android:android-33-jdk11
+    commands:
+      - ./gradlew :app:assembleNightly
+  sign:
+    image: alvrme/alpine-android:android-33-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,55 +1,54 @@
 <h1 align="center">
-  Infinity for Lemmy
+  Eternity (formerly 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/Infinity-For-Lemmy/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/12474)
+[![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)
 
 <a href="https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy/issues">Report a Bug</a>
 
 </div>
 
-
-
-<br>
-
 <div align="center">
-
+<a href="https://apt.izzysoft.de/fdroid/index/apk/eu.toldi.infinityforlemmy">
+    <img src="./.assets/IzzyOnDroid.png" height="80">
+</a>
+<a href="https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy/releases/">
+    <img src="./.assets/codeberg.png" height="80">
+</a>
 </div>
 
-
-
 ---
 
-## Action Items for Infinity for Lemmy
+## Action Items for Eternity
 
-Infinity for Lemmy is currently in the early stages of development. Expect many unfinished features and bugs!
+Eternity is currently in the early stages of development. Expect many unfinished features and bugs!
 
 - [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] Capability for creating a new post
 - [x] Ability to create comments
+- [x] Edit/Delete posts and comments
+- [x] Basic inbox
 - [ ] Elimination of code/string references specific to Reddit
-- [ ] Incorporation of private messaging feature
-- [ ] Feature for saving posts
+- [x] Incorporation of private messaging feature
+- [x] Feature for saving posts/comments
+- [x] Resolving links
 - [ ] Account editing function
 - [ ] Multi community view?
 
-
 ## Contributing
 
 First off, thanks for taking the time to contribute! Contributions are what makes the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
@@ -65,10 +64,15 @@ 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
 
-Here are other ways you can help:
+### Translation
 
-- [Report Bugs](https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy/issues)
+You can alos help Eternity by translating it to your native langugage! Translations are done via [Weblate](https://translate.codeberg.org/projects/infinity-for-lemmy/app/)!
 
+[![Translation](https://translate.codeberg.org/widgets/infinity-for-lemmy/-/app/multi-auto.svg)](https://translate.codeberg.org/engage/infinity-for-lemmy/)
+
+### Reporting bugs
+
+You can also contribute by [reporting bugs](https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy/issues)
 
 <p align="right">(<a href="#top">back to top</a>)</p>
 
@@ -82,7 +86,6 @@ 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/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,5 +1,18 @@
 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 {
@@ -8,8 +21,8 @@ android {
         applicationId "eu.toldi.infinityforlemmy"
         minSdk 21
         targetSdk 33
-        versionCode 126
-        versionName "0.0.6"
+        versionCode 128
+        versionName "0.0.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
@@ -18,10 +31,12 @@ android {
         }
     }
     buildTypes {
+
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
         minifiedRelease {
             initWith buildTypes.release
             zipAlignEnabled true
@@ -33,7 +48,33 @@ 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
@@ -67,6 +108,7 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.9.0"
     def lifecycleVersion = "2.5.1"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-livedata:$lifecycleVersion"
@@ -112,6 +154,7 @@ 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"
@@ -169,6 +212,7 @@ dependencies {
     implementation "io.noties.markwon:recycler-table:$markwonVersion"
     implementation "io.noties.markwon:simple-ext:$markwonVersion"
     implementation "io.noties.markwon:inline-parser:$markwonVersion"
+    implementation "io.noties.markwon:image-glide:$markwonVersion"
     implementation 'com.atlassian.commonmark:commonmark-ext-gfm-tables:0.14.0'
     implementation 'me.saket:better-link-movement-method:2.2.0'
 
@@ -200,3 +244,4 @@ dependencies {
     // debugImplementation because LeakCanary should only run in debug builds.
     //debugImplementation 'com.squareup.leakcanary:leakcanary-android:x.y'
 }
+

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

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

app/src/main/AndroidManifest.xml

@@ -22,8 +22,7 @@
         android:maxSdkVersion="28" />
 
     <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"
@@ -35,6 +34,12 @@
         android:theme="@style/AppTheme"
         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.HistoryActivity"
             android:exported="false"
@@ -402,6 +407,11 @@
             android:label="@string/subscriptions"
             android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
+        <activity
+            android:name=".activities.BlockedThingListingActivity"
+            android:label="@string/blocks"
+            android:parentActivityName=".activities.MainActivity"
+            android:theme="@style/AppTheme.Slidable" />
         <activity
             android:name=".activities.SubredditSelectionActivity"
             android:label="@string/community_selection_activity_label"
@@ -464,7 +474,6 @@
             android:name=".activities.ViewUserDetailActivity"
             android:parentActivityName=".activities.MainActivity"
             android:theme="@style/AppTheme.Slidable" />
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"

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

@@ -2,12 +2,15 @@ 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.CreateMultiRedditActivity;
 import eu.toldi.infinityforlemmy.activities.CustomThemeListingActivity;
@@ -24,6 +27,7 @@ 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;
@@ -65,7 +69,10 @@ 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.BlockedUsersListingFragment;
 import eu.toldi.infinityforlemmy.fragments.CommentsListingFragment;
 import eu.toldi.infinityforlemmy.fragments.FollowedUsersListingFragment;
 import eu.toldi.infinityforlemmy.fragments.HistoryPostFragment;
@@ -73,6 +80,7 @@ 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;
@@ -307,6 +315,17 @@ public interface AppComponent {
 
     void inject(MorePostsInfoFragment morePostsInfoFragment);
 
+    void inject(BlockedThingListingActivity blockedThingListingActivity);
+
+    void inject(BlockedCommunitiesListingFragment blockedCommunitiesListingFragment);
+
+    void inject(BlockedUsersListingFragment blockedUsersListingFragment);
+
+    void inject(CommentMoreBottomSheetFragment commentMoreBottomSheetFragment);
+
+    void inject(PrivateMessageFragment privateMessageFragment);
+
+    void inject(@NotNull InstanceInfoActivity instanceInfoActivity);
 
     @Component.Factory
     interface Factory {

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

@@ -5,7 +5,9 @@ import androidx.annotation.NonNull;
 import java.util.HashMap;
 import java.util.Map;
 
-import eu.toldi.infinityforlemmy.apis.RedditAPI;
+import eu.toldi.infinityforlemmy.apis.LemmyAPI;
+import eu.toldi.infinityforlemmy.dto.DeleteCommentDTO;
+import eu.toldi.infinityforlemmy.dto.DeletePostDTO;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -13,10 +15,11 @@ import retrofit2.Response;
 import retrofit2.Retrofit;
 
 public class DeleteThing {
-    public static void delete(Retrofit oauthRetrofit, String fullname, String accessToken, DeleteThingListener deleteThingListener) {
+
+    public static void deletePost(Retrofit retrofit, int post_id, String accessToken, DeleteThingListener deleteThingListener) {
         Map<String, String> params = new HashMap<>();
-        params.put(APIUtils.ID_KEY, fullname);
-        oauthRetrofit.create(RedditAPI.class).delete(APIUtils.getOAuthHeader(accessToken), params).enqueue(new Callback<String>() {
+        params.put(APIUtils.ID_KEY, String.valueOf(post_id));
+        retrofit.create(LemmyAPI.class).postDelete(new DeletePostDTO(post_id, true, accessToken)).enqueue(new Callback<String>() {
             @Override
             public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
                 if (response.isSuccessful()) {
@@ -33,6 +36,27 @@ public class DeleteThing {
         });
     }
 
+    public static void deleteComment(Retrofit retrofit, int comment_id, String accessToken, DeleteThingListener deleteThingListener) {
+        Map<String, String> params = new HashMap<>();
+        params.put(APIUtils.ID_KEY, String.valueOf(comment_id));
+        retrofit.create(LemmyAPI.class).commentDelete(new DeleteCommentDTO(comment_id, true, accessToken)).enqueue(new Callback<String>() {
+            @Override
+            public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
+                if (response.isSuccessful()) {
+                    deleteThingListener.deleteSuccess();
+                } else {
+                    deleteThingListener.deleteFailed();
+                }
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
+                deleteThingListener.deleteFailed();
+            }
+        });
+    }
+
+
     public interface DeleteThingListener {
         void deleteSuccess();
 

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

@@ -1,7 +1,6 @@
 package eu.toldi.infinityforlemmy;
 
 import android.os.AsyncTask;
-import android.text.Html;
 
 import androidx.annotation.NonNull;
 
@@ -9,9 +8,6 @@ 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;
@@ -83,7 +79,7 @@ public class FetchMyInfo {
                 if (!person.isNull("banner")) {
                     bannerImageUrl = person.getString("banner");
                 }
-                display_name = person.getString("name");
+                display_name = (person.has("display_name")) ? person.getString("display_name") : person.getString("name");
                 redditDataRoomDatabase.accountDao().updateAccountInfo(name, profileImageUrl, bannerImageUrl);
             } catch (JSONException e) {
                 parseFailed = true;

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

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

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

@@ -10,15 +10,14 @@ import javax.inject.Singleton;
 import dagger.Module;
 import dagger.Provides;
 import eu.toldi.infinityforlemmy.apis.StreamableAPI;
-import eu.toldi.infinityforlemmy.network.SortTypeConverterFactory;
+import eu.toldi.infinityforlemmy.privatemessage.LemmyPrivateMessageAPI;
+import eu.toldi.infinityforlemmy.comment.LemmyCommentAPI;
+import eu.toldi.infinityforlemmy.post.LemmyPostAPI;
 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 {
@@ -216,4 +215,22 @@ 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);
+    }
 }

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");
-
-                    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));
+                    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));
 
                 }
             } catch (JSONException e) {

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

@@ -4,10 +4,12 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 
 import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.work.Worker;
@@ -28,13 +30,11 @@ import javax.inject.Named;
 import eu.toldi.infinityforlemmy.account.Account;
 import eu.toldi.infinityforlemmy.activities.InboxActivity;
 import eu.toldi.infinityforlemmy.activities.LinkResolverActivity;
-import eu.toldi.infinityforlemmy.apis.RedditAPI;
+import eu.toldi.infinityforlemmy.apis.LemmyAPI;
+import eu.toldi.infinityforlemmy.comment.Comment;
+import eu.toldi.infinityforlemmy.comment.ParseComment;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
-import eu.toldi.infinityforlemmy.message.FetchMessage;
-import eu.toldi.infinityforlemmy.message.Message;
-import eu.toldi.infinityforlemmy.message.ParseMessage;
-import eu.toldi.infinityforlemmy.utils.APIUtils;
-import eu.toldi.infinityforlemmy.utils.JSONUtils;
+import eu.toldi.infinityforlemmy.message.CommentInteraction;
 import eu.toldi.infinityforlemmy.utils.NotificationUtils;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import retrofit2.Call;
@@ -88,9 +88,16 @@ public class PullNotificationWorker extends Worker {
 
                 if (response != null && response.isSuccessful() && response.body() != null) {
                     String responseBody = response.body();
-                    JSONArray messageArray = new JSONObject(responseBody).getJSONObject(JSONUtils.DATA_KEY).getJSONArray(JSONUtils.CHILDREN_KEY);
-                    ArrayList<Message> messages = ParseMessage.parseMessages(messageArray,
-                            context.getResources().getConfiguration().locale, FetchMessage.MESSAGE_TYPE_NOTIFICATION);
+                    JSONArray messageArray = new JSONObject(responseBody).getJSONArray("replies");
+                    List<CommentInteraction> messages = new ArrayList<>();
+                    for (int i = 0; i < messageArray.length(); i++) {
+                        JSONObject commentInteractionObject = messageArray.getJSONObject(i);
+                        Comment comment = ParseComment.parseSingleComment(commentInteractionObject);
+                        boolean isRead = !commentInteractionObject.getJSONObject("comment_reply").getBoolean("read");
+                        int id = commentInteractionObject.getJSONObject("comment_reply").getInt("id");
+                        messages.add(new CommentInteraction(id, comment, isRead));
+                    }
+
 
                     if (!messages.isEmpty()) {
                         NotificationCompat.Builder summaryBuilder = NotificationUtils.buildSummaryNotification(context,
@@ -110,77 +117,36 @@ public class PullNotificationWorker extends Worker {
 
                         int pendingIntentFlags = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE : PendingIntent.FLAG_UPDATE_CURRENT;
                         for (int messageIndex = messageSize - 1; messageIndex >= 0; messageIndex--) {
-                            Message message = messages.get(messageIndex);
-                            if (message.getTimeUTC() <= lastNotificationTime) {
+                            CommentInteraction message = messages.get(messageIndex);
+                            if (message.getComment().getCommentTimeMillis() <= lastNotificationTime) {
                                 continue;
                             }
 
                             hasValidMessage = true;
 
-                            inboxStyle.addLine(message.getAuthor() + " " + message.getBody());
+                            inboxStyle.addLine(message.getComment().getAuthorQualifiedName() + " " + message.getComment().getCommentMarkdown());
+
+
+                            String title = message.getComment().getAuthorQualifiedName();
+                            String summary = message.getComment().getCommunityQualifiedName();
 
-                            String kind = message.getKind();
-                            String title;
-                            String summary;
-                            if (kind.equals(Message.TYPE_COMMENT) || kind.equals(Message.TYPE_LINK)) {
-                                title = message.getAuthor();
-                                summary = message.getSubject().substring(0, 1).toUpperCase() + message.getSubject().substring(1);
-                            } else {
-                                title = message.getTitle() == null || message.getTitle().equals("") ? message.getSubject() : message.getTitle();
-                                if (kind.equals(Message.TYPE_ACCOUNT)) {
-                                    summary = context.getString(R.string.notification_summary_account);
-                                } else if (kind.equals(Message.TYPE_MESSAGE)) {
-                                    summary = context.getString(R.string.notification_summary_message);
-                                } else if (kind.equals(Message.TYPE_SUBREDDIT)) {
-                                    summary = context.getString(R.string.notification_summary_community);
-                                } else {
-                                    summary = context.getString(R.string.notification_summary_award);
-                                }
-                            }
 
                             NotificationCompat.Builder builder = NotificationUtils.buildNotification(notificationManager,
-                                    context, title, message.getBody(), summary,
+                                    context, title, message.getComment().getCommentMarkdown(), summary,
                                     NotificationUtils.CHANNEL_ID_NEW_MESSAGES,
                                     NotificationUtils.CHANNEL_NEW_MESSAGES,
                                     NotificationUtils.getAccountGroupName(accountName), color);
 
-                            if (kind.equals(Message.TYPE_COMMENT)) {
-                                Intent intent = new Intent(context, LinkResolverActivity.class);
-                                Uri uri = Uri.parse(message.getContext());
-                                intent.setData(uri);
-                                intent.putExtra(LinkResolverActivity.EXTRA_NEW_ACCOUNT_NAME, accountName);
-                                intent.putExtra(LinkResolverActivity.EXTRA_MESSAGE_FULLNAME, message.getFullname());
-                                PendingIntent pendingIntent = PendingIntent.getActivity(context, accountIndex * 6, intent, pendingIntentFlags);
-                                builder.setContentIntent(pendingIntent);
-                            } else if (kind.equals(Message.TYPE_ACCOUNT)) {
-                                Intent intent = new Intent(context, InboxActivity.class);
-                                intent.putExtra(InboxActivity.EXTRA_NEW_ACCOUNT_NAME, accountName);
-                                PendingIntent summaryPendingIntent = PendingIntent.getActivity(context, accountIndex * 6 + 1, intent, pendingIntentFlags);
-                                builder.setContentIntent(summaryPendingIntent);
-                            } else if (kind.equals(Message.TYPE_LINK)) {
-                                Intent intent = new Intent(context, LinkResolverActivity.class);
-                                Uri uri = Uri.parse(message.getContext());
-                                intent.setData(uri);
-                                intent.putExtra(LinkResolverActivity.EXTRA_NEW_ACCOUNT_NAME, accountName);
-                                intent.putExtra(LinkResolverActivity.EXTRA_MESSAGE_FULLNAME, message.getFullname());
-                                PendingIntent pendingIntent = PendingIntent.getActivity(context, accountIndex * 6 + 2, intent, pendingIntentFlags);
-                                builder.setContentIntent(pendingIntent);
-                            } else if (kind.equals(Message.TYPE_MESSAGE)) {
-                                Intent intent = new Intent(context, InboxActivity.class);
-                                intent.putExtra(InboxActivity.EXTRA_NEW_ACCOUNT_NAME, accountName);
-                                intent.putExtra(InboxActivity.EXTRA_VIEW_MESSAGE, true);
-                                PendingIntent summaryPendingIntent = PendingIntent.getActivity(context, accountIndex * 6 + 3, intent, pendingIntentFlags);
-                                builder.setContentIntent(summaryPendingIntent);
-                            } else if (kind.equals(Message.TYPE_SUBREDDIT)) {
-                                Intent intent = new Intent(context, InboxActivity.class);
-                                intent.putExtra(InboxActivity.EXTRA_NEW_ACCOUNT_NAME, accountName);
-                                PendingIntent summaryPendingIntent = PendingIntent.getActivity(context, accountIndex * 6 + 4, intent, pendingIntentFlags);
-                                builder.setContentIntent(summaryPendingIntent);
-                            } else {
-                                Intent intent = new Intent(context, InboxActivity.class);
-                                intent.putExtra(InboxActivity.EXTRA_NEW_ACCOUNT_NAME, accountName);
-                                PendingIntent summaryPendingIntent = PendingIntent.getActivity(context, accountIndex * 6 + 5, intent, pendingIntentFlags);
-                                builder.setContentIntent(summaryPendingIntent);
+                            Intent intent = new Intent(context, LinkResolverActivity.class);
+                            Uri uri = Uri.parse(message.getComment().getPermalink());
+                            intent.setData(uri);
+                            intent.putExtra(LinkResolverActivity.EXTRA_NEW_ACCOUNT_NAME, accountName);
+                            intent.putExtra(LinkResolverActivity.EXTRA_MESSAGE_FULLNAME, message.getId());
+                            PendingIntent pendingIntent = PendingIntent.getActivity(context, accountIndex * 6, intent, pendingIntentFlags);
+                            builder.setContentIntent(pendingIntent);
+
+                            if (ActivityCompat.checkSelfPermission(this.getApplicationContext(), android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
+                                return Result.failure();
                             }
                             notificationManager.notify(NotificationUtils.getNotificationIdUnreadMessage(accountIndex, messageIndex), builder.build());
                         }
@@ -216,10 +182,7 @@ public class PullNotificationWorker extends Worker {
         if (retryCount < 0) {
             return null;
         }
-
-        Call<String> call = mOauthWithoutAuthenticatorRetrofit.create(RedditAPI.class)
-                .getMessages(APIUtils.getOAuthHeader(account.getAccessToken()),
-                        FetchMessage.WHERE_UNREAD, null);
+        Call<String> call = mRetrofit.getRetrofit().create(LemmyAPI.class).userReplies("New", 1, 25, true, account.getAccessToken());
         Response<String> response = call.execute();
 
         if (response.isSuccessful()) {

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

@@ -13,6 +13,10 @@ 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.blockeduser.BlockedUserDao;
+import eu.toldi.infinityforlemmy.blockeduser.BlockedUserData;
 import eu.toldi.infinityforlemmy.customtheme.CustomTheme;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeDao;
 import eu.toldi.infinityforlemmy.multireddit.AnonymousMultiredditSubreddit;
@@ -38,7 +42,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}, version = 23)
+        ReadPost.class, PostFilter.class, PostFilterUsage.class, AnonymousMultiredditSubreddit.class, BlockedUserData.class, BlockedCommunityData.class}, version = 27)
 public abstract class RedditDataRoomDatabase extends RoomDatabase {
 
     public static RedditDataRoomDatabase create(final Context context) {
@@ -49,7 +53,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_21_22, MIGRATION_22_23, MIGRATION_23_24, MIGRATION_24_25, MIGRATION_25_26, MIGRATION_26_27)
                 .build();
     }
 
@@ -59,6 +63,10 @@ public abstract class RedditDataRoomDatabase extends RoomDatabase {
 
     public abstract SubscribedSubredditDao subscribedSubredditDao();
 
+    public abstract BlockedUserDao blockedUserDao();
+
+    public abstract BlockedCommunityDao blockedCommunityDao();
+
     public abstract UserDao userDao();
 
     public abstract SubscribedUserDao subscribedUserDao();
@@ -383,4 +391,37 @@ 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");
+        }
+    };
 }

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

@@ -24,7 +24,11 @@ public class RetrofitHolder {
     }
 
     public String getBaseURL() {
-        return baseURL;
+        String result = baseURL;
+        if (baseURL.endsWith("/")) {
+            result = baseURL.substring(0, baseURL.length() - 1);
+        }
+        return result;
     }
 
     public RetrofitHolder(OkHttpClient okHttpClient) {

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

@@ -43,7 +43,7 @@ public class SortType {
         TOP_TWELVE_HOURS("TopTwelveHour", "Top"),
         TOP_DAY("TopDay", "Top"),
         TOP_WEEK("TopWeek", "Top"),
-        TOP_MONTH("month", "Top"),
+        TOP_MONTH("TopMonth", "Top"),
         TOP_THREE_MONTHS("TopThreeMonths", "Top"),
         TOP_SIX_MONTHS("TopSixMonths", "Top"),
         TOP_NINE_MONTHS("TopNineMonths", "Top"),

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

@@ -32,6 +32,9 @@ 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();
@@ -42,6 +45,7 @@ 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>() {
@@ -58,11 +62,11 @@ public class Account implements Parcelable {
 
     @Ignore
     public static Account getAnonymousAccount() {
-        return new Account("-",null, null, null, null, null, false,null);
+        return new Account("-",null, null, null, null, null, false,null,true);
     }
 
     public Account(@NonNull String accountName, String display_name, String accessToken, String code,
-                   String profileImageUrl, String bannerImageUrl, boolean isCurrentUser,String instance_url) {
+                   String profileImageUrl, String bannerImageUrl, boolean isCurrentUser,String instance_url, boolean canDownvote) {
         this.accountName = accountName;
         this.display_name = display_name;
         this.accessToken = accessToken;
@@ -71,6 +75,7 @@ public class Account implements Parcelable {
         this.bannerImageUrl = bannerImageUrl;
         this.isCurrentUser = isCurrentUser;
         this.instance_url = instance_url;
+        this.canDownvote = canDownvote;
     }
 
     @NonNull
@@ -116,6 +121,10 @@ public class Account implements Parcelable {
         return instance_url;
     }
 
+    public boolean canDownvote() {
+        return canDownvote;
+    }
+
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(accountName);
@@ -126,5 +135,6 @@ 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

@@ -0,0 +1,85 @@
+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.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<>();
+                        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;
+                            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));
+                                }
+                            }
+                            fetchBlockedThingsListener.onFetchBlockedThingsSuccess(blockedUsers, blockedCommunities);
+                        } 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);
+
+        void onFetchBlockedThingsFailure();
+    }
+}

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

@@ -39,6 +39,9 @@ import androidx.viewpager2.widget.ViewPager2;
 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.shape.CornerFamily;
+import com.google.android.material.shape.MaterialShapeDrawable;
+import com.google.android.material.shape.ShapeAppearanceModel;
 import com.google.android.material.tabs.TabLayout;
 
 import java.lang.reflect.Field;
@@ -377,9 +380,18 @@ public abstract class BaseActivity extends AppCompatActivity implements CustomFo
         button.setTextColor(customThemeWrapper.getFABIconColor());
     }
 
-    protected void applyFABTheme(FloatingActionButton fab) {
+    protected void applyFABTheme(FloatingActionButton fab, boolean isCircular) {
         fab.setBackgroundTintList(ColorStateList.valueOf(customThemeWrapper.getColorAccent()));
         fab.setImageTintList(ColorStateList.valueOf(customThemeWrapper.getFABIconColor()));
+        if (isCircular) {
+            ShapeAppearanceModel shapeAppearanceModel = ShapeAppearanceModel.builder()
+                    .setAllCorners(CornerFamily.ROUNDED, 100) // Adjust the radius value to control the roundness
+                    .build();
+
+            // Apply the circular shape to the FAB
+            MaterialShapeDrawable shapeDrawable = new MaterialShapeDrawable(shapeAppearanceModel);
+            fab.setShapeAppearanceModel(shapeAppearanceModel);
+        }
     }
 
     protected void fixViewPager2Sensitivity(ViewPager2 viewPager2) {

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

@@ -0,0 +1,462 @@
+package eu.toldi.infinityforlemmy.activities;
+
+import android.content.Context;
+import android.content.Intent;
+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 androidx.viewpager.widget.ViewPager;
+
+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.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.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 boolean mInsertMultiredditSuccess = false;
+    private boolean showMultiReddits = 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);
+            mInsertMultiredditSuccess = savedInstanceState.getBoolean(INSERT_MULTIREDDIT_STATE);
+        } else {
+            showMultiReddits = getIntent().getBooleanExtra(EXTRA_SHOW_MULTIREDDITS, false);
+        }
+
+        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.setOnClickListener(view -> {
+            Intent intent = new Intent(this, CreateMultiRedditActivity.class);
+            startActivity(intent);
+        });
+        sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+        viewPager.setAdapter(sectionsPagerAdapter);
+        viewPager.setOffscreenPageLimit(2);
+        if (viewPager.getCurrentItem() != 2) {
+            fab.hide();
+        }
+        viewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+            @Override
+            public void onPageSelected(int position) {
+                if (position == 0) {
+                    unlockSwipeRightToGoBack();
+                    fab.hide();
+                } else {
+                    lockSwipeRightToGoBack();
+                    if (position != 2) {
+                        fab.hide();
+                    } else {
+                        fab.show();
+                    }
+                }
+            }
+        });
+        tabLayout.setupWithViewPager(viewPager);
+
+        if (showMultiReddits) {
+            viewPager.setCurrentItem(2, false);
+        }
+
+        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);
+        outState.putBoolean(INSERT_MULTIREDDIT_STATE, mInsertMultiredditSuccess);
+    }
+
+    @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) {
+                    InsertBlockedThings.insertBlockedThings(mExecutor, new Handler(), mRedditDataRoomDatabase, mAccountQualifiedName,
+                            blockedCommunities, blockedUsers, () -> {
+                                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;
+                }
+            }
+        }
+
+        @Override
+        public int getCount() {
+            return 2;
+        }
+
+        @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.multi_reddits));
+            }
+
+            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

@@ -226,7 +226,7 @@ public class CommentActivity extends BaseActivity implements UploadImageEnabledA
 
         setSupportActionBar(binding.commentToolbar);
 
-        mGlide = Glide.with(this);
+        mGlide = Glide.with(getApplication());
 
         if (savedInstanceState != null) {
             selectedAccount = savedInstanceState.getParcelable(SELECTED_ACCOUNT_STATE);
@@ -513,8 +513,8 @@ public class CommentActivity extends BaseActivity implements UploadImageEnabledA
         int start = Math.max(binding.commentCommentEditText.getSelectionStart(), 0);
         int end = Math.max(binding.commentCommentEditText.getSelectionEnd(), 0);
         binding.commentCommentEditText.getText().replace(Math.min(start, end), Math.max(start, end),
-                "[" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
-                0, "[]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
+                "![" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
+                0, "![]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
     }
 
     @Override

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

@@ -51,6 +51,7 @@ import eu.toldi.infinityforlemmy.customtheme.CustomThemeViewModel;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.events.RecreateActivityEvent;
 import eu.toldi.infinityforlemmy.utils.CustomThemeSharedPreferencesUtils;
+import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
 
 public class CustomThemeListingActivity extends BaseActivity implements
@@ -154,7 +155,7 @@ public class CustomThemeListingActivity extends BaseActivity implements
     @Override
     protected void applyCustomTheme() {
         applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, collapsingToolbarLayout, toolbar);
-        applyFABTheme(fab);
+        applyFABTheme(fab, sharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
     }
 
     @Override

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

@@ -345,7 +345,7 @@ public class EditCommentActivity extends BaseActivity implements UploadImageEnab
         int start = Math.max(contentEditText.getSelectionStart(), 0);
         int end = Math.max(contentEditText.getSelectionEnd(), 0);
         contentEditText.getText().replace(Math.min(start, end), Math.max(start, end),
-                "[" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
-                0, "[]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
+                "![" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
+                0, "![]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
     }
 }

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

@@ -3,16 +3,20 @@ package eu.toldi.infinityforlemmy.activities;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.provider.MediaStore;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -22,18 +26,22 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.content.FileProvider;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.RequestManager;
 import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.snackbar.Snackbar;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
+import org.json.JSONException;
+import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 
 import javax.inject.Inject;
@@ -47,14 +55,16 @@ 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.apis.RedditAPI;
+import eu.toldi.infinityforlemmy.apis.LemmyAPI;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.UploadedImagesBottomSheetFragment;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.customviews.LinearLayoutManagerBugFixed;
 import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
+import eu.toldi.infinityforlemmy.dto.EditPostDTO;
 import eu.toldi.infinityforlemmy.events.SwitchAccountEvent;
-import eu.toldi.infinityforlemmy.utils.APIUtils;
+import eu.toldi.infinityforlemmy.post.Post;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
+import eu.toldi.infinityforlemmy.utils.UploadImageUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -63,16 +73,19 @@ import retrofit2.Retrofit;
 
 public class EditPostActivity extends BaseActivity implements UploadImageEnabledActivity {
 
-    public static final String EXTRA_TITLE = "ET";
-    public static final String EXTRA_CONTENT = "EC";
-    public static final String EXTRA_FULLNAME = "EF";
+    public static final String EXTRA_DATA = "ED";
 
+
+    private static final int UPLOAD_IMAGE_REQUEST_CODE = 1;
     private static final int PICK_IMAGE_REQUEST_CODE = 100;
     private static final int CAPTURE_IMAGE_REQUEST_CODE = 200;
     private static final int MARKDOWN_PREVIEW_REQUEST_CODE = 300;
 
     private static final String UPLOADED_IMAGES_STATE = "UIS";
 
+    private static final String picturePattern = "https:\\/\\/[^\\/]+\\/pictrs\\/image\\/([a-f\\d-]+\\.jpeg)";
+
+
     @BindView(R.id.coordinator_layout_edit_post_activity)
     CoordinatorLayout coordinatorLayout;
     @BindView(R.id.appbar_layout_edit_post_activity)
@@ -87,6 +100,15 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
     EditText contentEditText;
     @BindView(R.id.markdown_bottom_bar_recycler_view_edit_post_activity)
     RecyclerView markdownBottomBarRecyclerView;
+    @BindView(R.id.post_link_edit_text_post_edit_activity)
+    EditText linkEditText;
+
+    @BindView(R.id.upload_image_button_post_edit_activity)
+    MaterialButton uploadImageButton;
+
+    @BindView(R.id.image_view_post_edit_activity)
+    ImageView imageView;
+
     @Inject
     @Named("no_oauth")
     RetrofitHolder mRetrofit;
@@ -103,13 +125,16 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
     CustomThemeWrapper mCustomThemeWrapper;
     @Inject
     Executor mExecutor;
-    private String mFullName;
+    private Post mPost;
+
     private String mAccessToken;
-    private String mPostContent;
     private boolean isSubmitting = false;
     private Uri capturedImageUri;
     private ArrayList<UploadedImage> uploadedImages = new ArrayList<>();
 
+
+    private RequestManager mGlide;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         ((Infinity) getApplication()).getAppComponent().inject(this);
@@ -137,11 +162,49 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        mFullName = getIntent().getStringExtra(EXTRA_FULLNAME);
+        mPost = getIntent().getParcelableExtra(EXTRA_DATA);
+        if (mPost == null) {
+            finish();
+        }
+
         mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
-        titleEditText.setText(getIntent().getStringExtra(EXTRA_TITLE));
-        mPostContent = getIntent().getStringExtra(EXTRA_CONTENT);
-        contentEditText.setText(mPostContent);
+        titleEditText.setText(mPost.getTitle());
+        contentEditText.setText(mPost.getSelfText());
+        linkEditText.setText(mPost.getUrl());
+
+        mGlide = Glide.with(getApplication());
+
+        if (mPost.getUrl() != null && mPost.getUrl().matches(picturePattern)) {
+            loadImage();
+        }
+
+        linkEditText.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) {
+                if (charSequence.toString().matches(picturePattern)) {
+                    loadImage();
+                } else {
+                    uploadImageButton.setVisibility(View.VISIBLE);
+                    imageView.setVisibility(View.GONE);
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+            }
+        });
+
+        uploadImageButton.setOnClickListener(view -> {
+            Intent intent = new Intent();
+            intent.setType("image/*");
+            intent.setAction(Intent.ACTION_GET_CONTENT);
+            startActivityForResult(Intent.createChooser(intent, getString(R.string.select_from_gallery)), UPLOAD_IMAGE_REQUEST_CODE);
+        });
+
 
         if (savedInstanceState != null) {
             uploadedImages = savedInstanceState.getParcelableArrayList(UPLOADED_IMAGES_STATE);
@@ -192,7 +255,10 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
         titleEditText.setTextColor(mCustomThemeWrapper.getPostTitleColor());
         divider.setBackgroundColor(mCustomThemeWrapper.getPostTitleColor());
         contentEditText.setTextColor(mCustomThemeWrapper.getPostContentColor());
+        linkEditText.setTextColor(mCustomThemeWrapper.getPostContentColor());
 
+        uploadImageButton.setTextColor(mCustomThemeWrapper.getButtonTextColor());
+        uploadImageButton.setBackgroundColor(mCustomThemeWrapper.getColorPrimaryLightTheme());
         if (titleTypeface != null) {
             titleEditText.setTypeface(titleTypeface);
         }
@@ -201,6 +267,12 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
         }
     }
 
+    private void loadImage() {
+        uploadImageButton.setVisibility(View.GONE);
+        imageView.setVisibility(View.VISIBLE);
+        mGlide.load(mPost.getUrl()).into(imageView);
+    }
+
     @Override
     protected void onPause() {
         super.onPause();
@@ -236,21 +308,19 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
             isSubmitting = true;
 
             Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_SHORT).show();
-
-            Map<String, String> params = new HashMap<>();
-            params.put(APIUtils.THING_ID_KEY, mFullName);
-            params.put(APIUtils.TEXT_KEY, contentEditText.getText().toString());
-
-            mRetrofit.getRetrofit().create(RedditAPI.class)
-                    .editPostOrComment(APIUtils.getOAuthHeader(mAccessToken), params)
+            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))
                     .enqueue(new Callback<String>() {
                         @Override
                         public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
                             isSubmitting = false;
-                            Toast.makeText(EditPostActivity.this, R.string.edit_success, Toast.LENGTH_SHORT).show();
-                            Intent returnIntent = new Intent();
-                            setResult(RESULT_OK, returnIntent);
-                            finish();
+                            if (response.isSuccessful()) {
+                                Toast.makeText(EditPostActivity.this, R.string.edit_success, Toast.LENGTH_SHORT).show();
+                                Intent returnIntent = new Intent();
+                                setResult(RESULT_OK, returnIntent);
+                                finish();
+                            } else {
+                                Snackbar.make(coordinatorLayout, R.string.post_failed, Snackbar.LENGTH_SHORT).show();
+                            }
                         }
 
                         @Override
@@ -274,6 +344,39 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
                 }
                 Utils.uploadImageToReddit(this, mExecutor, mRetrofit,
                         mAccessToken, contentEditText, coordinatorLayout, data.getData(), uploadedImages);
+            } else if (requestCode == UPLOAD_IMAGE_REQUEST_CODE) {
+                if (data == null) {
+                    Snackbar.make(coordinatorLayout, R.string.error_getting_image, Snackbar.LENGTH_SHORT).show();
+                    return;
+                }
+                Toast.makeText(this, R.string.uploading_image, Toast.LENGTH_SHORT).show();
+                Handler handler = new Handler();
+                Uri imageUri = data.getData();
+                mExecutor.execute(() -> {
+                    try {
+                        Bitmap bitmap = Glide.with(getApplication()).asBitmap().load(imageUri).submit().get();
+                        String imageUrlOrError = UploadImageUtils.uploadImage(mRetrofit, mAccessToken, bitmap);
+                        handler.post(() -> {
+                            if (imageUrlOrError != null && !imageUrlOrError.startsWith("Error: ")) {
+                                String fileName = Utils.getFileName(this, imageUri);
+                                if (fileName == null) {
+                                    fileName = imageUrlOrError;
+                                }
+                                mPost.setUrl(imageUrlOrError);
+                                linkEditText.setText(imageUrlOrError);
+                                Snackbar.make(coordinatorLayout, R.string.upload_image_success, Snackbar.LENGTH_LONG).show();
+                            } else {
+                                Toast.makeText(this, R.string.upload_image_failed, Toast.LENGTH_LONG).show();
+                            }
+                        });
+                    } catch (ExecutionException | InterruptedException e) {
+                        e.printStackTrace();
+                        handler.post(() -> Toast.makeText(this, R.string.get_image_bitmap_failed, Toast.LENGTH_LONG).show());
+                    } catch (XmlPullParserException | JSONException | IOException e) {
+                        e.printStackTrace();
+                        handler.post(() -> Toast.makeText(this, R.string.error_processing_image, Toast.LENGTH_LONG).show());
+                    }
+                });
             } else if (requestCode == CAPTURE_IMAGE_REQUEST_CODE) {
                 Utils.uploadImageToReddit(this, mExecutor, mRetrofit,
                         mAccessToken, contentEditText, coordinatorLayout, capturedImageUri, uploadedImages);
@@ -281,6 +384,7 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
                 editPost();
             }
         }
+
     }
 
     @Override
@@ -304,7 +408,7 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
         if (isSubmitting) {
             promptAlertDialog(R.string.exit_when_submit, R.string.exit_when_edit_post_detail);
         } else {
-            if (contentEditText.getText().toString().equals(mPostContent)) {
+            if (contentEditText.getText().toString().equals(mPost.getSelfText())) {
                 finish();
             } else {
                 promptAlertDialog(R.string.discard, R.string.discard_detail);
@@ -352,7 +456,7 @@ public class EditPostActivity extends BaseActivity implements UploadImageEnabled
         int start = Math.max(contentEditText.getSelectionStart(), 0);
         int end = Math.max(contentEditText.getSelectionEnd(), 0);
         contentEditText.getText().replace(Math.min(start, end), Math.max(start, end),
-                "[" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
-                0, "[]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
+                "![" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
+                0, "![]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
     }
 }

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

@@ -38,7 +38,6 @@ 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;
@@ -52,6 +51,7 @@ 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(this);
+        final RequestManager glide = Glide.with(getApplication());
         final UserViewModel.Factory userViewModelFactory =
                 new UserViewModel.Factory(getApplication(), mRedditDataRoomDatabase, mAccountName);
         final UserViewModel userViewModel =

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

@@ -265,14 +265,14 @@ public class FilteredPostsActivity extends BaseActivity implements SortTypeSelec
     protected void applyCustomTheme() {
         coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
         applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, collapsingToolbarLayout, toolbar);
-        applyFABTheme(fab);
+        applyFABTheme(fab, mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
     }
 
     private void bindView(PostFilter postFilter, boolean initializeFragment) {
         switch (postType) {
             case PostPagingSource.TYPE_FRONT_PAGE:
             case PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE:
-                getSupportActionBar().setTitle(R.string.home);
+                getSupportActionBar().setTitle(R.string.subscribed_feed);
                 break;
             case PostPagingSource.TYPE_SEARCH:
                 getSupportActionBar().setTitle(R.string.search);

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

@@ -29,12 +29,6 @@ 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;
@@ -45,6 +39,12 @@ 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 {
 

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

@@ -47,7 +47,6 @@ import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.RecyclerViewContentScrollingInterface;
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
 import eu.toldi.infinityforlemmy.RetrofitHolder;
-import eu.toldi.infinityforlemmy.apis.RedditAPI;
 import eu.toldi.infinityforlemmy.asynctasks.SwitchAccount;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
@@ -56,14 +55,12 @@ 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.Message;
-import eu.toldi.infinityforlemmy.utils.APIUtils;
+import eu.toldi.infinityforlemmy.message.ReadMessage;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
 
 public class InboxActivity extends BaseActivity implements ActivityToolbarInterface, RecyclerViewContentScrollingInterface {
 
@@ -184,7 +181,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;
                 }
@@ -197,7 +194,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)
@@ -229,7 +226,7 @@ public class InboxActivity extends BaseActivity implements ActivityToolbarInterf
         mCoordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
         applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(mAppBarLayout, mCollapsingToolbarLayout, mToolbar);
         applyTabLayoutTheme(tabLayout);
-        applyFABTheme(fab);
+        applyFABTheme(fab, mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
     }
 
     private void getCurrentAccountAndFetchMessage(Bundle savedInstanceState) {
@@ -268,13 +265,16 @@ public class InboxActivity extends BaseActivity implements ActivityToolbarInterf
             }
         });
         viewPager2.setAdapter(sectionsPagerAdapter);
-        viewPager2.setOffscreenPageLimit(2);
+        viewPager2.setOffscreenPageLimit(3);
         new TabLayoutMediator(tabLayout, viewPager2, (tab, position) -> {
             switch (position) {
                 case 0:
-                    Utils.setTitleWithCustomFontToTab(typeface, tab, getString(R.string.notifications));
+                    Utils.setTitleWithCustomFontToTab(typeface, tab, getString(R.string.replies));
                     break;
                 case 1:
+                    Utils.setTitleWithCustomFontToTab(typeface, tab, getString(R.string.mentions));
+                    break;
+                case 2:
                     Utils.setTitleWithCustomFontToTab(typeface, tab, getString(R.string.messages));
                     break;
             }
@@ -302,31 +302,21 @@ public class InboxActivity extends BaseActivity implements ActivityToolbarInterf
             return true;
         } else if (item.getItemId() == R.id.action_read_all_messages_inbox_activity) {
             if (mAccessToken != null) {
-                Toast.makeText(this, R.string.please_wait, Toast.LENGTH_SHORT).show();
-                mRetrofit.getRetrofit().create(RedditAPI.class).readAllMessages(APIUtils.getOAuthHeader(mAccessToken))
-                        .enqueue(new Callback<>() {
-                            @Override
-                            public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
-                                if (response.isSuccessful()) {
-                                    Toast.makeText(InboxActivity.this, R.string.read_all_messages_success, Toast.LENGTH_SHORT).show();
-                                    if (sectionsPagerAdapter != null) {
-                                        sectionsPagerAdapter.readAllMessages();
-                                    }
-                                    EventBus.getDefault().post(new ChangeInboxCountEvent(0));
-                                } else {
-                                    if (response.code() == 429) {
-                                        Toast.makeText(InboxActivity.this, R.string.read_all_messages_time_limit, Toast.LENGTH_LONG).show();
-                                    } else {
-                                        Toast.makeText(InboxActivity.this, R.string.read_all_messages_failed, Toast.LENGTH_LONG).show();
-                                    }
-                                }
-                            }
+                ReadMessage.readAllMessages(mRetrofit.getRetrofit(), mAccessToken, new ReadMessage.ReadMessageListener() {
+                    @Override
+                    public void readSuccess() {
+                        Toast.makeText(InboxActivity.this, R.string.read_all_messages_success, Toast.LENGTH_SHORT).show();
+                        if (sectionsPagerAdapter != null) {
+                            sectionsPagerAdapter.readAllMessages();
+                        }
+                        EventBus.getDefault().post(new ChangeInboxCountEvent(0));
+                    }
 
-                            @Override
-                            public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
-                                Toast.makeText(InboxActivity.this, R.string.read_all_messages_failed, Toast.LENGTH_LONG).show();
-                            }
-                        });
+                    @Override
+                    public void readFailed() {
+
+                    }
+                });
             }
         } else if (item.getItemId() == android.R.id.home) {
             finish();
@@ -341,7 +331,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);
         }
     }
@@ -438,7 +428,7 @@ public class InboxActivity extends BaseActivity implements ActivityToolbarInterf
             }
         }
 
-        Message getPrivateMessage(int index) {
+        CommentInteraction getPrivateMessage(int index) {
             if (viewPager2 == null || fragmentManager == null) {
                 return null;
             }
@@ -452,26 +442,27 @@ public class InboxActivity extends BaseActivity implements ActivityToolbarInterf
         @NonNull
         @Override
         public Fragment createFragment(int position) {
-            if (position == 0) {
-                InboxFragment fragment = new InboxFragment();
-                Bundle bundle = new Bundle();
-                bundle.putString(InboxFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                bundle.putString(InboxFragment.EXTRA_MESSAGE_WHERE, FetchMessage.WHERE_INBOX);
-                fragment.setArguments(bundle);
-                return fragment;
-            } else {
-                InboxFragment fragment = new InboxFragment();
-                Bundle bundle = new Bundle();
-                bundle.putString(InboxFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
-                bundle.putString(InboxFragment.EXTRA_MESSAGE_WHERE, FetchMessage.WHERE_MESSAGES);
-                fragment.setArguments(bundle);
-                return fragment;
+            Fragment fragment = new InboxFragment();
+            Bundle bundle = new Bundle();
+            bundle.putString(InboxFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
+            switch (position) {
+                case 0:
+                    bundle.putString(InboxFragment.EXTRA_MESSAGE_WHERE, FetchMessage.WHERE_REPLIES);
+                    break;
+                case 1:
+                    bundle.putString(InboxFragment.EXTRA_MESSAGE_WHERE, FetchMessage.WHERE_MENTIONS);
+                    break;
+                case 2:
+                    fragment = new PrivateMessageFragment();
+                    break;
             }
+            fragment.setArguments(bundle);
+            return fragment;
         }
 
         @Override
         public int getItemCount() {
-            return 2;
+            return 3;
         }
     }
 }

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

@@ -0,0 +1,228 @@
+package eu.toldi.infinityforlemmy.activities;
+
+import android.content.SharedPreferences;
+import android.graphics.PorterDuff;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+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.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.card.MaterialCardView;
+
+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.adapters.AdminRecyclerViewAdapter;
+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.FetchSiteInfo;
+import eu.toldi.infinityforlemmy.site.SiteInfo;
+import eu.toldi.infinityforlemmy.site.SiteStatistics;
+import eu.toldi.infinityforlemmy.user.BasicUserInfo;
+import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
+import io.noties.markwon.AbstractMarkwonPlugin;
+import io.noties.markwon.Markwon;
+import io.noties.markwon.recycler.MarkwonAdapter;
+
+public class InstanceInfoActivity extends BaseActivity {
+
+    @Inject
+    @Named("default")
+    SharedPreferences mSharedPreferences;
+
+    @Inject
+    CustomThemeWrapper mCustomThemeWrapper;
+
+    @Inject
+    @Named("no_oauth")
+    RetrofitHolder mRetorifitHolder;
+
+    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;
+
+    @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);
+
+        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();
+        mPostDetailMarkwon = MarkdownUtils.createFullRedditMarkwon(this,
+                new AbstractMarkwonPlugin() {
+                }, markdownColor, postSpoilerBackgroundColor, null);
+        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(mRetorifitHolder.getRetrofit(), null, new FetchSiteInfo.FetchSiteInfoListener() {
+            @Override
+            public void onFetchSiteInfoSuccess(SiteInfo siteInfo) {
+                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() {
+
+            }
+        });
+    }
+
+    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);
+        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
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return false;
+    }
+}

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

@@ -79,9 +79,9 @@ public class LinkResolverActivity extends AppCompatActivity {
 
     private Uri getRedditUriByPath(String path) {
         if (path.charAt(0) != '/') {
-            return Uri.parse("https://www.reddit.com/" + path);
+            return Uri.parse(mRetrofit.getBaseURL() + path);
         } else {
-            return Uri.parse("https://www.reddit.com" + path);
+            return Uri.parse(mRetrofit.getBaseURL() + path);
         }
     }
 
@@ -91,6 +91,10 @@ public class LinkResolverActivity extends AppCompatActivity {
 
         ((Infinity) getApplication()).getAppComponent().inject(this);
         mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
+        if (mAccessToken != null) {
+            String instance = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_INSTANCE, null);
+            mRetrofit.setBaseURL(instance);
+        }
 
         Uri uri = getIntent().getData();
         if (uri == null) {
@@ -227,6 +231,7 @@ 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);
                                     }
 
@@ -246,6 +251,7 @@ 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);
                                     }
 

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

@@ -6,6 +6,7 @@ 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;
@@ -26,6 +27,8 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.concurrent.Executor;
 
 import javax.inject.Inject;
@@ -43,6 +46,8 @@ 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.site.FetchSiteInfo;
+import eu.toldi.infinityforlemmy.site.SiteInfo;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
 import retrofit2.Call;
@@ -137,15 +142,18 @@ public class LoginActivity extends BaseActivity {
 
         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());
-            if (!Patterns.WEB_URL.matcher(instance).matches()) {
-                instance_input.setError("Invalid instance URL");
+            try {
+                URL urlObj = new URL(instance);
+                instance = urlObj.getProtocol() + "://" + urlObj.getHost() + "/";
+            } catch (MalformedURLException e) {
+                instance_input.setError("Invalid 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);
@@ -153,6 +161,7 @@ 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) {
@@ -176,17 +185,35 @@ public class LoginActivity extends BaseActivity {
                                     accessToken, new FetchMyInfo.FetchMyInfoListener() {
                                         @Override
                                         public void onFetchMyInfoSuccess(String name, String display_name, String profileImageUrl, String bannerImageUrl) {
+                                            FetchSiteInfo.fetchSiteInfo(mRetrofit.getRetrofit(), accessToken, new FetchSiteInfo.FetchSiteInfoListener() {
+                                                @Override
+                                                public void onFetchSiteInfoSuccess(SiteInfo siteInfo) {
+                                                    boolean canDownvote = siteInfo.isEnable_downvotes();
+                                                    ParseAndInsertNewAccount.parseAndInsertNewAccount(mExecutor, new Handler(), name,display_name, accessToken,  profileImageUrl, bannerImageUrl, authCode, finalInstance,canDownvote, mRedditDataRoomDatabase.accountDao(),
+                                                            () -> {
+                                                                Intent resultIntent = new Intent();
+                                                                setResult(Activity.RESULT_OK, resultIntent);
+                                                                finish();
+                                                            });
+                                                    mCurrentAccountSharedPreferences.edit().putBoolean(SharedPreferencesUtils.CAN_DOWNVOTE, canDownvote).apply();
+                                                }
+
+                                                @Override
+                                                public void onFetchSiteInfoFailed() {
+                                                    ParseAndInsertNewAccount.parseAndInsertNewAccount(mExecutor, new Handler(), name,display_name, accessToken,  profileImageUrl, bannerImageUrl, authCode, finalInstance,true, mRedditDataRoomDatabase.accountDao(),
+                                                            () -> {
+                                                                Intent resultIntent = new Intent();
+                                                                setResult(Activity.RESULT_OK, resultIntent);
+                                                                finish();
+                                                            });
+                                                    mCurrentAccountSharedPreferences.edit().putBoolean(SharedPreferencesUtils.CAN_DOWNVOTE, true).apply();
+                                                }
+                                            });
                                             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_INSTANCE,finalInstance)
                                                     .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
@@ -240,6 +267,26 @@ 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");

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

@@ -107,6 +107,7 @@ import eu.toldi.infinityforlemmy.events.ChangeLockBottomAppBarEvent;
 import eu.toldi.infinityforlemmy.events.ChangeNSFWEvent;
 import eu.toldi.infinityforlemmy.events.ChangeRequireAuthToAccountSectionEvent;
 import eu.toldi.infinityforlemmy.events.ChangeShowAvatarOnTheRightInTheNavigationDrawerEvent;
+import eu.toldi.infinityforlemmy.events.ChangeUseCircularFabEvent;
 import eu.toldi.infinityforlemmy.events.RecreateActivityEvent;
 import eu.toldi.infinityforlemmy.events.SwitchAccountEvent;
 import eu.toldi.infinityforlemmy.fragments.PostFragment;
@@ -230,9 +231,11 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
     private boolean mFetchUserInfoSuccess = false;
     private boolean mFetchSubscriptionsSuccess = false;
     private boolean mDrawerOnAccountSwitch = false;
-    private String mMessageFullname;
+    private int mMessageFullname;
     private String mNewAccountName;
     private boolean hideFab;
+
+    private boolean useCircularFab;
     private boolean showBottomAppBar;
     private int mBackButtonAction;
     private boolean mLockBottomAppBar;
@@ -259,6 +262,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
         ButterKnife.bind(this);
 
         hideFab = mSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_FAB_IN_POST_FEED, false);
+        useCircularFab = mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, 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),
@@ -344,11 +348,11 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
             mFetchUserInfoSuccess = savedInstanceState.getBoolean(FETCH_USER_INFO_STATE);
             mFetchSubscriptionsSuccess = savedInstanceState.getBoolean(FETCH_SUBSCRIPTIONS_STATE);
             mDrawerOnAccountSwitch = savedInstanceState.getBoolean(DRAWER_ON_ACCOUNT_SWITCH_STATE);
-            mMessageFullname = savedInstanceState.getString(MESSAGE_FULLNAME_STATE);
+            mMessageFullname = savedInstanceState.getInt(MESSAGE_FULLNAME_STATE);
             mNewAccountName = savedInstanceState.getString(NEW_ACCOUNT_NAME_STATE);
             inboxCount = savedInstanceState.getInt(INBOX_COUNT_STATE);
         } else {
-            mMessageFullname = getIntent().getStringExtra(EXTRA_MESSSAGE_FULLNAME);
+            mMessageFullname = getIntent().getIntExtra(EXTRA_MESSSAGE_FULLNAME, 0);
             mNewAccountName = getIntent().getStringExtra(EXTRA_NEW_ACCOUNT_NAME);
         }
 
@@ -385,7 +389,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
         navigationView.setBackgroundColor(backgroundColor);
         applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, collapsingToolbarLayout, toolbar);
         applyTabLayoutTheme(tabLayout);
-        applyFABTheme(navigationWrapper.floatingActionButton);
+        applyFABTheme(navigationWrapper.floatingActionButton, useCircularFab);
     }
 
     private void initializeNotificationAndBindView() {
@@ -477,7 +481,6 @@ 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;
             }
@@ -804,17 +807,17 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
 
         adapter = new NavigationDrawerRecyclerViewMergedAdapter(this, mSharedPreferences,
                 mNsfwAndSpoilerSharedPreferences, mNavigationDrawerSharedPreferences, mSecuritySharedPreferences,
-                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) {
+                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) {
                             intent = new Intent(MainActivity.this, SubscribedThingListingActivity.class);
                             intent.putExtra(SubscribedThingListingActivity.EXTRA_SHOW_MULTIREDDITS, true);
                         } else if (stringId == R.string.history) {
@@ -879,7 +882,11 @@ 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);
                         }
@@ -927,7 +934,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.home)));
+                        Utils.setTitleWithCustomFontToTab(typeface, tab, mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_1_TITLE, getString(R.string.subscribed_feed)));
                         break;
                     case 1:
                         Utils.setTitleWithCustomFontToTab(typeface, tab, mMainActivityTabsSharedPreferences.getString((mAccountName == null ? "" : mAccountName) + SharedPreferencesUtils.MAIN_PAGE_TAB_2_TITLE, getString(R.string.local)));
@@ -1006,12 +1013,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);
@@ -1025,11 +1032,11 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
         loadUserData();
 
         if (mAccessToken != null) {
-            if (mMessageFullname != null) {
+            if (mMessageFullname != 0) {
                 ReadMessage.readMessage(mOauthRetrofit, mAccessToken, mMessageFullname, new ReadMessage.ReadMessageListener() {
                     @Override
                     public void readSuccess() {
-                        mMessageFullname = null;
+                        mMessageFullname = 0;
                     }
 
                     @Override
@@ -1072,20 +1079,29 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
 
     private void loadUserData() {
         if (!mFetchUserInfoSuccess) {
-            FetchUserData.fetchUserData(mRedditDataRoomDatabase, mRetrofit.getRetrofit(), mAccessToken,
-                    mAccountName, new FetchUserData.FetchUserDataListener() {
+            FetchUserData.fetchUnreadCount(mRetrofit.getRetrofit(), mAccessToken, new FetchUserData.FetchUserUnreadCountListener() {
                 @Override
-                public void onFetchUserDataSuccess(UserData userData, int inboxCount) {
+                public void onFetchUserUnreadCountSuccess(int inboxCount) {
                     MainActivity.this.inboxCount = inboxCount;
-                    mAccountName = userData.getName();
-                    mFetchUserInfoSuccess = true;
                     if (adapter != null) {
                         adapter.setInboxCount(inboxCount);
                     }
                 }
 
                 @Override
-                public void onFetchUserDataFailed() {
+                public void onFetchUserUnreadCountFailed() {
+                }
+            });
+            FetchUserData.fetchUserData(mRedditDataRoomDatabase, mRetrofit.getRetrofit(), mAccessToken,
+                    mAccountName, new FetchUserData.FetchUserDataListener() {
+                        @Override
+                        public void onFetchUserDataSuccess(UserData userData, int inboxCount) {
+                            mAccountName = userData.getName();
+                            mFetchUserInfoSuccess = true;
+                        }
+
+                        @Override
+                        public void onFetchUserDataFailed() {
                     mFetchUserInfoSuccess = false;
                 }
             });
@@ -1177,7 +1193,7 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
         outState.putBoolean(FETCH_USER_INFO_STATE, mFetchUserInfoSuccess);
         outState.putBoolean(FETCH_SUBSCRIPTIONS_STATE, mFetchSubscriptionsSuccess);
         outState.putBoolean(DRAWER_ON_ACCOUNT_SWITCH_STATE, mDrawerOnAccountSwitch);
-        outState.putString(MESSAGE_FULLNAME_STATE, mMessageFullname);
+        outState.putInt(MESSAGE_FULLNAME_STATE, mMessageFullname);
         outState.putString(NEW_ACCOUNT_NAME_STATE, mNewAccountName);
         outState.putInt(INBOX_COUNT_STATE, inboxCount);
     }
@@ -1336,6 +1352,12 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
         navigationWrapper.floatingActionButton.setVisibility(hideFab ? View.GONE : View.VISIBLE);
     }
 
+    @Subscribe
+    public void onChangeUseCircularFab(ChangeUseCircularFabEvent event) {
+        useCircularFab = event.isUseCircularFab();
+        applyFABTheme(navigationWrapper.floatingActionButton, useCircularFab);
+    }
+
     @Override
     public void onLongPress() {
         if (sectionsPagerAdapter != null) {
@@ -1381,10 +1403,6 @@ 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();

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

@@ -33,6 +33,7 @@ import eu.toldi.infinityforlemmy.post.Post;
 import eu.toldi.infinityforlemmy.postfilter.DeletePostFilter;
 import eu.toldi.infinityforlemmy.postfilter.PostFilter;
 import eu.toldi.infinityforlemmy.postfilter.PostFilterViewModel;
+import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 
 public class PostFilterPreferenceActivity extends BaseActivity {
 
@@ -205,7 +206,7 @@ public class PostFilterPreferenceActivity extends BaseActivity {
     @Override
     protected void applyCustomTheme() {
         applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, collapsingToolbarLayout, toolbar);
-        applyFABTheme(fab);
+        applyFABTheme(fab, sharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
         coordinatorLayout.setBackgroundColor(customThemeWrapper.getBackgroundColor());
     }
 

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

@@ -39,6 +39,7 @@ import eu.toldi.infinityforlemmy.postfilter.PostFilter;
 import eu.toldi.infinityforlemmy.postfilter.PostFilterUsage;
 import eu.toldi.infinityforlemmy.postfilter.PostFilterUsageViewModel;
 import eu.toldi.infinityforlemmy.postfilter.SavePostFilterUsage;
+import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
 
 public class PostFilterUsageListingActivity extends BaseActivity {
@@ -206,7 +207,7 @@ public class PostFilterUsageListingActivity extends BaseActivity {
     @Override
     protected void applyCustomTheme() {
         applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, collapsingToolbarLayout, toolbar);
-        applyFABTheme(fab);
+        applyFABTheme(fab, sharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
         coordinatorLayout.setBackgroundColor(customThemeWrapper.getBackgroundColor());
     }
 }

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(this);
+        mGlide = Glide.with(getApplication());
 
         mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE);
 

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(this);
+        mGlide = Glide.with(getApplication());
 
         mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE);
 
@@ -475,8 +475,9 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
         nsfwTextView.setTextColor(primaryTextColor);
         titleEditText.setTextColor(primaryTextColor);
         titleEditText.setHintTextColor(secondaryTextColor);
-        applyFABTheme(captureFab);
-        applyFABTheme(selectFromLibraryFab);
+        boolean circleFab = mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false);
+        applyFABTheme(captureFab, circleFab);
+        applyFABTheme(selectFromLibraryFab, circleFab);
         selectAgainTextView.setTextColor(mCustomThemeWrapper.getColorAccent());
         if (typeface != null) {
             subredditNameTextView.setTypeface(typeface);
@@ -510,7 +511,7 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
     }
 
     private void loadSubredditIcon() {
-        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, subredditName, mAccessToken, mOauthRetrofit, mRetrofit.getRetrofit(), iconImageUrl -> {
+        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, communityData.getQualified_name(), mAccessToken, mOauthRetrofit, mRetrofit.getRetrofit(), iconImageUrl -> {
             iconUrl = iconImageUrl;
             displaySubredditIcon();
             loadSubredditIconSuccessful = true;
@@ -791,7 +792,7 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
         int start = Math.max(contentEditText.getSelectionStart(), 0);
         int end = Math.max(contentEditText.getSelectionEnd(), 0);
         contentEditText.getText().replace(Math.min(start, end), Math.max(start, end),
-                "[" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
-                0, "[]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
+                "![" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
+                0, "![]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
     }
 }

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(this);
+        mGlide = Glide.with(getApplication());
 
         mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE);
 
@@ -488,7 +488,7 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
     }
 
     private void loadSubredditIcon() {
-        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, subredditName,
+        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, communityData.getQualified_name(),
                 mAccessToken, mOauthRetrofit, mRetrofit.getRetrofit(), iconImageUrl -> {
                     iconUrl = iconImageUrl;
                     displaySubredditIcon();
@@ -722,7 +722,7 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
         int start = Math.max(contentEditText.getSelectionStart(), 0);
         int end = Math.max(contentEditText.getSelectionEnd(), 0);
         contentEditText.getText().replace(Math.min(start, end), Math.max(start, end),
-                "[" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
-                0, "[]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
+                "![" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
+                0, "![]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
     }
 }

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(this);
+        mGlide = Glide.with(getApplication());
 
         mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE);
 

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(this);
+        mGlide = Glide.with(getApplication());
 
         mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE);
 
@@ -450,7 +450,7 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr
     }
 
     private void loadSubredditIcon() {
-        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, subredditName,
+        LoadSubredditIcon.loadSubredditIcon(mExecutor, new Handler(), mRedditDataRoomDatabase, communityData.getQualified_name(),
                 mAccessToken, mOauthRetrofit, mRetrofit.getRetrofit(), iconImageUrl -> {
             iconUrl = iconImageUrl;
             displaySubredditIcon();
@@ -673,8 +673,8 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr
         int start = Math.max(contentEditText.getSelectionStart(), 0);
         int end = Math.max(contentEditText.getSelectionEnd(), 0);
         contentEditText.getText().replace(Math.min(start, end), Math.max(start, end),
-                "[" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
-                0, "[]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
+                "![" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
+                0, "![]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
     }
 
     @Override

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(this);
+        mGlide = Glide.with(getApplication());
 
         player = new ExoPlayer.Builder(this).build();
         videoPlayerView.setPlayer(player);
@@ -447,8 +447,9 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF
         nsfwTextView.setTextColor(primaryTextColor);
         titleEditText.setTextColor(primaryTextColor);
         titleEditText.setHintTextColor(secondaryTextColor);
-        applyFABTheme(captureFab);
-        applyFABTheme(selectFromLibraryFab);
+        boolean circularFab = mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false);
+        applyFABTheme(captureFab, circularFab);
+        applyFABTheme(selectFromLibraryFab, circularFab);
         selectAgainTextView.setTextColor(mCustomThemeWrapper.getColorAccent());
         if (typeface != null) {
             subredditNameTextView.setTypeface(typeface);

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

@@ -238,7 +238,7 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
         coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
         applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, collapsingToolbarLayout, toolbar);
         applyTabLayoutTheme(tabLayout);
-        applyFABTheme(fab);
+        applyFABTheme(fab, mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
     }
 
     private void bindView(Bundle savedInstanceState) {
@@ -558,10 +558,6 @@ 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();
@@ -788,7 +784,8 @@ 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, mAccountQualifiedName);
+                    bundle.putString(SubredditListingFragment.EXTRA_ACCOUNT_NAME, mAccountName);
+                    bundle.putString(SubredditListingFragment.EXTRA_ACCOUNT_QUALIFIED_NAME, mAccountQualifiedName);
                     mFragment.setArguments(bundle);
                     return mFragment;
                 }

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

@@ -119,7 +119,8 @@ 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, mAccountQualifiedName);
+            bundle.putString(SubredditListingFragment.EXTRA_ACCOUNT_NAME, mAccountName);
+            bundle.putString(SubredditListingFragment.EXTRA_ACCOUNT_QUALIFIED_NAME, mAccountQualifiedName);
             bundle.putBoolean(SubredditListingFragment.EXTRA_IS_MULTI_SELECTION, getIntent().getBooleanExtra(EXTRA_IS_MULTI_SELECTION, false));
             mFragment.setArguments(bundle);
         } else {

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

@@ -194,7 +194,7 @@ public class SelectedSubredditsAndUsersActivity extends BaseActivity implements
     protected void applyCustomTheme() {
         coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
         applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, collapsingToolbarLayout, toolbar);
-        applyFABTheme(fab);
+        applyFABTheme(fab, mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
     }
 
     @Override

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

@@ -1,8 +1,13 @@
 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;
@@ -10,12 +15,20 @@ 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;
 
@@ -23,13 +36,24 @@ 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.message.ComposeMessage;
+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.utils.SharedPreferencesUtils;
-import retrofit2.Retrofit;
+import eu.toldi.infinityforlemmy.utils.Utils;
 
-public class SendPrivateMessageActivity extends BaseActivity {
-    public static final String EXTRA_RECIPIENT_USERNAME = "ERU";
+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;
     @BindView(R.id.coordinator_layout_send_private_message_activity)
     CoordinatorLayout coordinatorLayout;
     @BindView(R.id.appbar_layout_send_private_message_activity)
@@ -40,15 +64,20 @@ public class SendPrivateMessageActivity extends BaseActivity {
     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("oauth")
-    Retrofit mOauthRetrofit;
+    @Named("no_oauth")
+    RetrofitHolder mRetrofit;
+
+    @Inject
+    Executor mExecutor;
+
     @Inject
     @Named("default")
     SharedPreferences mSharedPreferences;
@@ -57,15 +86,24 @@ public class SendPrivateMessageActivity extends BaseActivity {
     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);
 
@@ -77,14 +115,66 @@ public class SendPrivateMessageActivity extends BaseActivity {
             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);
-
-        String username = getIntent().getStringExtra(EXTRA_RECIPIENT_USERNAME);
-        if (username != null) {
-            usernameEditText.setText(username);
+        if (savedInstanceState != null) {
+            mRecipientBasicUserInfo = savedInstanceState.getParcelable(EXTRA_RECIPIENT_USER_INFO);
+        } else {
+            mRecipientBasicUserInfo = getIntent().getParcelableExtra(EXTRA_RECIPIENT_USER_INFO);
         }
+
+        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
@@ -108,12 +198,6 @@ public class SendPrivateMessageActivity extends BaseActivity {
                     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();
@@ -125,32 +209,26 @@ public class SendPrivateMessageActivity extends BaseActivity {
                 Snackbar sendingSnackbar = Snackbar.make(coordinatorLayout, R.string.sending_message, Snackbar.LENGTH_INDEFINITE);
                 sendingSnackbar.show();
 
-                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();
-                            }
+                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();
+                    }
 
-                            @Override
-                            public void composeMessageFailed(String errorMessage) {
-                                isSubmitting = false;
-                                sendingSnackbar.dismiss();
-                                item.setEnabled(true);
-                                item.getIcon().setAlpha(255);
+                    @Override
+                    public void onPrivateMessageSentError() {
+                        isSubmitting = false;
+                        sendingSnackbar.dismiss();
+                        item.setEnabled(true);
+                        item.getIcon().setAlpha(255);
 
-                                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();
-                                }
-                            }
-                        });
+                        Snackbar.make(coordinatorLayout, R.string.send_message_failed, Snackbar.LENGTH_LONG).show();
+                    }
+                });
             }
         }
         return false;
@@ -159,6 +237,7 @@ public class SendPrivateMessageActivity extends BaseActivity {
     @Override
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
+        outState.putParcelable(EXTRA_RECIPIENT_USER_INFO, mRecipientBasicUserInfo);
     }
 
     @Override
@@ -177,19 +256,49 @@ public class SendPrivateMessageActivity extends BaseActivity {
         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/SubmitCrosspostActivity.java

@@ -204,7 +204,7 @@ public class SubmitCrosspostActivity extends BaseActivity implements FlairBottom
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        mGlide = Glide.with(this);
+        mGlide = Glide.with(getApplication());
 
         mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE);
 

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

@@ -127,7 +127,7 @@ public class SubredditMultiselectionActivity extends BaseActivity implements Act
         setSupportActionBar(mToolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        mGlide = Glide.with(this);
+        mGlide = Glide.with(getApplication());
 
         mSwipeRefreshLayout.setEnabled(false);
 

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

@@ -73,7 +73,6 @@ import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
 import retrofit2.Retrofit;
 
-;
 
 public class SubscribedThingListingActivity extends BaseActivity implements ActivityToolbarInterface {
 
@@ -221,7 +220,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
         coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
         applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, collapsingToolbarLayout, toolbar);
         applyTabLayoutTheme(tabLayout);
-        applyFABTheme(fab);
+        applyFABTheme(fab, mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
         searchEditText.setTextColor(mCustomThemeWrapper.getToolbarPrimaryTextAndIconColor());
         searchEditText.setHintTextColor(mCustomThemeWrapper.getToolbarSecondaryTextColor());
     }
@@ -233,7 +232,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
         });
         sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
         viewPager.setAdapter(sectionsPagerAdapter);
-        viewPager.setOffscreenPageLimit(3);
+        viewPager.setOffscreenPageLimit(1);
         if (viewPager.getCurrentItem() != 2) {
             fab.hide();
         }
@@ -358,7 +357,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
         }
 
         if (!(!forceLoad && mInsertMultiredditSuccess)) {
-            loadMultiReddits();
+            //loadMultiReddits();
         }
     }
 
@@ -412,7 +411,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
                                     public void success() {
                                         Toast.makeText(SubscribedThingListingActivity.this,
                                                 R.string.delete_multi_reddit_success, Toast.LENGTH_SHORT).show();
-                                        loadMultiReddits();
+                                        //loadMultiReddits();
                                     }
 
                                     @Override
@@ -439,7 +438,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
 
     @Subscribe
     public void onRefreshMultiRedditsEvent(RefreshMultiRedditsEvent event) {
-        loadMultiReddits();
+        //loadMultiReddits();
     }
 
     @Override
@@ -477,6 +476,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
         @Override
         public Fragment getItem(int position) {
             switch (position) {
+                default:
                 case 0: {
                     SubscribedSubredditsListingFragment fragment = new SubscribedSubredditsListingFragment();
                     Bundle bundle = new Bundle();
@@ -487,28 +487,12 @@ 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 ? "-" : mAccountName);
-                    fragment.setArguments(bundle);
-                    return fragment;
-                }
             }
         }
 
         @Override
         public int getCount() {
-            return 3;
+            return 1;
         }
 
         @Override

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(this);
+        mGlide = Glide.with(getApplication());
 
         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(this).clear(errorImageView);
+        Glide.with(getApplication()).clear(errorImageView);
         swipeRefreshLayout.setRefreshing(true);
         trendingSearches = null;
         adapter.setTrendingSearches(null);

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

@@ -161,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(this);
+        glide = Glide.with(getApplication());
 
         handler = new Handler();
 

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

@@ -853,7 +853,7 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
         coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
         applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, collapsingToolbarLayout, toolbar);
         navigationWrapper.applyCustomTheme(mCustomThemeWrapper.getBottomAppBarIconColor(), mCustomThemeWrapper.getBottomAppBarBackgroundColor());
-        applyFABTheme(navigationWrapper.floatingActionButton);
+        applyFABTheme(navigationWrapper.floatingActionButton, mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
     }
 
     @Override
@@ -946,10 +946,6 @@ 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

@@ -95,6 +95,7 @@ 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";
@@ -180,6 +181,8 @@ 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;
@@ -268,6 +271,7 @@ 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);
 
@@ -335,7 +339,7 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
     protected void applyCustomTheme() {
         mCoordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
         applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(mAppBarLayout, mCollapsingToolbarLayout, mToolbar);
-        applyFABTheme(fab);
+        applyFABTheme(fab, mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
         searchPanelMaterialCardView.setBackgroundTintList(ColorStateList.valueOf(mCustomThemeWrapper.getColorPrimary()));
         int searchPanelTextAndIconColor = mCustomThemeWrapper.getToolbarPrimaryTextAndIconColor();
         searchTextInputLayout.setBoxStrokeColor(searchPanelTextAndIconColor);
@@ -352,8 +356,8 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
 
     private void checkNewAccountAndBindView(Bundle savedInstanceState) {
         if (mNewAccountName != null) {
-            if (mAccountName == null || !mAccountName.equals(mNewAccountName)) {
-                SwitchAccount.switchAccount(mRedditDataRoomDatabase,mRetrofit, mCurrentAccountSharedPreferences,
+            if (mAccountName == null || !mAccountQalifiedName.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();
@@ -425,11 +429,11 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
     }
 
 
-    public void deleteComment(String fullName, int position) {
+    public void deleteComment(int comment_id, int position) {
         if (sectionsPagerAdapter != null) {
             ViewPostDetailFragment fragment = sectionsPagerAdapter.getCurrentFragment();
             if (fragment != null) {
-                fragment.deleteComment(fullName, position);
+                fragment.deleteComment(comment_id, position);
             }
         }
     }
@@ -870,6 +874,7 @@ 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 {
@@ -891,6 +896,7 @@ 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,6 +5,7 @@ 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;
@@ -27,6 +28,7 @@ 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;
@@ -46,14 +48,15 @@ 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.message.ReplyMessage;
+import eu.toldi.infinityforlemmy.privatemessage.LemmyPrivateMessageAPI;
+import eu.toldi.infinityforlemmy.privatemessage.PrivateMessage;
 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";
@@ -91,14 +94,19 @@ public class ViewPrivateMessagesActivity extends BaseActivity implements Activit
     CustomThemeWrapper mCustomThemeWrapper;
     @Inject
     Executor mExecutor;
+
+    @Inject
+    LemmyPrivateMessageAPI mLemmyPrivateMessageAPI;
     private LinearLayoutManagerBugFixed mLinearLayoutManager;
     private PrivateMessagesDetailRecyclerViewAdapter mAdapter;
     @State
-    Message privateMessage;
+    PrivateMessage privateMessage;
     @State
-    Message replyTo;
+    PrivateMessage replyTo;
     private String mAccessToken;
     private String mAccountName;
+
+    private String mAccountQualifiedName;
     private String mUserAvatar;
     private ArrayList<ProvideUserAvatarCallback> mProvideUserAvatarCallbacks;
     private boolean isLoadingUserAvatar = false;
@@ -128,6 +136,11 @@ 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);
 
@@ -135,6 +148,7 @@ 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);
@@ -144,36 +158,37 @@ 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.getAuthor().equals(mAccountName)) {
-                setTitle(privateMessage.getDestination());
+            if (privateMessage.getCreatorQualifiedName().equals(mAccountQualifiedName)) {
+                setTitle(privateMessage.getRecipientName());
                 mToolbar.setOnClickListener(view -> {
-                    if (privateMessage.isDestinationDeleted()) {
-                        return;
-                    }
+
                     Intent intent = new Intent(this, ViewUserDetailActivity.class);
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, privateMessage.getDestination());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, privateMessage.getRecipientName());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, privateMessage.getRecipientQualifiedName());
                     startActivity(intent);
                 });
             } else {
-                setTitle(privateMessage.getAuthor());
+                setTitle(privateMessage.getCreatorName());
                 mToolbar.setOnClickListener(view -> {
-                    if (privateMessage.isAuthorDeleted()) {
-                        return;
-                    }
+
                     Intent intent = new Intent(this, ViewUserDetailActivity.class);
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, privateMessage.getAuthor());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, privateMessage.getCreatorName());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, privateMessage.getCreatorQualifiedName());
                     startActivity(intent);
                 });
             }
         }
         mAdapter = new PrivateMessagesDetailRecyclerViewAdapter(this, mSharedPreferences,
-                getResources().getConfiguration().locale, privateMessage, mAccountName, mCustomThemeWrapper);
+                getResources().getConfiguration().locale, privateMessage, mAccountQualifiedName, mCustomThemeWrapper);
         mLinearLayoutManager = new LinearLayoutManagerBugFixed(this);
         mLinearLayoutManager.setStackFromEnd(true);
         mRecyclerView.setLayoutManager(mLinearLayoutManager);
@@ -184,58 +199,55 @@ public class ViewPrivateMessagesActivity extends BaseActivity implements Activit
                 if (!mEditText.getText().toString().equals("")) {
                     //Send Message
                     if (privateMessage != null) {
-                        ArrayList<Message> replies = privateMessage.getReplies();
+                        List<PrivateMessage> 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)));
-                                    }
 
-                                    @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;
-                                    }
-                                });
+                        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;
+                            }
+                        });
+
+
                         StringBuilder fullnames = new StringBuilder();
-                        if (privateMessage.isNew()) {
-                            fullnames.append(privateMessage.getFullname()).append(",");
-                        }
+
                         if (replies != null && !replies.isEmpty()) {
-                            for (Message m : replies) {
-                                if (m.isNew()) {
+                            for (PrivateMessage m : replies) {
+                                if (!m.getRead()) {
                                     fullnames.append(m).append(",");
                                 }
                             }
                         }
                         if (fullnames.length() > 0) {
                             fullnames.deleteCharAt(fullnames.length() - 1);
-                            ReadMessage.readMessage(mOauthRetrofit, mAccessToken, fullnames.toString(),
+                            ReadMessage.readMessage(mOauthRetrofit, mAccessToken, 0,
                                     new ReadMessage.ReadMessageListener() {
                                         @Override
-                                        public void readSuccess() {}
+                                        public void readSuccess() {
+                                        }
 
                                         @Override
-                                        public void readFailed() {}
+                                        public void readFailed() {
+                                        }
                                     });
                         }
                     }
@@ -332,7 +344,7 @@ public class ViewPrivateMessagesActivity extends BaseActivity implements Activit
 
     @Subscribe
     public void onPassPrivateMessageEvent(PassPrivateMessageEvent passPrivateMessageEvent) {
-        privateMessage = passPrivateMessageEvent.message;
+       /* privateMessage = passPrivateMessageEvent.message;
         if (privateMessage != null) {
             if (privateMessage.getAuthor().equals(mAccountName)) {
                 if (privateMessage.getReplies() != null) {
@@ -351,7 +363,7 @@ public class ViewPrivateMessagesActivity extends BaseActivity implements Activit
             }
 
             bindView();
-        }
+        }*/
     }
 
     public interface ProvideUserAvatarCallback {

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

@@ -3,12 +3,14 @@ package eu.toldi.infinityforlemmy.activities;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
+import android.graphics.PorterDuff;
 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;
@@ -18,12 +20,14 @@ 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;
@@ -36,6 +40,7 @@ import androidx.viewpager2.widget.ViewPager2;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.RequestManager;
 import com.bumptech.glide.request.RequestOptions;
+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;
@@ -82,6 +87,8 @@ 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;
@@ -162,12 +169,26 @@ 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.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.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.description_text_view_view_subreddit_detail_activity)
     TextView descriptionTextView;
     @Inject
@@ -210,6 +231,11 @@ 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;
@@ -221,7 +247,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
     private boolean hideFab;
     private boolean showBottomAppBar;
     private boolean lockBottomAppBar;
-    private String mMessageFullname;
+    private int mMessageFullname;
     private String mNewAccountName;
     private RequestManager glide;
     private int expandedTabTextColor;
@@ -235,6 +261,8 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
     private int fabOption;
     private MaterialAlertDialogBuilder nsfwWarningBuilder;
 
+    private boolean showStatistics;
+
     private boolean hideSubredditDescription;
 
     @Override
@@ -248,6 +276,7 @@ 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);
         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),
@@ -352,27 +381,41 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
         mAccountQualifiedName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null);
 
         if (savedInstanceState == null) {
-            mMessageFullname = getIntent().getStringExtra(EXTRA_MESSAGE_FULLNAME);
+            mMessageFullname = getIntent().getIntExtra(EXTRA_MESSAGE_FULLNAME, 0);
             mNewAccountName = getIntent().getStringExtra(EXTRA_NEW_ACCOUNT_NAME);
         } else {
             mFetchSubredditInfoSuccess = savedInstanceState.getBoolean(FETCH_SUBREDDIT_INFO_STATE);
             mNCurrentOnlineSubscribers = savedInstanceState.getInt(CURRENT_ONLINE_SUBSCRIBERS_STATE);
-            mMessageFullname = savedInstanceState.getString(MESSAGE_FULLNAME_STATE);
+            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 (communityName != null) {
+        if (communityData != 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) {
@@ -414,20 +457,24 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
         subscribeSubredditChip.setTextColor(mCustomThemeWrapper.getChipTextColor());
         int primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
         nSubscribersTextView.setTextColor(primaryTextColor);
-        nOnlineSubscribersTextView.setTextColor(primaryTextColor);
-        sinceTextView.setTextColor(primaryTextColor);
-        creationTimeTextView.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);
         descriptionTextView.setTextColor(primaryTextColor);
         navigationWrapper.applyCustomTheme(mCustomThemeWrapper.getBottomAppBarIconColor(), mCustomThemeWrapper.getBottomAppBarBackgroundColor());
         applyTabLayoutTheme(tabLayout);
-        applyFABTheme(navigationWrapper.floatingActionButton);
+        applyFABTheme(navigationWrapper.floatingActionButton, mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
         if (typeface != null) {
             subredditNameTextView.setTypeface(typeface);
             subscribeSubredditChip.setTypeface(typeface);
             nSubscribersTextView.setTypeface(typeface);
-            nOnlineSubscribersTextView.setTypeface(typeface);
-            sinceTextView.setTypeface(typeface);
-            creationTimeTextView.setTypeface(typeface);
+            nActiveUsersTextView.setTypeface(typeface);
+            nPostsTextView.setTypeface(typeface);
+            nCommentsTextView.setTypeface(typeface);
             descriptionTextView.setTypeface(typeface);
         }
         unsubscribedColor = mCustomThemeWrapper.getUnsubscribed();
@@ -466,7 +513,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
         setSupportActionBar(toolbar);
         setToolbarGoToTop(toolbar);
 
-        glide = Glide.with(this);
+        glide = Glide.with(getApplication());
         Locale locale = getResources().getConfiguration().locale;
 
         MarkwonPlugin miscPlugin = new AbstractMarkwonPlugin() {
@@ -551,15 +598,18 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                 communityFullNameTextView.setText(qualifiedName);
                 String nSubscribers = getString(R.string.subscribers_number_detail, subredditData.getNSubscribers());
                 nSubscribersTextView.setText(nSubscribers);
-                creationTimeTextView.setText(subredditData.getCreatedUTC());
+
+                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()));
+                }
                 description = subredditData.getDescription();
 
-                if (hideSubredditDescription || description.equals("")) {
-                    descriptionTextView.setVisibility(View.GONE);
-                } else {
-                    descriptionTextView.setVisibility(View.VISIBLE);
-                    markwon.setMarkdown(descriptionTextView, description);
-                }
+
+                descriptionTextView.setVisibility(View.GONE);
+
 
                 if (subredditData.isNSFW()) {
                     if (nsfwWarningBuilder == null
@@ -693,14 +743,15 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                     qualifiedName = LemmyUtils.actorID2FullName(communityData.getActorId());
                     if (communityName == null) {
                         communityName = communityData.getTitle();
-
-                        setupVisibleElements();
                     }
+                    mCommunityStats = communityData.getCommunityStats();
+                    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);
                 }
@@ -733,6 +784,7 @@ 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;
             }
@@ -872,11 +924,11 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
     }
 
     private void bindView() {
-        if (mMessageFullname != null) {
+        if (mMessageFullname != 0) {
             ReadMessage.readMessage(mRetrofit.getRetrofit(), mAccessToken, mMessageFullname, new ReadMessage.ReadMessageListener() {
                 @Override
                 public void readSuccess() {
-                    mMessageFullname = null;
+                    mMessageFullname = 0;
                 }
 
                 @Override
@@ -1126,6 +1178,11 @@ 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;
     }
@@ -1154,22 +1211,6 @@ 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);
@@ -1179,23 +1220,59 @@ 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 + "/" + qualifiedName);
+            shareIntent.putExtra(Intent.EXTRA_TEXT, baseURL + "c/" + 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);
+           /* 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;
         }
         return false;
@@ -1234,7 +1311,7 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
         super.onSaveInstanceState(outState);
         outState.putBoolean(FETCH_SUBREDDIT_INFO_STATE, mFetchSubredditInfoSuccess);
         outState.putInt(CURRENT_ONLINE_SUBSCRIBERS_STATE, mNCurrentOnlineSubscribers);
-        outState.putString(MESSAGE_FULLNAME_STATE, mMessageFullname);
+        outState.putInt(MESSAGE_FULLNAME_STATE, mMessageFullname);
         outState.putString(NEW_ACCOUNT_NAME_STATE, mNewAccountName);
     }
 
@@ -1288,27 +1365,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, communityName);
+                intent.putExtra(PostLinkActivity.EXTRA_SUBREDDIT_NAME, qualifiedName);
                 startActivity(intent);
                 break;
             case PostTypeBottomSheetFragment.TYPE_IMAGE:
                 intent = new Intent(this, PostImageActivity.class);
-                intent.putExtra(PostImageActivity.EXTRA_SUBREDDIT_NAME, communityName);
+                intent.putExtra(PostImageActivity.EXTRA_SUBREDDIT_NAME, qualifiedName);
                 startActivity(intent);
                 break;
             case PostTypeBottomSheetFragment.TYPE_VIDEO:
                 intent = new Intent(this, PostVideoActivity.class);
-                intent.putExtra(PostVideoActivity.EXTRA_SUBREDDIT_NAME, communityName);
+                intent.putExtra(PostVideoActivity.EXTRA_SUBREDDIT_NAME, qualifiedName);
                 startActivity(intent);
                 break;
             case PostTypeBottomSheetFragment.TYPE_GALLERY:
                 intent = new Intent(this, PostGalleryActivity.class);
-                intent.putExtra(PostGalleryActivity.EXTRA_SUBREDDIT_NAME, communityName);
+                intent.putExtra(PostGalleryActivity.EXTRA_SUBREDDIT_NAME, qualifiedName);
                 startActivity(intent);
                 break;
             case PostTypeBottomSheetFragment.TYPE_POLL:
                 intent = new Intent(this, PostPollActivity.class);
-                intent.putExtra(PostPollActivity.EXTRA_SUBREDDIT_NAME, communityName);
+                intent.putExtra(PostPollActivity.EXTRA_SUBREDDIT_NAME, qualifiedName);
                 startActivity(intent);
         }
     }
@@ -1402,10 +1479,6 @@ 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();
@@ -1618,6 +1691,7 @@ 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);
             fragment.setArguments(bundle);
             return fragment;
         }

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

@@ -4,6 +4,7 @@ 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;
@@ -20,12 +21,15 @@ 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;
@@ -52,6 +56,7 @@ 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;
 
@@ -71,11 +76,14 @@ 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.blockeduser.BlockedUserData;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.CopyTextBottomSheetFragment;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.FABMoreOptionsBottomSheetFragment;
 import eu.toldi.infinityforlemmy.bottomsheetfragments.PostLayoutBottomSheetFragment;
@@ -101,11 +109,13 @@ 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;
@@ -141,6 +151,7 @@ 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;
@@ -165,11 +176,40 @@ 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.karma_text_view_view_user_detail_activity)
-    TextView karmaTextView;
-    @BindView(R.id.cakeday_text_view_view_user_detail_activity)
+
+    @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.upvote_count_post_text_view_view_user_detail_activity)
+    TextView upvoteCountPostTextView;
+
+    @BindView(R.id.upvote_count_comment_text_view_view_user_detail_activity)
+    TextView upvoteCountCommentTextView;
+
+    @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.upvote_count_posts_icon_image_view_view_user_detail_activity)
+    ImageView postUpvoteCountIconImageView;
+    @BindView(R.id.upvote_count_comments_icon_image_view_view_user_detail_activity)
+    ImageView commentUpvoteCountIconImageView;
+    @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)
     TextView cakedayTextView;
     @BindView(R.id.description_text_view_view_user_detail_activity)
     TextView descriptionTextView;
@@ -216,8 +256,12 @@ 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 showScore;
     private boolean subscriptionReady = false;
     private boolean mFetchUserInfoSuccess = false;
     private int expandedTabTextColor;
@@ -233,11 +277,13 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
     private boolean hideFab;
     private boolean showBottomAppBar;
     private boolean lockBottomAppBar;
-    private String mMessageFullname;
+    private int mMessageId;
     private String mNewAccountName;
 
     private UserData mUserData;
 
+    private boolean isBlocked;
+
     //private MaterialAlertDialogBuilder nsfwWarningBuilder;
 
     @Override
@@ -280,14 +326,17 @@ 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);
+        showScore = mSharedPreferences.getBoolean(SharedPreferencesUtils.SHOW_POST_AND_COMMENT_SCORE, true);
 
         if (savedInstanceState == null) {
-            mMessageFullname = getIntent().getStringExtra(EXTRA_MESSAGE_FULLNAME);
+            mMessageId = getIntent().getIntExtra(EXTRA_MESSAGE_FULLNAME, 0);
             mNewAccountName = getIntent().getStringExtra(EXTRA_NEW_ACCOUNT_NAME);
         } else {
             mFetchUserInfoSuccess = savedInstanceState.getBoolean(FETCH_USER_INFO_STATE);
-            mMessageFullname = savedInstanceState.getString(MESSAGE_FULLNAME_STATE);
+            mMessageId = savedInstanceState.getInt(MESSAGE_FULLNAME_STATE);
             mNewAccountName = savedInstanceState.getString(NEW_ACCOUNT_NAME_STATE);
+            qualifiedName = savedInstanceState.getString("qualified_name");
         }
 
         checkNewAccountAndInitializeViewPager();
@@ -299,9 +348,26 @@ 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);
@@ -382,7 +448,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
             });
         }
 
-        glide = Glide.with(this);
+        glide = Glide.with(getApplication());
         Locale locale = getResources().getConfiguration().locale;
 
         MarkwonPlugin miscPlugin = new AbstractMarkwonPlugin() {
@@ -559,8 +625,23 @@ 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());
-                karmaTextView.setText(karma);
-                cakedayTextView.setText(getString(R.string.cakeday_info, userData.getCakeday()));
+
+                cakedayTextView.setText((String) userData.getCakeday());
+                UserStats userStats = mUserData.getStats();
+                if (userStats != null && showStatistics) {
+                    userStatisticsBlock.setVisibility(View.VISIBLE);
+                    postCountTextView.setText(String.valueOf(userStats.getPostCount()));
+                    commentCountTextView.setText(String.valueOf(userStats.getCommentCount()));
+                    if (showScore) {
+                        upvoteCountPostTextView.setText(String.valueOf(userStats.getPostScore()));
+                        upvoteCountCommentTextView.setText(String.valueOf(userStats.getCommentScore()));
+                    } else {
+                        upvoteCountPostTextView.setVisibility(View.GONE);
+                        upvoteCountCommentTextView.setVisibility(View.GONE);
+                        postUpvoteCountIconImageView.setVisibility(View.GONE);
+                        commentUpvoteCountIconImageView.setVisibility(View.GONE);
+                    }
+                }
 
                 if (userData.getDescription() == null || userData.getDescription().equals("")) {
                     descriptionTextView.setVisibility(View.GONE);
@@ -628,16 +709,25 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
         unsubscribedColor = mCustomThemeWrapper.getUnsubscribed();
         subscribedColor = mCustomThemeWrapper.getSubscribed();
         userNameTextView.setTextColor(mCustomThemeWrapper.getUsername());
-        karmaTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
+        postCountTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
+        upvoteCountPostTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
+        commentCountTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
+        upvoteCountCommentTextView.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);
         cakedayTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
         navigationWrapper.applyCustomTheme(mCustomThemeWrapper.getBottomAppBarIconColor(), mCustomThemeWrapper.getBottomAppBarBackgroundColor());
-        applyFABTheme(navigationWrapper.floatingActionButton);
+        applyFABTheme(navigationWrapper.floatingActionButton, mSharedPreferences.getBoolean(SharedPreferencesUtils.USE_CIRCULAR_FAB, false));
         descriptionTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
         subscribeUserChip.setTextColor(mCustomThemeWrapper.getChipTextColor());
         applyTabLayoutTheme(tabLayout);
         if (typeface != null) {
             userNameTextView.setTypeface(typeface);
-            karmaTextView.setTypeface(typeface);
+            postCountTextView.setTypeface(typeface);
+            upvoteCountPostTextView.setTypeface(typeface);
+            commentCountTextView.setTypeface(typeface);
+            upvoteCountCommentTextView.setTypeface(typeface);
             cakedayTextView.setTypeface(typeface);
             subscribeUserChip.setTypeface(typeface);
             descriptionTextView.setTypeface(typeface);
@@ -706,11 +796,11 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
 
         fixViewPager2Sensitivity(viewPager2);
 
-        if (mMessageFullname != null) {
-            ReadMessage.readMessage(mOauthRetrofit, mAccessToken, mMessageFullname, new ReadMessage.ReadMessageListener() {
+        if (mMessageId != 0) {
+            ReadMessage.readMessage(mOauthRetrofit, mAccessToken, mMessageId, new ReadMessage.ReadMessageListener() {
                 @Override
                 public void readSuccess() {
-                    mMessageFullname = null;
+                    mMessageId = 0;
                 }
 
                 @Override
@@ -929,6 +1019,7 @@ 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;
             }
@@ -1083,8 +1174,27 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
                 @Override
                 public void onFetchUserDataSuccess(UserData userData, int inboxCount) {
                     mUserData = userData;
-                    username = userData.getName();
+                    username = userData.getDisplayName();
                     setupVisibleElements();
+                    FetchBlockedThings.fetchBlockedThings(mRetrofit.getRetrofit(), mAccessToken, mAccountQualifiedName, new FetchBlockedThings.FetchBlockedThingsListener() {
+
+                        @Override
+                        public void onFetchBlockedThingsSuccess(List<BlockedUserData> blockedUsers, List<BlockedCommunityData> blockedCommunities) {
+                            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();
                 }
@@ -1098,12 +1208,12 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
         }
     }
 
-    public void deleteComment(String fullName) {
+    public void deleteComment(int commentId) {
         new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme)
                 .setTitle(R.string.delete_this_comment)
                 .setMessage(R.string.are_you_sure)
                 .setPositiveButton(R.string.delete, (dialogInterface, i)
-                        -> DeleteThing.delete(mOauthRetrofit, fullName, mAccessToken, new DeleteThing.DeleteThingListener() {
+                        -> DeleteThing.deleteComment(mRetrofit.getRetrofit(), commentId, mAccessToken, new DeleteThing.DeleteThingListener() {
                     @Override
                     public void deleteSuccess() {
                         Toast.makeText(ViewUserDetailActivity.this, R.string.delete_post_success, Toast.LENGTH_SHORT).show();
@@ -1127,6 +1237,12 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
             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;
@@ -1161,7 +1277,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 + qualifiedName);
+            shareIntent.putExtra(Intent.EXTRA_TEXT, baseURL + "u/" + qualifiedName);
             if (shareIntent.resolveActivity(getPackageManager()) != null) {
                 startActivity(Intent.createChooser(shareIntent, getString(R.string.share)));
             } else {
@@ -1175,16 +1291,9 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
             }
 
             Intent pmIntent = new Intent(this, SendPrivateMessageActivity.class);
-            pmIntent.putExtra(SendPrivateMessageActivity.EXTRA_RECIPIENT_USERNAME, username);
+            pmIntent.putExtra(SendPrivateMessageActivity.EXTRA_RECIPIENT_USER_INFO, new BasicUserInfo(mUserData.getId(), username, qualifiedName, mUserData.getAvatar(), mUserData.getDisplayName()));
             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);
@@ -1205,10 +1314,13 @@ 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(mOauthRetrofit, mAccessToken, username, new BlockUser.BlockUserListener() {
+                            -> BlockUser.blockUser(mRetrofit.getRetrofit(), mAccessToken, mUserData.getId(), true, 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
@@ -1222,6 +1334,25 @@ 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();
+                }
+            });
         }
         return false;
     }
@@ -1268,8 +1399,10 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putBoolean(FETCH_USER_INFO_STATE, mFetchUserInfoSuccess);
-        outState.putString(MESSAGE_FULLNAME_STATE, mMessageFullname);
+        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
@@ -1341,10 +1474,7 @@ 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();

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

@@ -35,16 +35,9 @@ 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;
@@ -57,10 +50,16 @@ 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 {
 
@@ -139,7 +138,7 @@ public class WikiActivity extends BaseActivity {
             }
         }
 
-        mGlide = Glide.with(this);
+        mGlide = Glide.with(getApplication());
 
         swipeRefreshLayout.setEnabled(mSharedPreferences.getBoolean(SharedPreferencesUtils.PULL_TO_REFRESH, true));
         swipeRefreshLayout.setOnRefreshListener(this::loadWiki);
@@ -219,7 +218,7 @@ public class WikiActivity extends BaseActivity {
 
         swipeRefreshLayout.setRefreshing(true);
 
-        Glide.with(this).clear(mFetchWikiInfoImageView);
+        Glide.with(getApplication()).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>() {

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

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,377 @@
+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.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);
+        } 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;
+
+        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/BlockedUsersRecyclerViewAdapter.java

@@ -0,0 +1,216 @@
+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/CommentsListingRecyclerViewAdapter.java

@@ -450,7 +450,7 @@ public class CommentsListingRecyclerViewAdapter extends PagedListAdapter<Comment
                 Comment comment = getItem(getBindingAdapterPosition());
                 if (comment != null) {
                     Bundle bundle = new Bundle();
-                    if (comment.getAuthor().equals(mAccountName)) {
+                    if (comment.getAuthorName().equals(mAccountName)) {
                         bundle.putBoolean(CommentMoreBottomSheetFragment.EXTRA_EDIT_AND_DELETE_AVAILABLE, true);
                     }
                     bundle.putString(CommentMoreBottomSheetFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
@@ -472,6 +472,7 @@ 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);
                 }
             });

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

@@ -10,6 +10,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.Spanned;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -38,10 +39,12 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 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.RetrofitHolder;
 import eu.toldi.infinityforlemmy.SaveComment;
 import eu.toldi.infinityforlemmy.SaveThing;
 import eu.toldi.infinityforlemmy.SortType;
@@ -94,11 +97,12 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
     private BaseActivity mActivity;
     private ViewPostDetailFragment mFragment;
     private Executor mExecutor;
-    private Retrofit mRetrofit;
+    private RetrofitHolder mRetrofit;
     private Retrofit mOauthRetrofit;
     private Markwon mCommentMarkwon;
     private String mAccessToken;
-    private String mAccountName;
+    private String mAccountQualifiedName;
+
     private Post mPost;
     private ArrayList<Comment> mVisibleComments;
 
@@ -124,12 +128,17 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
     private boolean mShowAuthorAvatar;
     private boolean mAlwaysShowChildCommentCount;
     private boolean mHideTheNumberOfVotes;
+    private boolean mSeperateUpandDownvote;
+    private boolean mHideDownvotes;
     private int mDepthThreshold;
     private CommentRecyclerViewAdapterCallback mCommentRecyclerViewAdapterCallback;
     private boolean isInitiallyLoading;
     private boolean isInitiallyLoadingFailed;
     private boolean mHasMoreComments;
     private boolean loadMoreCommentsFailed;
+
+    private boolean mHideUserInstance;
+    private boolean mShowUserDisplayName;
     private Drawable expandDrawable;
     private Drawable collapseDrawable;
 
@@ -161,18 +170,18 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
 
     public CommentsRecyclerViewAdapter(BaseActivity activity, ViewPostDetailFragment fragment,
                                        CustomThemeWrapper customThemeWrapper,
-                                       Executor executor, Retrofit retrofit, Retrofit oauthRetrofit,
+                                       Executor executor, RetrofitHolder retrofit,
                                        String accessToken, String accountName,
                                        Post post, Locale locale, Integer singleCommentId,
                                        boolean isSingleCommentThreadMode,
                                        SharedPreferences sharedPreferences,
+                                       SharedPreferences currentAccountSharedPreferences,
                                        CommentRecyclerViewAdapterCallback commentRecyclerViewAdapterCallback) {
         mActivity = activity;
         mFragment = fragment;
         mExecutor = executor;
         mRetrofit = retrofit;
-        mOauthRetrofit = oauthRetrofit;
-        mGlide = Glide.with(activity);
+        mGlide = Glide.with(activity.getApplicationContext());
         mSecondaryTextColor = customThemeWrapper.getSecondaryTextColor();
         mCommentTextColor = customThemeWrapper.getCommentColor();
         int commentSpoilerBackgroundColor = mCommentTextColor | 0xFF000000;
@@ -214,7 +223,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                 miscPlugin, mCommentTextColor, commentSpoilerBackgroundColor, onLinkLongClickListener);
         recycledViewPool = new RecyclerView.RecycledViewPool();
         mAccessToken = accessToken;
-        mAccountName = accountName;
+        mAccountQualifiedName = accountName;
         mPost = post;
         mVisibleComments = new ArrayList<>();
         loadedComments = new HashSet<>();
@@ -238,6 +247,10 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
         mShowAuthorAvatar = sharedPreferences.getBoolean(SharedPreferencesUtils.SHOW_AUTHOR_AVATAR, false);
         mAlwaysShowChildCommentCount = sharedPreferences.getBoolean(SharedPreferencesUtils.ALWAYS_SHOW_CHILD_COMMENT_COUNT, false);
         mHideTheNumberOfVotes = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_VOTES_IN_COMMENTS, false);
+        mHideUserInstance = sharedPreferences.getBoolean(SharedPreferencesUtils.COMMENT_HIDE_USER_INSTANCE, false);
+        mShowUserDisplayName = sharedPreferences.getBoolean(SharedPreferencesUtils.COMMENT_DISPLAY_NAME_INSTEAD_OF_USERNAME, true);
+        mHideDownvotes = !currentAccountSharedPreferences.getBoolean(SharedPreferencesUtils.CAN_DOWNVOTE, true);
+        mSeperateUpandDownvote = sharedPreferences.getBoolean(SharedPreferencesUtils.COMMENT_SEPARATE_UP_AND_DOWN_VOTES, true) && !mHideDownvotes;
         mDepthThreshold = sharedPreferences.getInt(SharedPreferencesUtils.SHOW_FEWER_TOOLBAR_OPTIONS_THRESHOLD, 5);
 
         mCommentRecyclerViewAdapterCallback = commentRecyclerViewAdapterCallback;
@@ -369,9 +382,9 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                 if (mIsSingleCommentThreadMode && comment.getId() == mSingleCommentId) {
                     holder.itemView.setBackgroundColor(mSingleCommentThreadBackgroundColor);
                 }
-
-                String authorPrefixed = comment.getAuthorQualifiedName();
-                ((CommentViewHolder) holder).authorTextView.setText(authorPrefixed);
+                String authorDisplayName = (mShowUserDisplayName) ? comment.getAuthorName() : comment.getAuthor().getUsername();
+                String authorInstance = (mHideUserInstance) ? "" : "@" + comment.getAuthor().getQualifiedName().split(Pattern.quote("@"))[1];
+                ((CommentViewHolder) holder).authorTextView.setText(authorDisplayName + authorInstance);
 
 
                 if (comment.isSubmitter()) {
@@ -384,7 +397,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                     Drawable moderatorDrawable = Utils.getTintedDrawable(mActivity, R.drawable.ic_verified_user_14dp, mModeratorColor);
                     ((CommentViewHolder) holder).authorTextView.setCompoundDrawablesWithIntrinsicBounds(
                             moderatorDrawable, null, null, null);
-                } else if (comment.getAuthor().equals(mAccountName)) {
+                } else if (comment.getAuthorQualifiedName().equals(mAccountQualifiedName)) {
                     ((CommentViewHolder) holder).authorTextView.setTextColor(mCurrentUserColor);
                     Drawable currentUserDrawable = Utils.getTintedDrawable(mActivity, R.drawable.ic_current_user_14dp, mCurrentUserColor);
                     ((CommentViewHolder) holder).authorTextView.setCompoundDrawablesWithIntrinsicBounds(
@@ -393,12 +406,12 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
 
                 if (comment.getAuthorIconUrl() == null) {
                     mFragment.loadIcon(comment.getAuthorQualifiedName(), (authorName, iconUrl) -> {
-                        if (authorName.equals(comment.getAuthor())) {
+                        if (authorName.equals(comment.getAuthorQualifiedName())) {
                             comment.setAuthorIconUrl(iconUrl);
                         }
 
                         Comment currentComment = getCurrentComment(holder);
-                        if (currentComment != null && authorName.equals(currentComment.getAuthor())) {
+                        if (currentComment != null && authorName.equals(currentComment.getAuthorQualifiedName())) {
                             mGlide.load(iconUrl)
                                     .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
                                     .error(mGlide.load(R.drawable.subreddit_default_icon)
@@ -435,6 +448,10 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                 ((CommentViewHolder) holder).mMarkwonAdapter.setMarkdown(mCommentMarkwon, comment.getCommentMarkdown());
                 // noinspection NotifyDataSetChanged
                 ((CommentViewHolder) holder).mMarkwonAdapter.notifyDataSetChanged();
+                if (mHideDownvotes) {
+                    ((CommentViewHolder) holder).downvoteButton.setVisibility(View.GONE);
+                    ((CommentViewHolder) holder).downvoteTextView.setVisibility(View.GONE);
+                }
 
                 if (!mHideTheNumberOfVotes) {
                     String commentText = "";
@@ -446,7 +463,21 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                             Utils.getNVotes(mShowAbsoluteNumberOfVotes,
                                     comment.getScore() + comment.getVoteType()));
 
-                    ((CommentViewHolder) holder).scoreTextView.setText(commentText);
+                    if (mSeperateUpandDownvote) {
+                        int upvotes = (comment.getVoteType() == 1) ? comment.getUpvotes() + 1 : comment.getUpvotes();
+                        int downvotes = (comment.getVoteType() == -1) ? comment.getDownvotes() + 1 : comment.getDownvotes();
+                        ((CommentViewHolder) holder).downvoteTextView.setVisibility(View.VISIBLE);
+                        ((CommentViewHolder) holder).scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, upvotes));
+                        ((CommentViewHolder) holder).downvoteTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, downvotes));
+                        ((CommentViewHolder) holder).scoreTextView.setGravity(Gravity.START);
+                        ((CommentViewHolder) holder).scoreTextView.getLayoutParams().width = (int) (32 * mActivity.getResources().getDisplayMetrics().density);
+
+                        ((CommentViewHolder) holder).scoreTextView.setPadding(0, 0, 6, 0);
+                        ((CommentViewHolder) holder).downvoteButton.setPadding(24, 0, 12, 0);
+                        ((CommentViewHolder) holder).upvoteButton.setPadding(24, 0, 12, 0);
+                    } else {
+                        ((CommentViewHolder) holder).scoreTextView.setText(commentText);
+                    }
                     ((CommentViewHolder) holder).topScoreTextView.setText(topScoreText);
                 } else {
                     ((CommentViewHolder) holder).scoreTextView.setText(mActivity.getString(R.string.vote));
@@ -486,13 +517,21 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                                 .setColorFilter(mUpvotedColor, PorterDuff.Mode.SRC_IN);
                         ((CommentViewHolder) holder).scoreTextView.setTextColor(mUpvotedColor);
                         ((CommentViewHolder) holder).topScoreTextView.setTextColor(mUpvotedColor);
+                        ((CommentViewHolder) holder).downvoteTextView.setTextColor(mCommentIconAndInfoColor);
                         break;
                     case Comment.VOTE_TYPE_DOWNVOTE:
                         ((CommentViewHolder) holder).downvoteButton
                                 .setColorFilter(mDownvotedColor, PorterDuff.Mode.SRC_IN);
-                        ((CommentViewHolder) holder).scoreTextView.setTextColor(mDownvotedColor);
+                        if(mSeperateUpandDownvote) {
+                            ((CommentViewHolder) holder).downvoteTextView.setTextColor(mDownvotedColor);
+                            ((CommentViewHolder) holder).scoreTextView.setTextColor(mCommentIconAndInfoColor);
+                        } else {
+                            ((CommentViewHolder) holder).scoreTextView.setTextColor(mDownvotedColor);
+                        }
                         ((CommentViewHolder) holder).topScoreTextView.setTextColor(mDownvotedColor);
                         break;
+                    default:
+                        ((CommentViewHolder) holder).downvoteTextView.setTextColor(mCommentIconAndInfoColor);
                 }
 
                 if (mPost.isArchived()) {
@@ -533,17 +572,17 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
         } else if (holder instanceof CommentFullyCollapsedViewHolder) {
             Comment comment = getCurrentComment(position);
             if (comment != null) {
-                String authorWithPrefix = "u/" + comment.getAuthor();
+                String authorWithPrefix = "u/" + comment.getAuthorName();
                 ((CommentFullyCollapsedViewHolder) holder).usernameTextView.setText(authorWithPrefix);
 
                 if (comment.getAuthorIconUrl() == null) {
                     mFragment.loadIcon(comment.getAuthorQualifiedName(), (authorName, iconUrl) -> {
-                        if (authorName.equals(comment.getAuthor())) {
+                        if (authorName.equals(comment.getAuthorQualifiedName())) {
                             comment.setAuthorIconUrl(iconUrl);
                         }
 
                         Comment currentComment = getCurrentComment(holder);
-                        if (currentComment != null && authorName.equals(currentComment.getAuthor())) {
+                        if (currentComment != null && authorName.equals(currentComment.getAuthorQualifiedName())) {
                             mGlide.load(iconUrl)
                                     .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
                                     .error(mGlide.load(R.drawable.subreddit_default_icon)
@@ -616,7 +655,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                         mVisibleComments.get(commentPosition).setLoadMoreChildrenFailed(false);
                         ((LoadMoreChildCommentsViewHolder) holder).placeholderTextView.setText(R.string.loading);
 
-                        Retrofit retrofit = mRetrofit;
+                        Retrofit retrofit = mRetrofit.getRetrofit();
                         SortType.Type sortType = mCommentRecyclerViewAdapterCallback.getSortType();
                         FetchComment.fetchComments(mExecutor, new Handler(), retrofit, mAccessToken,
                                 mPost.getId(), parentComment.getId(), sortType,
@@ -873,7 +912,8 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
             loadedComments.add(comments.get(i).getId());
         }
         if (mIsSingleCommentThreadMode) {
-            notifyItemRangeInserted(sizeBefore, comments.size() + 1);
+            int offset = (comments.size() > 0) ? 1 : 0;
+            notifyItemRangeInserted(sizeBefore, comments.size() + offset);
         } else {
             notifyItemRangeInserted(sizeBefore, comments.size());
         }
@@ -1191,6 +1231,9 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
         ImageView upvoteButton;
         @BindView(R.id.score_text_view_item_post_comment)
         TextView scoreTextView;
+
+        @BindView(R.id.downvote_text_view_item_post_comment)
+        TextView downvoteTextView;
         @BindView(R.id.down_vote_button_item_post_comment)
         ImageView downvoteButton;
         @BindView(R.id.placeholder_item_post_comment)
@@ -1222,6 +1265,8 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                 constraintSet.clear(scoreTextView.getId(), ConstraintSet.END);
                 constraintSet.clear(downvoteButton.getId(), ConstraintSet.START);
                 constraintSet.clear(downvoteButton.getId(), ConstraintSet.END);
+                constraintSet.clear(downvoteTextView.getId(), ConstraintSet.START);
+                constraintSet.clear(downvoteTextView.getId(), ConstraintSet.END);
                 constraintSet.clear(expandButton.getId(), ConstraintSet.START);
                 constraintSet.clear(expandButton.getId(), ConstraintSet.END);
                 constraintSet.clear(saveButton.getId(), ConstraintSet.START);
@@ -1234,8 +1279,15 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                 constraintSet.connect(upvoteButton.getId(), ConstraintSet.START, placeholder.getId(), ConstraintSet.END);
                 constraintSet.connect(scoreTextView.getId(), ConstraintSet.END, downvoteButton.getId(), ConstraintSet.START);
                 constraintSet.connect(scoreTextView.getId(), ConstraintSet.START, upvoteButton.getId(), ConstraintSet.END);
-                constraintSet.connect(downvoteButton.getId(), ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END);
-                constraintSet.connect(downvoteButton.getId(), ConstraintSet.START, scoreTextView.getId(), ConstraintSet.END);
+                if (!mSeperateUpandDownvote) {
+                    constraintSet.connect(downvoteButton.getId(), ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END);
+                    constraintSet.connect(downvoteButton.getId(), ConstraintSet.START, scoreTextView.getId(), ConstraintSet.END);
+                } else {
+                    constraintSet.connect(downvoteButton.getId(), ConstraintSet.END, downvoteTextView.getId(), ConstraintSet.START);
+                    constraintSet.connect(downvoteButton.getId(), ConstraintSet.START, scoreTextView.getId(), ConstraintSet.END);
+                    constraintSet.connect(downvoteTextView.getId(), ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END);
+                    constraintSet.connect(downvoteTextView.getId(), ConstraintSet.START, downvoteButton.getId(), ConstraintSet.END);
+                }
                 constraintSet.connect(placeholder.getId(), ConstraintSet.END, upvoteButton.getId(), ConstraintSet.START);
                 constraintSet.connect(placeholder.getId(), ConstraintSet.START, moreButton.getId(), ConstraintSet.END);
                 constraintSet.connect(moreButton.getId(), ConstraintSet.START, expandButton.getId(), ConstraintSet.END);
@@ -1268,6 +1320,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                 editedTextView.setTypeface(mActivity.typeface);
                 awardsTextView.setTypeface(mActivity.typeface);
                 scoreTextView.setTypeface(mActivity.typeface);
+                downvoteTextView.setTypeface(mActivity.typeface);
                 expandButton.setTypeface(mActivity.typeface);
             }
 
@@ -1299,11 +1352,13 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
             commentTimeTextView.setTextColor(mSecondaryTextColor);
             authorFlairTextView.setTextColor(mAuthorFlairTextColor);
             topScoreTextView.setTextColor(mSecondaryTextColor);
+            downvoteTextView.setTextColor(mSecondaryTextColor);
             editedTextView.setTextColor(mSecondaryTextColor);
             awardsTextView.setTextColor(mSecondaryTextColor);
             commentDivider.setBackgroundColor(mDividerColor);
             upvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
             scoreTextView.setTextColor(mCommentIconAndInfoColor);
+            downvoteTextView.setTextColor(mCommentIconAndInfoColor);
             downvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
             moreButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
             expandButton.setTextColor(mCommentIconAndInfoColor);
@@ -1327,7 +1382,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                 Comment comment = getCurrentComment(this);
                 if (comment != null) {
                     Bundle bundle = new Bundle();
-                    if (!mPost.isArchived() && !mPost.isLocked() && comment.getAuthor().equals(mAccountName)) {
+                    if (!mPost.isArchived() && !mPost.isLocked() && comment.getAuthorQualifiedName().equals(mAccountQualifiedName)) {
                         bundle.putBoolean(CommentMoreBottomSheetFragment.EXTRA_EDIT_AND_DELETE_AVAILABLE, true);
                     }
                     bundle.putString(CommentMoreBottomSheetFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
@@ -1410,18 +1465,28 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                         newVoteType = Integer.parseInt(APIUtils.DIR_UNVOTE);
                         upvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                         scoreTextView.setTextColor(mCommentIconAndInfoColor);
+                        downvoteTextView.setTextColor(mCommentIconAndInfoColor);
                         topScoreTextView.setTextColor(mSecondaryTextColor);
                     }
 
                     if (!mHideTheNumberOfVotes) {
-                        scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
-                                comment.getScore() + comment.getVoteType()));
+                        if(mSeperateUpandDownvote){
+                            int upvoteCount = (comment.getVoteType() == 1) ? comment.getUpvotes() + 1 : comment.getUpvotes();
+                            int downvoteCount = (comment.getVoteType() == -1) ? comment.getDownvotes() + 1 : comment.getDownvotes();
+                            scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                    upvoteCount));
+                            downvoteTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                    downvoteCount));
+                        }else {
+                            scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                    comment.getScore() + comment.getVoteType()));
+                        }
                         topScoreTextView.setText(mActivity.getString(R.string.top_score,
                                 Utils.getNVotes(mShowAbsoluteNumberOfVotes,
                                         comment.getScore() + comment.getVoteType())));
                     }
 
-                    VoteThing.voteComment(mActivity, mRetrofit, mAccessToken, new VoteThing.VoteThingListener() {
+                    VoteThing.voteComment(mActivity, mRetrofit.getRetrofit(), mAccessToken, new VoteThing.VoteThingListener() {
                         @Override
                         public void onVoteThingSuccess(int position) {
                             int currentPosition = getBindingAdapterPosition();
@@ -1431,6 +1496,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                                     upvoteButton.setColorFilter(mUpvotedColor, PorterDuff.Mode.SRC_IN);
                                     scoreTextView.setTextColor(mUpvotedColor);
                                     topScoreTextView.setTextColor(mUpvotedColor);
+                                    downvoteTextView.setTextColor(mCommentIconAndInfoColor);
                                 }
                             } else {
                                 comment.setVoteType(Comment.VOTE_TYPE_NO_VOTE);
@@ -1438,14 +1504,24 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                                     upvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                                     scoreTextView.setTextColor(mCommentIconAndInfoColor);
                                     topScoreTextView.setTextColor(mSecondaryTextColor);
+                                    downvoteTextView.setTextColor(mCommentIconAndInfoColor);
                                 }
                             }
 
                             if (currentPosition == position) {
                                 downvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                                 if (!mHideTheNumberOfVotes) {
-                                    scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
-                                            comment.getScore() + comment.getVoteType()));
+                                    if(mSeperateUpandDownvote){
+                                        int upvoteCount = (comment.getVoteType() == 1) ? comment.getUpvotes() + 1 : comment.getUpvotes();
+                                        scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                                upvoteCount));
+                                        int downvoteCount = (comment.getVoteType() == -1) ? comment.getDownvotes() + 1 : comment.getDownvotes();
+                                        downvoteTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                                downvoteCount));
+                                    } else {
+                                        scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                                comment.getScore() + comment.getVoteType()));
+                                    }
                                     topScoreTextView.setText(mActivity.getString(R.string.top_score,
                                             Utils.getNVotes(mShowAbsoluteNumberOfVotes,
                                                     comment.getScore() + comment.getVoteType())));
@@ -1483,27 +1559,41 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                         comment.setVoteType(Comment.VOTE_TYPE_DOWNVOTE);
                         newVoteType = Integer.parseInt(APIUtils.DIR_DOWNVOTE);
                         downvoteButton.setColorFilter(mDownvotedColor, PorterDuff.Mode.SRC_IN);
-                        scoreTextView.setTextColor(mDownvotedColor);
+                        if(mSeperateUpandDownvote){
+                            downvoteTextView.setTextColor(mDownvotedColor);
+                            scoreTextView.setTextColor(mCommentIconAndInfoColor);
+                        }else {
+                            scoreTextView.setTextColor(mDownvotedColor);
+                        }
                         topScoreTextView.setTextColor(mDownvotedColor);
                     } else {
                         //Downvoted before
                         comment.setVoteType(Comment.VOTE_TYPE_NO_VOTE);
                         newVoteType = Integer.parseInt(APIUtils.DIR_UNVOTE);
                         downvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
+                        downvoteTextView.setTextColor(mCommentIconAndInfoColor);
                         scoreTextView.setTextColor(mCommentIconAndInfoColor);
                         topScoreTextView.setTextColor(mSecondaryTextColor);
                     }
 
                     if (!mHideTheNumberOfVotes) {
-                        scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
-                                comment.getScore() + comment.getVoteType()));
+                        if(mSeperateUpandDownvote){
+                         int downvotes = (comment.getVoteType() == -1) ? comment.getDownvotes() +1 : comment.getDownvotes();
+                         int upvotes = (comment.getVoteType() == 1) ? comment.getUpvotes() +1 : comment.getUpvotes();
+                            scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                    upvotes));
+                         downvoteTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, downvotes));
+                        } else {
+                            scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                    comment.getScore() + comment.getVoteType()));
+                        }
                         topScoreTextView.setText(mActivity.getString(R.string.top_score,
                                 Utils.getNVotes(mShowAbsoluteNumberOfVotes,
                                         comment.getScore() + comment.getVoteType())));
                     }
 
                     int position = getBindingAdapterPosition();
-                    VoteThing.voteComment(mActivity, mRetrofit, mAccessToken, new VoteThing.VoteThingListener() {
+                    VoteThing.voteComment(mActivity, mRetrofit.getRetrofit(), mAccessToken, new VoteThing.VoteThingListener() {
                         @Override
                         public void onVoteThingSuccess(int position1) {
                             int currentPosition = getBindingAdapterPosition();
@@ -1511,7 +1601,11 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                                 comment.setVoteType(Comment.VOTE_TYPE_DOWNVOTE);
                                 if (currentPosition == position) {
                                     downvoteButton.setColorFilter(mDownvotedColor, PorterDuff.Mode.SRC_IN);
-                                    scoreTextView.setTextColor(mDownvotedColor);
+                                    if (mSeperateUpandDownvote) {
+                                        downvoteTextView.setTextColor(mDownvotedColor);
+                                    } else {
+                                        scoreTextView.setTextColor(mDownvotedColor);
+                                    }
                                     topScoreTextView.setTextColor(mDownvotedColor);
                                 }
                             } else {
@@ -1519,6 +1613,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                                 if (currentPosition == position) {
                                     downvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                                     scoreTextView.setTextColor(mCommentIconAndInfoColor);
+                                    downvoteTextView.setTextColor(mCommentIconAndInfoColor);
                                     topScoreTextView.setTextColor(mSecondaryTextColor);
                                 }
                             }
@@ -1526,8 +1621,17 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                             if (currentPosition == position) {
                                 upvoteButton.setColorFilter(mCommentIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                                 if (!mHideTheNumberOfVotes) {
-                                    scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
-                                            comment.getScore() + comment.getVoteType()));
+                                    if(mSeperateUpandDownvote){
+                                        int downvotes = (comment.getVoteType() == -1) ? comment.getDownvotes() +1 : comment.getDownvotes();
+                                        int upvotes = (comment.getVoteType() == 1) ? comment.getUpvotes() +1 : comment.getUpvotes();
+                                        downvoteTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, downvotes));
+                                        scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                                upvotes));
+                                    } else {
+                                        scoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                                comment.getScore() + comment.getVoteType()));
+                                    }
+
                                     topScoreTextView.setText(mActivity.getString(R.string.top_score,
                                             Utils.getNVotes(mShowAbsoluteNumberOfVotes,
                                                     comment.getScore() + comment.getVoteType())));
@@ -1549,7 +1653,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                     SaveComment saveComment = new SaveComment();
                     if (comment.isSaved()) {
                         comment.setSaved(false);
-                        saveComment.unsaveThing(mOauthRetrofit, mAccessToken, comment.getId(), new SaveThing.SaveThingListener() {
+                        saveComment.unsaveThing(mRetrofit.getRetrofit(), mAccessToken, comment.getId(), new SaveThing.SaveThingListener() {
                             @Override
                             public void success() {
                                 comment.setSaved(false);
@@ -1570,7 +1674,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                         });
                     } else {
                         comment.setSaved(true);
-                        saveComment.saveThing(mRetrofit, mAccessToken, comment.getId(), new SaveThing.SaveThingListener() {
+                        saveComment.saveThing(mRetrofit.getRetrofit(), mAccessToken, comment.getId(), new SaveThing.SaveThingListener() {
                             @Override
                             public void success() {
                                 comment.setSaved(true);
@@ -1599,7 +1703,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                     return;
                 }
                 Intent intent = new Intent(mActivity, ViewUserDetailActivity.class);
-                intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, comment.getAuthor());
+                intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, comment.getAuthorName());
                 intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, comment.getAuthorQualifiedName());
                 mActivity.startActivity(intent);
             });
@@ -1925,6 +2029,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
                 if (mActivity != null && mActivity instanceof ViewPostDetailActivity) {
                     mIsSingleCommentThreadMode = false;
                     mSingleCommentId = null;
+                    loadedComments.clear();
                     notifyItemRemoved(0);
                     mFragment.changeToNormalThreadMode();
                 }

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

@@ -554,9 +554,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy
                                                 .into(((PostBaseViewHolder) holder).iconGifImageView);
                                     }
 
-                                    if (holder.getBindingAdapterPosition() >= 0) {
-                                        post.setSubredditIconUrl(iconUrl);
-                                    }
                                 }
                             });
                         } else if (!post.getSubredditIconUrl().equals("")) {
@@ -641,9 +638,12 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy
                         break;
                 }
 
-                if (mPostType == PostPagingSource.TYPE_SUBREDDIT && !mDisplaySubredditName && post.isStickied()) {
+                if (mPostType == PostPagingSource.TYPE_SUBREDDIT && !mDisplaySubredditName && post.isFeaturedInCommunity() || post.isFeaturedOnInstance()) {
                     ((PostBaseViewHolder) holder).stickiedPostImageView.setVisibility(View.VISIBLE);
                     mGlide.load(R.drawable.ic_thumbtack_24dp).into(((PostBaseViewHolder) holder).stickiedPostImageView);
+                    if (post.isFeaturedOnInstance()) {
+                        ((PostBaseViewHolder) holder).stickiedPostImageView.setColorFilter(mModeratorColor, android.graphics.PorterDuff.Mode.SRC_IN);
+                    }
                 }
 
                 if (post.isArchived()) {
@@ -1079,9 +1079,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy
                                                 .into(((PostCompactBaseViewHolder) holder).iconGifImageView);
                                     }
 
-                                    if (holder.getBindingAdapterPosition() >= 0) {
-                                        post.setSubredditIconUrl(iconUrl);
-                                    }
                                 }
                             });
                         } else if (!post.getSubredditIconUrl().equals("")) {
@@ -1210,7 +1207,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy
                     }
                 }
 
-                if (mPostType == PostPagingSource.TYPE_SUBREDDIT && !mDisplaySubredditName && post.isStickied()) {
+                if (mPostType == PostPagingSource.TYPE_SUBREDDIT && !mDisplaySubredditName && post.isFeaturedInCommunity()) {
                     ((PostCompactBaseViewHolder) holder).stickiedPostImageView.setVisibility(View.VISIBLE);
                     mGlide.load(R.drawable.ic_thumbtack_24dp).into(((PostCompactBaseViewHolder) holder).stickiedPostImageView);
                 }

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

@@ -19,24 +19,13 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import org.greenrobot.eventbus.EventBus;
 
-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.core.MarkwonTheme;
-import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-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 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.ViewPostDetailActivity;
 import eu.toldi.infinityforlemmy.activities.ViewPrivateMessagesActivity;
 import eu.toldi.infinityforlemmy.activities.ViewUserDetailActivity;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
@@ -45,28 +34,38 @@ 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.CommentInteraction;
 import eu.toldi.infinityforlemmy.message.FetchMessage;
-import eu.toldi.infinityforlemmy.message.Message;
 import eu.toldi.infinityforlemmy.message.ReadMessage;
+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 MessageRecyclerViewAdapter extends PagedListAdapter<Message, RecyclerView.ViewHolder> {
+public class MessageRecyclerViewAdapter extends PagedListAdapter<CommentInteraction, 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<Message> DIFF_CALLBACK = new DiffUtil.ItemCallback<>() {
+    private static final DiffUtil.ItemCallback<CommentInteraction> DIFF_CALLBACK = new DiffUtil.ItemCallback<>() {
         @Override
-        public boolean areItemsTheSame(@NonNull Message message, @NonNull Message t1) {
-            return message.getId().equals(t1.getId());
+        public boolean areItemsTheSame(@NonNull CommentInteraction message, @NonNull CommentInteraction t1) {
+            return message.getComment().getId() == t1.getComment().getId();
         }
 
         @Override
-        public boolean areContentsTheSame(@NonNull Message message, @NonNull Message t1) {
-            return message.getBody().equals(t1.getBody());
+        public boolean areContentsTheSame(@NonNull CommentInteraction message, @NonNull CommentInteraction t1) {
+            return message.getComment().getCommentMarkdown().equals(t1.getComment().getCommentMarkdown());
         }
     };
     private BaseActivity mActivity;
-    private Retrofit mOauthRetrofit;
+    private Retrofit retrofit;
     private Markwon mMarkwon;
     private String mAccessToken;
     private int mMessageType;
@@ -88,7 +87,7 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl
                                       RetryLoadingMoreCallback retryLoadingMoreCallback) {
         super(DIFF_CALLBACK);
         mActivity = activity;
-        mOauthRetrofit = oauthRetrofit;
+        retrofit = oauthRetrofit;
         mRetryLoadingMoreCallback = retryLoadingMoreCallback;
 
         mColorAccent = customThemeWrapper.getColorAccent();
@@ -106,7 +105,6 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl
         mMarkwon = Markwon.builder(mActivity)
                 .usePlugin(MarkwonInlineParserPlugin.create(plugin -> {
                     plugin.excludeInlineProcessor(HtmlInlineProcessor.class);
-                    plugin.excludeInlineProcessor(BangInlineProcessor.class);
                 }))
                 .usePlugin(new AbstractMarkwonPlugin() {
                     @Override
@@ -130,6 +128,7 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl
                 .usePlugin(StrikethroughPlugin.create())
                 .usePlugin(MovementMethodPlugin.create(new SpoilerAwareMovementMethod()))
                 .usePlugin(LinkifyPlugin.create(Linkify.WEB_URLS))
+                .usePlugin(GlideImagesPlugin.create(mActivity))
                 .build();
         mAccessToken = accessToken;
         if (where.equals(FetchMessage.WHERE_MESSAGES)) {
@@ -154,41 +153,38 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
         if (holder instanceof DataViewHolder) {
-            Message message = getItem(holder.getBindingAdapterPosition());
+            CommentInteraction message = getItem(holder.getBindingAdapterPosition());
             if (message != null) {
-                ArrayList<Message> replies = message.getReplies();
-                Message displayedMessage;
-                if (replies != null && !replies.isEmpty() && replies.get(replies.size() - 1) != null) {
-                    displayedMessage = replies.get(replies.size() - 1);
-                } else {
-                    displayedMessage = message;
-                }
-                if (message.isNew()) {
+
+                if (message.isRead()) {
                     if (markAllMessagesAsRead) {
-                        message.setNew(false);
+                        message.markAsRead();
                     } else {
                         holder.itemView.setBackgroundColor(
                                 mUnreadMessageBackgroundColor);
                     }
                 }
 
-                if (message.wasComment()) {
-                    ((DataViewHolder) holder).titleTextView.setText(message.getTitle());
-                } else {
-                    ((DataViewHolder) holder).titleTextView.setVisibility(View.GONE);
-                }
 
-                ((DataViewHolder) holder).authorTextView.setText(displayedMessage.getAuthor());
-                String subject = displayedMessage.getSubject().substring(0, 1).toUpperCase() + displayedMessage.getSubject().substring(1);
+                ((DataViewHolder) holder).titleTextView.setVisibility(View.GONE);
+
+
+                ((DataViewHolder) holder).authorTextView.setText(message.getComment().getAuthorQualifiedName());
+                String subject = message.getComment().getCommunityQualifiedName();
                 ((DataViewHolder) holder).subjectTextView.setText(subject);
-                mMarkwon.setMarkdown(((DataViewHolder) holder).contentCustomMarkwonView, displayedMessage.getBody());
+                mMarkwon.setMarkdown(((DataViewHolder) holder).contentCustomMarkwonView, message.getComment().getCommentMarkdown());
 
                 holder.itemView.setOnClickListener(view -> {
                     if (mMessageType == FetchMessage.MESSAGE_TYPE_INBOX
-                            && message.getContext() != null && !message.getContext().equals("")) {
-                        Uri uri = Uri.parse(message.getContext());
-                        Intent intent = new Intent(mActivity, LinkResolverActivity.class);
-                        intent.setData(uri);
+                            && message.getComment() != null) {
+
+                        Intent intent = new Intent(mActivity, ViewPostDetailActivity.class);
+
+                        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);
@@ -197,20 +193,21 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl
                         mActivity.startActivity(intent);
                     }
 
-                    if (displayedMessage.isNew()) {
+                    if (message.isRead()) {
                         holder.itemView.setBackgroundColor(mMessageBackgroundColor);
-                        message.setNew(false);
 
-                        ReadMessage.readMessage(mOauthRetrofit, mAccessToken, message.getFullname(),
+
+                        ReadMessage.readMessage(retrofit, mAccessToken, message.getId(),
                                 new ReadMessage.ReadMessageListener() {
                                     @Override
                                     public void readSuccess() {
+                                        message.markAsRead();
                                         EventBus.getDefault().post(new ChangeInboxCountEvent(-1));
                                     }
 
                                     @Override
                                     public void readFailed() {
-                                        message.setNew(true);
+                                        message.markAsUnRead();
                                         holder.itemView.setBackgroundColor(mUnreadMessageBackgroundColor);
                                     }
                                 });
@@ -218,11 +215,10 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl
                 });
 
                 ((DataViewHolder) holder).authorTextView.setOnClickListener(view -> {
-                    if (message.isAuthorDeleted()) {
-                        return;
-                    }
+
                     Intent intent = new Intent(mActivity, ViewUserDetailActivity.class);
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, message.getAuthor());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, message.getComment().getAuthorName());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, message.getComment().getAuthorQualifiedName());
                     mActivity.startActivity(intent);
                 });
             }
@@ -280,9 +276,9 @@ public class MessageRecyclerViewAdapter extends PagedListAdapter<Message, Recycl
         }
     }
 
-    public void updateMessageReply(Message newReply, int position) {
+    public void updateMessageReply(CommentInteraction newReply, int position) {
         if (position >= 0 && position < super.getItemCount()) {
-            Message message = getItem(position);
+            CommentInteraction message = getItem(position);
             if (message != null) {
                 notifyItemChanged(position);
             }

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

@@ -0,0 +1,20 @@
+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/PostDetailRecyclerViewAdapter.java

@@ -15,6 +15,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.Spanned;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -42,7 +43,9 @@ import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.target.Target;
+import com.bumptech.glide.request.transition.Transition;
 import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.DefaultTimeBar;
@@ -54,6 +57,7 @@ import com.libRG.CustomTextView;
 import java.util.ArrayList;
 import java.util.Locale;
 import java.util.concurrent.Executor;
+import java.util.regex.Pattern;
 
 import javax.inject.Provider;
 
@@ -168,9 +172,14 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
     private boolean mHideUpvoteRatio;
     private boolean mHideTheNumberOfAwards;
     private boolean mHideSubredditAndUserPrefix;
+
+    private boolean mShowDisplayNames;
     private boolean mHideTheNumberOfVotes;
+
+    private boolean mSeperateUpvoteAndDownvote;
     private boolean mHideTheNumberOfComments;
     private boolean mSeparatePostAndComments;
+    private boolean mHideDownvotes;
     private boolean mLegacyAutoplayVideoControllerUI;
     private boolean mEasierToWatchInFullScreen;
     private PostDetailRecyclerViewAdapterCallback mPostDetailRecyclerViewAdapterCallback;
@@ -214,7 +223,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
 
     public PostDetailRecyclerViewAdapter(BaseActivity activity, ViewPostDetailFragment fragment,
                                          Executor executor, CustomThemeWrapper customThemeWrapper,
-                                         Retrofit retrofit, Retrofit oauthRetrofit, Retrofit gfycatRetrofit,
+                                         Retrofit retrofit, Retrofit gfycatRetrofit,
                                          Retrofit redgifsRetrofit, Provider<StreamableAPI> streamableApiProvider,
                                          RedditDataRoomDatabase redditDataRoomDatabase, RequestManager glide,
                                          boolean separatePostAndComments, String accessToken,
@@ -229,7 +238,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         mFragment = fragment;
         mExecutor = executor;
         mRetrofit = retrofit;
-        mOauthRetrofit = oauthRetrofit;
         mGfycatRetrofit = gfycatRetrofit;
         mRedgifsRetrofit = redgifsRetrofit;
         mStreamableApiProvider = streamableApiProvider;
@@ -339,7 +347,10 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         mHideUpvoteRatio = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_UPVOTE_RATIO, false);
         mHideTheNumberOfAwards = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_AWARDS, false);
         mHideSubredditAndUserPrefix = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_SUBREDDIT_AND_USER_PREFIX, false);
+        mShowDisplayNames = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.POST_DETAIL_DISPLAY_NAME_INSTEAD_OF_USERNAME, true);
         mHideTheNumberOfVotes = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_VOTES, false);
+        mHideDownvotes = !currentAccountSharedPreferences.getBoolean(SharedPreferencesUtils.CAN_DOWNVOTE, true);
+        mSeperateUpvoteAndDownvote = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.POST_DETAIL_SEPARATE_UP_AND_DOWN_VOTES, true) && !mHideDownvotes;
         mHideTheNumberOfComments = postDetailsSharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_COMMENTS, false);
 
         mPostDetailRecyclerViewAdapterCallback = postDetailRecyclerViewAdapterCallback;
@@ -437,7 +448,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                 }
                 return new PostDetailVideoAutoplayViewHolder(LayoutInflater.from(parent.getContext()).inflate(mLegacyAutoplayVideoControllerUI ? R.layout.item_post_detail_video_autoplay_legacy_controller : R.layout.item_post_detail_video_autoplay, parent, false));
             case VIEW_TYPE_POST_DETAIL_VIDEO_AND_GIF_PREVIEW:
-                if (mDataSavingMode && (mDisableImagePreview || mOnlyDisablePreviewInVideoAndGifPosts)) {
+                if (mDataSavingMode && (mDisableImagePreview || mOnlyDisablePreviewInVideoAndGifPosts) || mPost.getPreviews().isEmpty()) {
                     return new PostDetailNoPreviewViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_post_detail_no_preview, parent, false));
                 }
                 return new PostDetailVideoAndGifPreviewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_post_detail_video_and_gif_preview, parent, false));
@@ -474,8 +485,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
             ((PostDetailBaseViewHolder) holder).mTitleTextView.setText(mPost.getTitle());
             if (mPost.getSubredditNamePrefixed().startsWith("u/")) {
                 if (mPost.getAuthorIconUrl() == null) {
-                    String authorName = mPost.isAuthorDeleted() ? mPost.getSubredditNamePrefixed().substring(2) : mPost.getAuthor();
-                    LoadUserData.loadUserData(mExecutor, new Handler(), mRedditDataRoomDatabase, authorName, mOauthRetrofit, iconImageUrl -> {
+                    LoadUserData.loadUserData(mExecutor, new Handler(), mRedditDataRoomDatabase,mPost.getAuthorNamePrefixed(), mOauthRetrofit, iconImageUrl -> {
                         if (mActivity != null && getItemCount() > 0) {
                             if (iconImageUrl == null || iconImageUrl.equals("")) {
                                 mGlide.load(R.drawable.subreddit_default_icon)
@@ -521,8 +531,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                                                     .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
                                             .into(((PostDetailBaseViewHolder) holder).mIconGifImageView);
                                 }
-
-                                mPost.setSubredditIconUrl(iconImageUrl);
                             });
                 } else if (!mPost.getSubredditIconUrl().equals("")) {
                     mGlide.load(mPost.getSubredditIconUrl())
@@ -543,16 +551,23 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                     //Upvote
                     ((PostDetailBaseViewHolder) holder).mUpvoteButton.setColorFilter(mUpvotedColor, PorterDuff.Mode.SRC_IN);
                     ((PostDetailBaseViewHolder) holder).mScoreTextView.setTextColor(mUpvotedColor);
+                    ((PostDetailBaseViewHolder) holder).mDownvoteTextView.setTextColor(mPostIconAndInfoColor);
                     break;
                 case -1:
                     //Downvote
                     ((PostDetailBaseViewHolder) holder).mDownvoteButton.setColorFilter(mDownvotedColor, PorterDuff.Mode.SRC_IN);
-                    ((PostDetailBaseViewHolder) holder).mScoreTextView.setTextColor(mDownvotedColor);
+                    if(mSeperateUpvoteAndDownvote){
+                        ((PostDetailBaseViewHolder) holder).mDownvoteTextView.setTextColor(mDownvotedColor);
+                    } else {
+                        ((PostDetailBaseViewHolder) holder).mScoreTextView.setTextColor(mDownvotedColor);
+                    }
                     break;
+                default:
                 case 0:
                     ((PostDetailBaseViewHolder) holder).mUpvoteButton.setColorFilter(mPostIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                     ((PostDetailBaseViewHolder) holder).mDownvoteButton.setColorFilter(mPostIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                     ((PostDetailBaseViewHolder) holder).mScoreTextView.setTextColor(mPostIconAndInfoColor);
+                    ((PostDetailBaseViewHolder) holder).mDownvoteTextView.setTextColor(mPostIconAndInfoColor);
             }
 
             if (mPost.isArchived()) {
@@ -566,15 +581,20 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                 ((PostDetailBaseViewHolder) holder).mCrosspostImageView.setVisibility(View.VISIBLE);
             }
 
-            if (!mHideSubredditAndUserPrefix) {
-                ((PostDetailBaseViewHolder) holder).mSubredditTextView.setText(mPost.getSubredditNamePrefixed());
-                ((PostDetailBaseViewHolder) holder).mUserTextView.setText(mPost.getAuthorNamePrefixed());
+            ((PostDetailBaseViewHolder) holder).mUserTextView.setText((mShowDisplayNames) ? mPost.getAuthor() : mPost.getAuthorInfo().getUsername());
+            ((PostDetailBaseViewHolder) holder).mSubredditTextView.setText((mShowDisplayNames) ? mPost.getSubredditName() : mPost.getCommunityInfo().getName());
+            if (mHideSubredditAndUserPrefix) {
+                ((PostDetailBaseViewHolder) holder).mUserTextView.setText((mShowDisplayNames) ? mPost.getAuthor() : mPost.getAuthorInfo().getUsername());
             } else {
-                ((PostDetailBaseViewHolder) holder).mSubredditTextView.setText(mPost.getSubredditName());
-                ((PostDetailBaseViewHolder) holder).mUserTextView.setText(mPost.getAuthor());
+                ((PostDetailBaseViewHolder) holder).mSubredditTextView.setText((mShowDisplayNames) ? mPost.getSubredditName() : mPost.getCommunityInfo().getName());
+                ((PostDetailBaseViewHolder) holder).mCommunityInstanceTextView.setText('@' + mPost.getSubredditNamePrefixed().split(Pattern.quote("@"))[1]);
+
+                ((PostDetailBaseViewHolder) holder).mUserInstanceTextView.setText('@' + mPost.getAuthorNamePrefixed().split(Pattern.quote("@"))[1]);
+                ((PostDetailBaseViewHolder) holder).mCommunityInstanceTextView.setTextColor(CustomThemeWrapper.darkenColor(mSubredditColor, 0.7f));
+                ((PostDetailBaseViewHolder) holder).mUserInstanceTextView.setTextColor(CustomThemeWrapper.darkenColor(mPost.isModerator() || mPost.isAdmin() ? mModeratorColor : mUsernameColor, 0.7f));
             }
 
-            if (mPost.isModerator()) {
+            if (mPost.isModerator() || mPost.isAdmin()) {
                 ((PostDetailBaseViewHolder) holder).mUserTextView.setTextColor(mModeratorColor);
                 Drawable moderatorDrawable = Utils.getTintedDrawable(mActivity, R.drawable.ic_verified_user_14dp, mModeratorColor);
                 ((PostDetailBaseViewHolder) holder).mUserTextView.setCompoundDrawablesWithIntrinsicBounds(
@@ -610,7 +630,24 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
             }
 
             if (!mHideTheNumberOfVotes) {
-                ((PostDetailBaseViewHolder) holder).mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, mPost.getScore() + mPost.getVoteType()));
+                if(mSeperateUpvoteAndDownvote){
+                    int upvotes = (mPost.getVoteType() == 1) ?  mPost.getUpvotes()+1  : mPost.getUpvotes();
+                    int downvotes = (mPost.getVoteType() == -1) ?  mPost.getDownvotes() +1  : Math.max(mPost.getDownvotes(),0);
+                    ((PostDetailBaseViewHolder) holder).mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, upvotes));
+                    ((PostDetailBaseViewHolder) holder).mDownvoteTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, downvotes));
+
+                    ((PostDetailBaseViewHolder) holder).mDownvoteTextView.setVisibility(View.VISIBLE);
+
+                    ((PostDetailBaseViewHolder) holder).mDownvoteTextView.setGravity(Gravity.START);
+                    ((PostDetailBaseViewHolder) holder).mScoreTextView.setGravity(Gravity.START);
+                    ((PostDetailBaseViewHolder) holder).mScoreTextView.getLayoutParams().width = (int) (32  * mActivity.getResources().getDisplayMetrics().density);
+
+                    ((PostDetailBaseViewHolder) holder).mScoreTextView.setPadding(0, 0, 6, 0);
+                    ((PostDetailBaseViewHolder) holder).mDownvoteTextView.setPadding(0, 0, 12, 0);
+                    ((PostDetailBaseViewHolder) holder).mUpvoteButton.setPadding(24, 0, 12, 0);
+                } else {
+                    ((PostDetailBaseViewHolder) holder).mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, mPost.getScore() + mPost.getVoteType()));
+                }
             } else {
                 ((PostDetailBaseViewHolder) holder).mScoreTextView.setText(mActivity.getString(R.string.vote));
             }
@@ -635,8 +672,20 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                 ((PostDetailVideoAutoplayViewHolder) holder).previewImageView.setVisibility(View.VISIBLE);
                 Post.Preview preview = getSuitablePreview(mPost.getPreviews());
                 if (preview != null) {
-                    ((PostDetailVideoAutoplayViewHolder) holder).aspectRatioFrameLayout.setAspectRatio((float) preview.getPreviewWidth() / preview.getPreviewHeight());
-                    mGlide.load(preview.getPreviewUrl()).centerInside().downsample(mSaveMemoryCenterInsideDownsampleStrategy).into(((PostDetailVideoAutoplayViewHolder) holder).previewImageView);
+                    mGlide.load(preview.getPreviewUrl()).centerInside().downsample(mSaveMemoryCenterInsideDownsampleStrategy).into(new CustomTarget<Drawable>() {
+                        @Override
+                        public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+                            int width = resource.getIntrinsicWidth();
+                            int height = resource.getIntrinsicHeight();
+                            ((PostDetailVideoAutoplayViewHolder) holder).aspectRatioFrameLayout.setAspectRatio((float) width / height);
+                            ((PostDetailVideoAutoplayViewHolder) holder).previewImageView.setImageDrawable(resource);
+                        }
+
+                        @Override
+                        public void onLoadCleared(@Nullable Drawable placeholder) {
+
+                        }
+                    });
                 } else {
                     ((PostDetailVideoAutoplayViewHolder) holder).aspectRatioFrameLayout.setAspectRatio(1);
                 }
@@ -844,9 +893,45 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                     });
 
             if (blurImage) {
-                imageRequestBuilder.apply(RequestOptions.bitmapTransform(new BlurTransformation(50, 10))).into(((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView);
+                imageRequestBuilder.apply(RequestOptions.bitmapTransform(new BlurTransformation(50, 10))).into(new CustomTarget<Drawable>() {
+                    @Override
+                    public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+                        int width = resource.getIntrinsicWidth();
+                        int height = resource.getIntrinsicHeight();
+                        if (preview.getPreviewHeight() == 0 || preview.getPreviewWidth() == 0) {
+                            ((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView.setRatio((float) height / width);
+                            ((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView.getLayoutParams().height = height;
+                            preview.setPreviewHeight(height);
+                            preview.setPreviewWidth(width);
+                        }
+                        ((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView.setImageDrawable(resource);
+                    }
+
+                    @Override
+                    public void onLoadCleared(@Nullable Drawable placeholder) {
+                        ((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView.setImageDrawable(null);
+                    }
+                });
             } else {
-                imageRequestBuilder.centerInside().downsample(mSaveMemoryCenterInsideDownsampleStrategy).into(((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView);
+                imageRequestBuilder.centerInside().downsample(mSaveMemoryCenterInsideDownsampleStrategy).into(new CustomTarget<Drawable>() {
+                    @Override
+                    public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+                        int width = resource.getIntrinsicWidth();
+                        int height = resource.getIntrinsicHeight();
+                        if (preview.getPreviewHeight() == 0 || preview.getPreviewWidth() == 0) {
+                            ((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView.setRatio((float) height / width);
+                            ((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView.getLayoutParams().height = height;
+                            preview.setPreviewHeight(height);
+                            preview.setPreviewWidth(width);
+                        }
+                        ((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView.setImageDrawable(resource);
+                    }
+
+                    @Override
+                    public void onLoadCleared(@Nullable Drawable placeholder) {
+                        ((PostDetailImageAndGifAutoplayViewHolder) holder).mImageView.setImageDrawable(null);
+                    }
+                });
             }
         } else if (holder instanceof PostDetailVideoAndGifPreviewHolder) {
             RequestBuilder<Drawable> imageRequestBuilder = mGlide.load(preview.getPreviewUrl())
@@ -872,9 +957,45 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
 
             if ((mPost.isNSFW() && mNeedBlurNsfw && !(mDoNotBlurNsfwInNsfwSubreddits && mFragment != null && mFragment.getIsNsfwSubreddit()))) {
                 imageRequestBuilder.apply(RequestOptions.bitmapTransform(new BlurTransformation(50, 10)))
-                        .into(((PostDetailVideoAndGifPreviewHolder) holder).mImageView);
+                        .into(new CustomTarget<Drawable>() {
+                            @Override
+                            public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+                                int width = resource.getIntrinsicWidth();
+                                int height = resource.getIntrinsicHeight();
+                                if (preview.getPreviewHeight() == 0 || preview.getPreviewWidth() == 0) {
+                                    ((PostDetailVideoAndGifPreviewHolder) holder).mImageView.setRatio((float) height / width);
+                                    ((PostDetailVideoAndGifPreviewHolder) holder).mImageView.getLayoutParams().height = height;
+                                    preview.setPreviewHeight(height);
+                                    preview.setPreviewWidth(width);
+                                }
+                                ((PostDetailVideoAndGifPreviewHolder) holder).mImageView.setImageDrawable(resource);
+                            }
+
+                            @Override
+                            public void onLoadCleared(@Nullable Drawable placeholder) {
+                                ((PostDetailVideoAndGifPreviewHolder) holder).mImageView.setImageDrawable(null);
+                            }
+                        });
             } else {
-                imageRequestBuilder.centerInside().downsample(mSaveMemoryCenterInsideDownsampleStrategy).into(((PostDetailVideoAndGifPreviewHolder) holder).mImageView);
+                imageRequestBuilder.centerInside().downsample(mSaveMemoryCenterInsideDownsampleStrategy).into(new CustomTarget<Drawable>() {
+                    @Override
+                    public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+                        int width = resource.getIntrinsicWidth();
+                        int height = resource.getIntrinsicHeight();
+                        if (preview.getPreviewHeight() == 0 || preview.getPreviewWidth() == 0) {
+                            ((PostDetailVideoAndGifPreviewHolder) holder).mImageView.setRatio((float) height / width);
+                            ((PostDetailVideoAndGifPreviewHolder) holder).mImageView.getLayoutParams().height = height;
+                            preview.setPreviewHeight(height);
+                            preview.setPreviewWidth(width);
+                        }
+                        ((PostDetailVideoAndGifPreviewHolder) holder).mImageView.setImageDrawable(resource);
+                    }
+
+                    @Override
+                    public void onLoadCleared(@Nullable Drawable placeholder) {
+                        ((PostDetailVideoAndGifPreviewHolder) holder).mImageView.setImageDrawable(null);
+                    }
+                });
             }
         } else if (holder instanceof PostDetailLinkViewHolder) {
             RequestBuilder<Drawable> imageRequestBuilder = mGlide.load(preview.getPreviewUrl())
@@ -900,9 +1021,51 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
 
             if ((mPost.isNSFW() && mNeedBlurNsfw && !(mDoNotBlurNsfwInNsfwSubreddits && mFragment != null && mFragment.getIsNsfwSubreddit()))) {
                 imageRequestBuilder.apply(RequestOptions.bitmapTransform(new BlurTransformation(50, 10)))
-                        .into(((PostDetailLinkViewHolder) holder).mImageView);
+                        .into(new CustomTarget<Drawable>() {
+                            @Override
+                            public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+                                int width = resource.getIntrinsicWidth();
+                                int height = resource.getIntrinsicHeight();
+                                if (preview.getPreviewHeight() == 0 || preview.getPreviewWidth() == 0) {
+                                    ((PostDetailLinkViewHolder) holder).mImageView.setRatio((float) height / width);
+                                    ((PostDetailLinkViewHolder) holder).mImageView.getLayoutParams().height = height;
+                                    preview.setPreviewHeight(height);
+                                    preview.setPreviewWidth(width);
+                                } else {
+                                    ((PostDetailLinkViewHolder) holder).mImageView.setRatio((float) preview.getPreviewHeight() / preview.getPreviewWidth());
+                                    ((PostDetailLinkViewHolder) holder).mImageView.getLayoutParams().height = height;
+                                }
+                                ((PostDetailLinkViewHolder) holder).mImageView.setImageDrawable(resource);
+                            }
+
+                            @Override
+                            public void onLoadCleared(@Nullable Drawable placeholder) {
+                                ((PostDetailLinkViewHolder) holder).mImageView.setImageDrawable(null);
+                            }
+                        });
             } else {
-                imageRequestBuilder.centerInside().downsample(mSaveMemoryCenterInsideDownsampleStrategy).into(((PostDetailLinkViewHolder) holder).mImageView);
+                imageRequestBuilder.centerInside().downsample(mSaveMemoryCenterInsideDownsampleStrategy).into(new CustomTarget<Drawable>() {
+                    @Override
+                    public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+                        int width = resource.getIntrinsicWidth();
+                        int height = resource.getIntrinsicHeight();
+                        ((PostDetailLinkViewHolder) holder).mImageView.setImageDrawable(resource);
+                        if (preview.getPreviewHeight() == 0 || preview.getPreviewWidth() == 0) {
+                            ((PostDetailLinkViewHolder) holder).mImageView.setRatio((float) height / width);
+                            ((PostDetailLinkViewHolder) holder).mImageView.getLayoutParams().height = height;
+                            preview.setPreviewHeight(height);
+                            preview.setPreviewWidth(width);
+                        } else {
+                            ((PostDetailLinkViewHolder) holder).mImageView.setRatio((float) preview.getPreviewHeight() / preview.getPreviewWidth());
+                        }
+
+                    }
+
+                    @Override
+                    public void onLoadCleared(@Nullable Drawable placeholder) {
+                        ((PostDetailLinkViewHolder) holder).mImageView.setImageDrawable(null);
+                    }
+                });
             }
         }
     }
@@ -1019,7 +1182,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
     public class PostDetailBaseViewHolder extends RecyclerView.ViewHolder {
         AspectRatioGifImageView mIconGifImageView;
         TextView mSubredditTextView;
+        TextView mCommunityInstanceTextView;
         TextView mUserTextView;
+        TextView mUserInstanceTextView;
         TextView mAuthorFlairTextView;
         TextView mPostTimeTextView;
         TextView mTitleTextView;
@@ -1036,6 +1201,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         ConstraintLayout mBottomConstraintLayout;
         ImageView mUpvoteButton;
         TextView mScoreTextView;
+        TextView mDownvoteTextView;
         ImageView mDownvoteButton;
         TextView commentsCountTextView;
         ImageView mSaveButton;
@@ -1047,7 +1213,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
 
         void setBaseView(AspectRatioGifImageView mIconGifImageView,
                          TextView mSubredditTextView,
+                         TextView mCommunityInstanceTextView,
                          TextView mUserTextView,
+                         TextView mUserInstanceTextView,
                          TextView mAuthorFlairTextView,
                          TextView mPostTimeTextView,
                          TextView mTitleTextView,
@@ -1064,13 +1232,16 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                          ConstraintLayout mBottomConstraintLayout,
                          ImageView mUpvoteButton,
                          TextView mScoreTextView,
+                         TextView mDownvoteTextView,
                          ImageView mDownvoteButton,
                          TextView commentsCountTextView,
                          ImageView mSaveButton,
                          ImageView mShareButton) {
             this.mIconGifImageView = mIconGifImageView;
             this.mSubredditTextView = mSubredditTextView;
+            this.mCommunityInstanceTextView = mCommunityInstanceTextView;
             this.mUserTextView = mUserTextView;
+            this.mUserInstanceTextView = mUserInstanceTextView;
             this.mAuthorFlairTextView = mAuthorFlairTextView;
             this.mPostTimeTextView = mPostTimeTextView;
             this.mTitleTextView = mTitleTextView;
@@ -1087,23 +1258,30 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
             this.mBottomConstraintLayout = mBottomConstraintLayout;
             this.mUpvoteButton = mUpvoteButton;
             this.mScoreTextView = mScoreTextView;
+            this.mDownvoteTextView = mDownvoteTextView;
             this.mDownvoteButton = mDownvoteButton;
             this.commentsCountTextView = commentsCountTextView;
             this.mSaveButton = mSaveButton;
             this.mShareButton = mShareButton;
 
+            if(!mCurrentAccountSharedPreferences.getBoolean(SharedPreferencesUtils.CAN_DOWNVOTE,true)){
+                mDownvoteButton.setVisibility(View.GONE);
+            }
+
             mIconGifImageView.setOnClickListener(view -> mSubredditTextView.performClick());
 
-            mSubredditTextView.setOnClickListener(view -> {
+            View.OnClickListener communityClickListener = view -> {
                 Intent intent;
                 intent = new Intent(mActivity, ViewSubredditDetailActivity.class);
                 intent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY,
                         mPost.getSubredditName());
                 intent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, mPost.getSubredditNamePrefixed());
                 mActivity.startActivity(intent);
-            });
+            };
+            mSubredditTextView.setOnClickListener(communityClickListener);
+            mCommunityInstanceTextView.setOnClickListener(communityClickListener);
 
-            mUserTextView.setOnClickListener(view -> {
+            View.OnClickListener onUserClick = view -> {
                 if (mPost.isAuthorDeleted()) {
                     return;
                 }
@@ -1111,7 +1289,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                 intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, mPost.getAuthor());
                 intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, mPost.getAuthorNamePrefixed());
                 mActivity.startActivity(intent);
-            });
+            };
+            mUserTextView.setOnClickListener(onUserClick);
+            mUserInstanceTextView.setOnClickListener(onUserClick);
 
             mAuthorFlairTextView.setOnClickListener(view -> mUserTextView.performClick());
 
@@ -1175,6 +1355,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                 int newVoteType;
 
                 mDownvoteButton.setColorFilter(mPostIconAndInfoColor, PorterDuff.Mode.SRC_IN);
+                mDownvoteTextView.setTextColor(mPostIconAndInfoColor);
 
                 if (previousVoteType != 1) {
                     //Not upvoted before
@@ -1191,8 +1372,15 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                 }
 
                 if (!mHideTheNumberOfVotes) {
-                    mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
-                            mPost.getScore() + mPost.getVoteType()));
+                    if(mSeperateUpvoteAndDownvote){
+                        int upvotes = (mPost.getVoteType() == 1) ? mPost.getUpvotes() + 1 : mPost.getUpvotes();
+                        int downvotes = (mPost.getVoteType() == -1) ? mPost.getDownvotes() + 1 :  Math.max(mPost.getDownvotes(),0);;
+                        mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, upvotes));
+                        mDownvoteTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, downvotes));
+                    } else {
+                        mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                mPost.getScore() + mPost.getVoteType()));
+                    }
                 }
 
                 mPostDetailRecyclerViewAdapterCallback.updatePost(mPost);
@@ -1212,8 +1400,15 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
 
                         mDownvoteButton.setColorFilter(mPostIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                         if (!mHideTheNumberOfVotes) {
-                            mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
-                                    mPost.getScore() + mPost.getVoteType()));
+                            if(mSeperateUpvoteAndDownvote){
+                                int upvotes = (mPost.getVoteType() == 1) ? mPost.getUpvotes() + 1 : mPost.getUpvotes();
+                                int downvotes = (mPost.getVoteType() == -1) ? mPost.getDownvotes() + 1 :  Math.max(mPost.getDownvotes(),0);;
+                                mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, upvotes));
+                                mDownvoteTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, downvotes));
+                            } else {
+                                mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                        mPost.getScore() + mPost.getVoteType()));
+                            }
                         }
 
                         mPostDetailRecyclerViewAdapterCallback.updatePost(mPost);
@@ -1224,8 +1419,15 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                         Toast.makeText(mActivity, R.string.vote_failed, Toast.LENGTH_SHORT).show();
                         mPost.setVoteType(previousVoteType);
                         if (!mHideTheNumberOfVotes) {
-                            mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
-                                    mPost.getScore() + previousVoteType));
+                            if(mSeperateUpvoteAndDownvote){
+                                int upvotes = (previousVoteType == 1) ? mPost.getUpvotes() + 1 : mPost.getUpvotes();
+                                int downvotes = (previousVoteType == -1) ? mPost.getDownvotes() - 1 :  Math.max(mPost.getDownvotes(),0);;
+                                mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, upvotes));
+                                mDownvoteTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, downvotes));
+                            } else {
+                                mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                        mPost.getScore() + previousVoteType));
+                            }
                         }
                         mUpvoteButton.setColorFilter(previousUpvoteButtonColorFilter);
                         mDownvoteButton.setColorFilter(previousDownvoteButtonColorFilter);
@@ -1255,24 +1457,36 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                 int newVoteType;
 
                 mUpvoteButton.setColorFilter(mPostIconAndInfoColor, PorterDuff.Mode.SRC_IN);
-
+                mScoreTextView.setTextColor(mPostIconAndInfoColor);
                 if (previousVoteType != -1) {
                     //Not upvoted before
                     mPost.setVoteType(-1);
                     newVoteType = Integer.parseInt(APIUtils.DIR_DOWNVOTE);
                     mDownvoteButton.setColorFilter(mDownvotedColor, PorterDuff.Mode.SRC_IN);
-                    mScoreTextView.setTextColor(mDownvotedColor);
+                    if(mSeperateUpvoteAndDownvote){
+                        mDownvoteTextView.setTextColor(mDownvotedColor);
+                    } else {
+                        mScoreTextView.setTextColor(mDownvotedColor);
+                    }
                 } else {
                     //Upvoted before
                     mPost.setVoteType(0);
                     newVoteType = Integer.parseInt(APIUtils.DIR_UNVOTE);
                     mDownvoteButton.setColorFilter(mPostIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                     mScoreTextView.setTextColor(mPostIconAndInfoColor);
+                    mDownvoteTextView.setTextColor(mPostIconAndInfoColor);
                 }
 
                 if (!mHideTheNumberOfVotes) {
-                    mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
-                            mPost.getScore() + mPost.getVoteType()));
+                    if(mSeperateUpvoteAndDownvote){
+                        int upvotes = (mPost.getVoteType() == 1) ? mPost.getUpvotes() + 1 : mPost.getUpvotes();
+                        int downvotes = (mPost.getVoteType() == -1) ? mPost.getDownvotes() + 1 : Math.max(mPost.getDownvotes(),0);;
+                        mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, upvotes));
+                        mDownvoteTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, downvotes));
+                    } else {
+                        mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                mPost.getScore() + mPost.getVoteType()));
+                    }
                 }
 
                 mPostDetailRecyclerViewAdapterCallback.updatePost(mPost);
@@ -1283,17 +1497,29 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                         if (newVoteType == Integer.parseInt(APIUtils.DIR_DOWNVOTE)) {
                             mPost.setVoteType(-1);
                             mDownvoteButton.setColorFilter(mDownvotedColor, PorterDuff.Mode.SRC_IN);
-                            mScoreTextView.setTextColor(mDownvotedColor);
+                            if(mSeperateUpvoteAndDownvote) {
+                                mDownvoteTextView.setTextColor(mDownvotedColor);
+                            } else {
+                                mScoreTextView.setTextColor(mDownvotedColor);
+                            }
                         } else {
                             mPost.setVoteType(0);
                             mDownvoteButton.setColorFilter(mPostIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                             mScoreTextView.setTextColor(mPostIconAndInfoColor);
+                            mDownvoteTextView.setTextColor(mPostIconAndInfoColor);
                         }
 
                         mUpvoteButton.setColorFilter(mPostIconAndInfoColor, PorterDuff.Mode.SRC_IN);
                         if (!mHideTheNumberOfVotes) {
-                            mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
-                                    mPost.getScore() + mPost.getVoteType()));
+                            if(mSeperateUpvoteAndDownvote){
+                                int upvotes = (mPost.getVoteType() == 1) ? mPost.getUpvotes() + 1 : mPost.getUpvotes();
+                                int downvotes = (mPost.getVoteType() == -1) ? mPost.getDownvotes() + 1 :  Math.max(mPost.getDownvotes(),0);;
+                                mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, upvotes));
+                                mDownvoteTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, downvotes));
+                            } else {
+                                mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                        mPost.getScore() + mPost.getVoteType()));
+                            }
                         }
 
                         mPostDetailRecyclerViewAdapterCallback.updatePost(mPost);
@@ -1304,8 +1530,15 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                         Toast.makeText(mActivity, R.string.vote_failed, Toast.LENGTH_SHORT).show();
                         mPost.setVoteType(previousVoteType);
                         if (!mHideTheNumberOfVotes) {
-                            mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
-                                    mPost.getScore() + previousVoteType));
+                            if(mSeperateUpvoteAndDownvote) {
+                                int upvotes = (previousVoteType == 1) ? mPost.getUpvotes() + 1 : mPost.getUpvotes();
+                                int downvotes = (previousVoteType == -1) ? mPost.getDownvotes() + 1 :  Math.max(mPost.getDownvotes(),0);
+                                mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, upvotes));
+                                mDownvoteTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes, downvotes));
+                            } else {
+                                mScoreTextView.setText(Utils.getNVotes(mShowAbsoluteNumberOfVotes,
+                                        mPost.getScore() + previousVoteType));
+                            }
                         }
                         mUpvoteButton.setColorFilter(previousUpvoteButtonColorFilter);
                         mDownvoteButton.setColorFilter(previousDownvoteButtonColorFilter);
@@ -1354,7 +1587,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                 SavePost savePost = new SavePost();
                 if (mPost.isSaved()) {
                     mSaveButton.setImageResource(R.drawable.ic_bookmark_border_grey_24dp);
-                    savePost.unsaveThing(mOauthRetrofit, mAccessToken, mPost.getId(),
+                    savePost.unsaveThing(mRetrofit, mAccessToken, mPost.getId(),
                             new SaveThing.SaveThingListener() {
                                 @Override
                                 public void success() {
@@ -1428,11 +1661,18 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                 constraintSet.clear(mUpvoteButton.getId(), ConstraintSet.START);
                 constraintSet.clear(mScoreTextView.getId(), ConstraintSet.START);
                 constraintSet.clear(mDownvoteButton.getId(), ConstraintSet.START);
+                constraintSet.clear(mDownvoteTextView.getId(), ConstraintSet.START);
                 constraintSet.clear(mSaveButton.getId(), ConstraintSet.END);
                 constraintSet.clear(mShareButton.getId(), ConstraintSet.END);
                 constraintSet.connect(mUpvoteButton.getId(), ConstraintSet.END, mScoreTextView.getId(), ConstraintSet.START);
                 constraintSet.connect(mScoreTextView.getId(), ConstraintSet.END, mDownvoteButton.getId(), ConstraintSet.START);
-                constraintSet.connect(mDownvoteButton.getId(), ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END);
+                if (!mSeperateUpvoteAndDownvote) {
+                    constraintSet.connect(mDownvoteButton.getId(), ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END);
+                } else {
+                    constraintSet.connect(mDownvoteButton.getId(), ConstraintSet.END, mDownvoteTextView.getId(), ConstraintSet.START);
+                    constraintSet.connect(mDownvoteTextView.getId(), ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END);
+                }
+
                 constraintSet.connect(commentsCountTextView.getId(), ConstraintSet.START, mSaveButton.getId(), ConstraintSet.END);
                 constraintSet.connect(commentsCountTextView.getId(), ConstraintSet.END, mUpvoteButton.getId(), ConstraintSet.START);
                 constraintSet.connect(mSaveButton.getId(), ConstraintSet.START, mShareButton.getId(), ConstraintSet.END);
@@ -1500,8 +1740,14 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         AspectRatioGifImageView mIconGifImageView;
         @BindView(R.id.subreddit_text_view_item_post_detail_video_autoplay)
         TextView mSubredditTextView;
+
+        @BindView(R.id.community_instance_text_view_item_post_detail_video_autoplay)
+        TextView mCommunityInstanceTextView;
         @BindView(R.id.user_text_view_item_post_detail_video_autoplay)
         TextView mUserTextView;
+        @BindView(R.id.user_instance_text_view_item_post_detail_video_autoplay)
+        TextView mUserInstanceTextView;
+
         @BindView(R.id.author_flair_text_view_item_post_detail_video_autoplay)
         TextView mAuthorFlairTextView;
         @BindView(R.id.post_time_text_view_item_post_detail_video_autoplay)
@@ -1552,6 +1798,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         ImageView mUpvoteButton;
         @BindView(R.id.score_text_view_item_post_detail_video_autoplay)
         TextView mScoreTextView;
+
+        @BindView(R.id.downvote_text_view_item_post_detail_video_autoplay)
+        TextView mDownvoteTextView;
         @BindView(R.id.minus_button_item_post_detail_video_autoplay)
         ImageView mDownvoteButton;
         @BindView(R.id.comments_count_item_post_detail_video_autoplay)
@@ -1573,7 +1822,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
             ButterKnife.bind(this, itemView);
             setBaseView(mIconGifImageView,
                     mSubredditTextView,
+                    mCommunityInstanceTextView,
                     mUserTextView,
+                    mUserInstanceTextView,
                     mAuthorFlairTextView,
                     mPostTimeTextView,
                     mTitleTextView,
@@ -1590,6 +1841,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                     mBottomConstraintLayout,
                     mUpvoteButton,
                     mScoreTextView,
+                    mDownvoteTextView,
                     mDownvoteButton,
                     commentsCountTextView,
                     mSaveButton,
@@ -1638,8 +1890,8 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                     } else {
                         intent.setData(Uri.parse(mPost.getVideoUrl()));
                         intent.putExtra(ViewVideoActivity.EXTRA_VIDEO_DOWNLOAD_URL, mPost.getVideoDownloadUrl());
-                        intent.putExtra(ViewVideoActivity.EXTRA_SUBREDDIT, mPost.getSubredditName());
-                        intent.putExtra(ViewVideoActivity.EXTRA_ID, mPost.getId());
+                        intent.putExtra(ViewVideoActivity.EXTRA_VIDEO_TYPE, ViewVideoActivity.VIDEO_TYPE_DIRECT);
+
                     }
                     intent.putExtra(ViewVideoActivity.EXTRA_POST_TITLE, mPost.getTitle());
                     if (helper != null) {
@@ -1807,8 +2059,12 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         AspectRatioGifImageView mIconGifImageView;
         @BindView(R.id.subreddit_text_view_item_post_detail_video_and_gif_preview)
         TextView mSubredditTextView;
+        @BindView(R.id.community_instance_text_view_item_post_detail_video_and_gif_preview)
+        TextView mCommunityInstanceTextView;
         @BindView(R.id.user_text_view_item_post_detail_video_and_gif_preview)
         TextView mUserTextView;
+        @BindView(R.id.user_instance_text_view_item_post_detail_video_and_gif_preview)
+        TextView mUserInstanceTextView;
         @BindView(R.id.author_flair_text_view_item_post_detail_video_and_gif_preview)
         TextView mAuthorFlairTextView;
         @BindView(R.id.post_time_text_view_item_post_detail_video_and_gif_preview)
@@ -1851,6 +2107,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         ImageView mUpvoteButton;
         @BindView(R.id.score_text_view_item_post_detail_video_and_gif_preview)
         TextView mScoreTextView;
+
+        @BindView(R.id.downvote_text_view_item_post_detail_video_and_gif_preview)
+        TextView mDownvoteTextView;
         @BindView(R.id.minus_button_item_post_detail_video_and_gif_preview)
         ImageView mDownvoteButton;
         @BindView(R.id.comments_count_item_post_detail_video_and_gif_preview)
@@ -1865,7 +2124,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
             ButterKnife.bind(this, itemView);
             setBaseView(mIconGifImageView,
                     mSubredditTextView,
+                    mCommunityInstanceTextView,
                     mUserTextView,
+                    mUserInstanceTextView,
                     mAuthorFlairTextView,
                     mPostTimeTextView,
                     mTitleTextView,
@@ -1882,6 +2143,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                     mBottomConstraintLayout,
                     mUpvoteButton,
                     mScoreTextView,
+                    mDownvoteTextView,
                     mDownvoteButton,
                     commentsCountTextView,
                     mSaveButton,
@@ -1911,8 +2173,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                             intent.putExtra(ViewVideoActivity.EXTRA_STREAMABLE_SHORT_CODE, mPost.getStreamableShortCode());
                         } else {
                             intent.setData(Uri.parse(mPost.getVideoUrl()));
-                            intent.putExtra(ViewVideoActivity.EXTRA_SUBREDDIT, mPost.getSubredditName());
-                            intent.putExtra(ViewVideoActivity.EXTRA_ID, mPost.getId());
+                            intent.putExtra(ViewVideoActivity.EXTRA_VIDEO_TYPE, ViewVideoActivity.VIDEO_TYPE_DIRECT);
                             intent.putExtra(ViewVideoActivity.EXTRA_VIDEO_DOWNLOAD_URL, mPost.getVideoDownloadUrl());
                         }
                         intent.putExtra(ViewVideoActivity.EXTRA_POST_TITLE, mPost.getTitle());
@@ -1937,8 +2198,12 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         AspectRatioGifImageView mIconGifImageView;
         @BindView(R.id.subreddit_text_view_item_post_detail_image_and_gif_autoplay)
         TextView mSubredditTextView;
+        @BindView(R.id.community_instance_text_view_item_post_detail_image_and_gif_autoplay)
+        TextView mCommunityInstanceTextView;
         @BindView(R.id.user_text_view_item_post_detail_image_and_gif_autoplay)
         TextView mUserTextView;
+        @BindView(R.id.user_instance_text_view_item_post_detail_image_and_gif_autoplay)
+        TextView mUserInstanceTextView;
         @BindView(R.id.author_flair_text_view_item_post_detail_image_and_gif_autoplay)
         TextView mAuthorFlairTextView;
         @BindView(R.id.post_time_text_view_item_post_detail_image_and_gif_autoplay)
@@ -1981,6 +2246,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         ImageView mUpvoteButton;
         @BindView(R.id.score_text_view_item_post_detail_image_and_gif_autoplay)
         TextView mScoreTextView;
+
+        @BindView(R.id.downvote_text_view_item_post_detail_image_and_gif_autoplay)
+        TextView mDownvoteTextView;
         @BindView(R.id.minus_button_item_post_detail_image_and_gif_autoplay)
         ImageView mDownvoteButton;
         @BindView(R.id.comments_count_item_post_detail_image_and_gif_autoplay)
@@ -1995,7 +2263,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
             ButterKnife.bind(this, itemView);
             setBaseView(mIconGifImageView,
                     mSubredditTextView,
+                    mCommunityInstanceTextView,
                     mUserTextView,
+                    mUserInstanceTextView,
                     mAuthorFlairTextView,
                     mPostTimeTextView,
                     mTitleTextView,
@@ -2012,6 +2282,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                     mBottomConstraintLayout,
                     mUpvoteButton,
                     mScoreTextView,
+                    mDownvoteTextView,
                     mDownvoteButton,
                     commentsCountTextView,
                     mSaveButton,
@@ -2050,8 +2321,12 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         AspectRatioGifImageView mIconGifImageView;
         @BindView(R.id.subreddit_text_view_item_post_detail_link)
         TextView mSubredditTextView;
+        @BindView(R.id.community_instance_text_view_item_post_detail_link)
+        TextView mCommunityInstanceTextView;
         @BindView(R.id.user_text_view_item_post_detail_link)
         TextView mUserTextView;
+        @BindView(R.id.user_instance_text_view_item_post_detail_link)
+        TextView mUserInstanceTextView;
         @BindView(R.id.author_flair_text_view_item_post_detail_link)
         TextView mAuthorFlairTextView;
         @BindView(R.id.post_time_text_view_item_post_detail_link)
@@ -2096,6 +2371,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         ImageView mUpvoteButton;
         @BindView(R.id.score_text_view_item_post_detail_link)
         TextView mScoreTextView;
+
+        @BindView(R.id.downvote_text_view_item_post_detail_link)
+        TextView mDownvoteTextView;
         @BindView(R.id.minus_button_item_post_detail_link)
         ImageView mDownvoteButton;
         @BindView(R.id.comments_count_item_post_detail_link)
@@ -2110,7 +2388,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
             ButterKnife.bind(this, itemView);
             setBaseView(mIconGifImageView,
                     mSubredditTextView,
+                    mCommunityInstanceTextView,
                     mUserTextView,
+                    mUserInstanceTextView,
                     mAuthorFlairTextView,
                     mPostTimeTextView,
                     mTitleTextView,
@@ -2127,6 +2407,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                     mBottomConstraintLayout,
                     mUpvoteButton,
                     mScoreTextView,
+                    mDownvoteTextView,
                     mDownvoteButton,
                     commentsCountTextView,
                     mSaveButton,
@@ -2154,8 +2435,12 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         AspectRatioGifImageView mIconGifImageView;
         @BindView(R.id.subreddit_text_view_item_post_detail_no_preview_link)
         TextView mSubredditTextView;
+        @BindView(R.id.community_instance_text_view_item_post_detail_no_preview_link)
+        TextView mCommunityInstanceTextView;
         @BindView(R.id.user_text_view_item_post_detail_no_preview_link)
         TextView mUserTextView;
+        @BindView(R.id.user_instance_text_view_item_post_detail_no_preview_link)
+        TextView mUserInstanceTextView;
         @BindView(R.id.author_flair_text_view_item_post_detail_no_preview_link)
         TextView mAuthorFlairTextView;
         @BindView(R.id.post_time_text_view_item_post_detail_no_preview_link)
@@ -2192,6 +2477,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         ImageView mUpvoteButton;
         @BindView(R.id.score_text_view_item_post_detail_no_preview_link)
         TextView mScoreTextView;
+        @BindView(R.id.downvote_text_view_item_post_detail_no_preview_link)
+        TextView mDownvoteTextView;
+
         @BindView(R.id.minus_button_item_post_detail_no_preview_link)
         ImageView mDownvoteButton;
         @BindView(R.id.comments_count_item_post_detail_no_preview_link)
@@ -2206,7 +2494,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
             ButterKnife.bind(this, itemView);
             setBaseView(mIconGifImageView,
                     mSubredditTextView,
+                    mCommunityInstanceTextView,
                     mUserTextView,
+                    mUserInstanceTextView,
                     mAuthorFlairTextView,
                     mPostTimeTextView,
                     mTitleTextView,
@@ -2223,6 +2513,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                     mBottomConstraintLayout,
                     mUpvoteButton,
                     mScoreTextView,
+                    mDownvoteTextView,
                     mDownvoteButton,
                     commentsCountTextView,
                     mSaveButton,
@@ -2250,7 +2541,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                             intent.putExtra(ViewVideoActivity.EXTRA_STREAMABLE_SHORT_CODE, mPost.getStreamableShortCode());
                         } else {
                             intent.setData(Uri.parse(mPost.getVideoUrl()));
-                            intent.putExtra(ViewVideoActivity.EXTRA_SUBREDDIT, mPost.getSubredditName());
+                            intent.putExtra(ViewVideoActivity.EXTRA_VIDEO_TYPE, ViewVideoActivity.VIDEO_TYPE_DIRECT);
                             intent.putExtra(ViewVideoActivity.EXTRA_ID, mPost.getId());
                             intent.putExtra(ViewVideoActivity.EXTRA_VIDEO_DOWNLOAD_URL, mPost.getVideoDownloadUrl());
                         }
@@ -2295,8 +2586,12 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         AspectRatioGifImageView mIconGifImageView;
         @BindView(R.id.subreddit_text_view_item_post_detail_gallery)
         TextView mSubredditTextView;
+        @BindView(R.id.community_instance_text_view_item_post_detail_gallery)
+        TextView mCommunityInstanceTextView;
         @BindView(R.id.user_text_view_item_post_detail_gallery)
         TextView mUserTextView;
+        @BindView(R.id.user_instance_text_view_item_post_detail_gallery)
+        TextView mUserInstanceTextView;
         @BindView(R.id.author_flair_text_view_item_post_detail_gallery)
         TextView mAuthorFlairTextView;
         @BindView(R.id.post_time_text_view_item_post_detail_gallery)
@@ -2337,6 +2632,8 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         ImageView mUpvoteButton;
         @BindView(R.id.score_text_view_item_post_detail_gallery)
         TextView mScoreTextView;
+        @BindView(R.id.downvote_text_view_item_post_detail_gallery)
+        TextView mDownvoteTextView;
         @BindView(R.id.minus_button_item_post_detail_gallery)
         ImageView mDownvoteButton;
         @BindView(R.id.comments_count_item_post_detail_gallery)
@@ -2352,7 +2649,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
             ButterKnife.bind(this, itemView);
             setBaseView(mIconGifImageView,
                     mSubredditTextView,
+                    mCommunityInstanceTextView,
                     mUserTextView,
+                    mUserInstanceTextView,
                     mAuthorFlairTextView,
                     mPostTimeTextView,
                     mTitleTextView,
@@ -2369,6 +2668,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                     mBottomConstraintLayout,
                     mUpvoteButton,
                     mScoreTextView,
+                    mDownvoteTextView,
                     mDownvoteButton,
                     commentsCountTextView,
                     mSaveButton,
@@ -2490,8 +2790,12 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         AspectRatioGifImageView mIconGifImageView;
         @BindView(R.id.subreddit_text_view_item_post_detail_text)
         TextView mSubredditTextView;
+        @BindView(R.id.community_instance_text_view_item_post_detail_text)
+        TextView mCommunityInstanceTextView;
         @BindView(R.id.user_text_view_item_post_detail_text)
         TextView mUserTextView;
+        @BindView(R.id.user_instance_text_view_item_post_detail_text)
+        TextView mUserInstanceTextView;
         @BindView(R.id.author_flair_text_view_item_post_detail_text)
         TextView mAuthorFlairTextView;
         @BindView(R.id.post_time_text_view_item_post_detail_text)
@@ -2524,6 +2828,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
         ImageView mUpvoteButton;
         @BindView(R.id.score_text_view_item_post_detail_text)
         TextView mScoreTextView;
+
+        @BindView(R.id.downvote_text_view_item_post_detail_text)
+        TextView mDownvoteTextView;
         @BindView(R.id.minus_button_item_post_detail_text)
         ImageView mDownvoteButton;
         @BindView(R.id.comments_count_item_post_detail_text)
@@ -2538,7 +2845,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
             ButterKnife.bind(this, itemView);
             setBaseView(mIconGifImageView,
                     mSubredditTextView,
+                    mCommunityInstanceTextView,
                     mUserTextView,
+                    mUserInstanceTextView,
                     mAuthorFlairTextView,
                     mPostTimeTextView,
                     mTitleTextView,
@@ -2555,6 +2864,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                     mBottomConstraintLayout,
                     mUpvoteButton,
                     mScoreTextView,
+                    mDownvoteTextView,
                     mDownvoteButton,
                     commentsCountTextView,
                     mSaveButton,

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

@@ -0,0 +1,343 @@
+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,34 +27,35 @@ import java.util.Locale;
 
 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.core.MarkwonTheme;
-import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
-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.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.message.Message;
+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.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;
 
 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 Message mMessage;
+    private PrivateMessage mMessage;
     private ViewPrivateMessagesActivity mViewPrivateMessagesActivity;
     private RequestManager mGlide;
     private Locale mLocale;
@@ -70,7 +71,7 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
 
     public PrivateMessagesDetailRecyclerViewAdapter(ViewPrivateMessagesActivity viewPrivateMessagesActivity,
                                                     SharedPreferences sharedPreferences, Locale locale,
-                                                    Message message, String accountName,
+                                                    PrivateMessage message, String accountName,
                                                     CustomThemeWrapper customThemeWrapper) {
         mMessage = message;
         mViewPrivateMessagesActivity = viewPrivateMessagesActivity;
@@ -83,7 +84,6 @@ 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,6 +108,8 @@ 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))
@@ -127,9 +129,9 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
     @Override
     public int getItemViewType(int position) {
         if (position == 0) {
-            return mMessage.getAuthor().equals(mAccountName) ? VIEW_TYPE_MESSAGE_SENT : VIEW_TYPE_MESSAGE_RECEIVED;
+            return mMessage.getCreatorQualifiedName().equals(mAccountName) ? VIEW_TYPE_MESSAGE_SENT : VIEW_TYPE_MESSAGE_RECEIVED;
         } else {
-            return mMessage.getReplies().get(position - 1).getAuthor().equals(mAccountName) ? VIEW_TYPE_MESSAGE_SENT : VIEW_TYPE_MESSAGE_RECEIVED;
+            return mMessage.getReplies().get(position - 1).getCreatorQualifiedName().equals(mAccountName) ? VIEW_TYPE_MESSAGE_SENT : VIEW_TYPE_MESSAGE_RECEIVED;
         }
     }
 
@@ -145,7 +147,7 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        Message message;
+        PrivateMessage message;
         if (holder.getBindingAdapterPosition() == 0) {
             message = mMessage;
         } else {
@@ -153,12 +155,12 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
         }
         if (message != null) {
             if (holder instanceof MessageViewHolder) {
-                mMarkwon.setMarkdown(((MessageViewHolder) holder).messageTextView, message.getBody());
+                mMarkwon.setMarkdown(((MessageViewHolder) holder).messageTextView, message.getContent());
 
                 if (mShowElapsedTime) {
-                    ((MessageViewHolder) holder).timeTextView.setText(Utils.getElapsedTime(mViewPrivateMessagesActivity, message.getTimeUTC()));
+                    ((MessageViewHolder) holder).timeTextView.setText(Utils.getElapsedTime(mViewPrivateMessagesActivity, message.getPublished()));
                 } else {
-                    ((MessageViewHolder) holder).timeTextView.setText(Utils.getFormattedTime(mLocale, message.getTimeUTC(), mTimeFormatPattern));
+                    ((MessageViewHolder) holder).timeTextView.setText(Utils.getFormattedTime(mLocale, message.getPublished(), mTimeFormatPattern));
                 }
             }
 
@@ -166,26 +168,33 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
                 ((SentMessageViewHolder) holder).messageTextView.setBackground(Utils.getTintedDrawable(mViewPrivateMessagesActivity,
                         R.drawable.private_message_ballon, mSentMessageBackgroundColor));
             } else if (holder instanceof ReceivedMessageViewHolder) {
-                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);
-                    }
-                });
+                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);
+                        }
+                    });
+                }
 
                 ((ReceivedMessageViewHolder) holder).userAvatarImageView.setOnClickListener(view -> {
-                    if (message.isAuthorDeleted()) {
-                        return;
-                    }
+
                     Intent intent = new Intent(mViewPrivateMessagesActivity, ViewUserDetailActivity.class);
-                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, message.getAuthor());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, message.getCreatorName());
+                    intent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, message.getCreatorQualifiedName());
                     mViewPrivateMessagesActivity.startActivity(intent);
                 });
 
@@ -207,12 +216,12 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
         }
     }
 
-    public void setMessage(Message message) {
+    public void setMessage(PrivateMessage message) {
         mMessage = message;
         notifyDataSetChanged();
     }
 
-    public void addReply(Message reply) {
+    public void addReply(PrivateMessage reply) {
         int currentSize = getItemCount();
 
         if (mMessage != null) {
@@ -273,7 +282,7 @@ public class PrivateMessagesDetailRecyclerViewAdapter extends RecyclerView.Adapt
             copyImageView.setColorFilter(mSecondaryTextColor, android.graphics.PorterDuff.Mode.SRC_IN);
 
             copyImageView.setOnClickListener(view -> {
-                Message message;
+                PrivateMessage message;
                 if (getBindingAdapterPosition() == 0) {
                     message = mMessage;
                 } else {
@@ -282,7 +291,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.getBody());
+                        ClipData clip = ClipData.newPlainText("simple text", message.getContent());
                         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

@@ -16,13 +16,6 @@ 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;
@@ -33,6 +26,13 @@ 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;

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

@@ -1,9 +1,11 @@
 package eu.toldi.infinityforlemmy.adapters;
 
 import android.content.Intent;
+import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -22,6 +24,7 @@ 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.asynctasks.InsertSubscribedThings;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.subscribedsubreddit.SubscribedSubredditData;
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
@@ -158,11 +161,31 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
                 fullname = mSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).getQualified_name();
                 iconUrl = mSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).getIconUrl();
 
+                if (mSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).isFavorite()) {
+                    ((SubredditViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
+                } else {
+                    ((SubredditViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
+                }
+
+                ((SubredditViewHolder) viewHolder).favoriteImageView.setOnClickListener(view -> {
+                    if (mSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).isFavorite()) {
+                        ((SubredditViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
+                        mSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).setFavorite(false);
+                    } else {
+                        ((SubredditViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
+                        mSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).setFavorite(true);
+                    }
+                    InsertSubscribedThings.insertSubscribedThings(mExecutor, new Handler(), mRedditDataRoomDatabase, mSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset),
+                            () -> {
+                            });
+                });
+
                 if (itemClickListener != null) {
                     viewHolder.itemView.setOnClickListener(view -> itemClickListener.onClick(communityData));
                 }
             }
 
+
             if (itemClickListener == null) {
                 String finalFullname = fullname;
                 viewHolder.itemView.setOnClickListener(view -> {
@@ -201,12 +224,33 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
             String name = mFavoriteSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).getName();
             String iconUrl = mFavoriteSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).getIconUrl();
 
+            if (mFavoriteSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).isFavorite()) {
+                ((FavoriteSubredditViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
+            } else {
+                ((FavoriteSubredditViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
+            }
+
+            ((FavoriteSubredditViewHolder) viewHolder).favoriteImageView.setOnClickListener(view -> {
+                if (mFavoriteSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).isFavorite()) {
+                    ((FavoriteSubredditViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_border_24dp);
+                    mFavoriteSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).setFavorite(false);
+                } else {
+                    ((FavoriteSubredditViewHolder) viewHolder).favoriteImageView.setImageResource(R.drawable.ic_favorite_24dp);
+                    mFavoriteSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).setFavorite(true);
+                }
+                InsertSubscribedThings.insertSubscribedThings(mExecutor, new Handler(), mRedditDataRoomDatabase, mFavoriteSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset),
+                        () -> {
+                        });
+            });
+
             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);
+                    intent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY,
+                            mFavoriteSubscribedSubredditData.get(viewHolder.getBindingAdapterPosition() - offset).getQualified_name());
                     mActivity.startActivity(intent);
                 });
             }
@@ -243,6 +287,7 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
     public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
         if(holder instanceof SubredditViewHolder) {
             glide.clear(((SubredditViewHolder) holder).iconGifImageView);
+            ((SubredditViewHolder) holder).favoriteImageView.setVisibility(View.VISIBLE);
         } else if (holder instanceof FavoriteSubredditViewHolder) {
             glide.clear(((FavoriteSubredditViewHolder) holder).iconGifImageView);
         }
@@ -317,6 +362,8 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
         GifImageView iconGifImageView;
         @BindView(R.id.thing_name_text_view_item_subscribed_thing)
         TextView subredditNameTextView;
+        @BindView(R.id.favorite_image_view_item_subscribed_thing)
+        ImageView favoriteImageView;
 
         SubredditViewHolder(View itemView) {
             super(itemView);
@@ -333,6 +380,9 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
         GifImageView iconGifImageView;
         @BindView(R.id.thing_name_text_view_item_subscribed_thing)
         TextView subredditNameTextView;
+        @BindView(R.id.favorite_image_view_item_subscribed_thing)
+        ImageView favoriteImageView;
+
 
         FavoriteSubredditViewHolder(View itemView) {
             super(itemView);

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

@@ -148,7 +148,7 @@ public class UserListingRecyclerViewAdapter extends PagedListAdapter<UserData, R
 
                                 @Override
                                 public void isNotSubscribed() {
-                                    ((DataViewHolder) holder).subscribeButton.setVisibility(View.VISIBLE);
+
                                     ((DataViewHolder) holder).subscribeButton.setOnClickListener(view -> {
                                         UserFollowing.followUser(oauthRetrofit, retrofit,
                                                 accessToken, userData.getName(), accountName, redditDataRoomDatabase,

app/src/main/java/eu/toldi/infinityforlemmy/adapters/navigationdrawer/AccountSectionRecyclerViewAdapter.java

@@ -24,8 +24,8 @@ public class AccountSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recy
 
     private static final int VIEW_TYPE_MENU_GROUP_TITLE = 1;
     private static final int VIEW_TYPE_MENU_ITEM = 2;
-    private static final int ACCOUNT_SECTION_ITEMS = 5;
-    private static final int ANONYMOUS_ACCOUNT_SECTION_ITEMS = 3;
+    private static final int ACCOUNT_SECTION_ITEMS = 4;
+    private static final int ANONYMOUS_ACCOUNT_SECTION_ITEMS = 1;
 
     private BaseActivity baseActivity;
     private int inboxCount;
@@ -101,10 +101,6 @@ public class AccountSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recy
                         drawableId = R.drawable.ic_subscritptions_bottom_app_bar_24dp;
                         break;
                     case 3:
-                        stringId = R.string.multi_reddit;
-                        drawableId = R.drawable.ic_multi_reddit_24dp;
-                        break;
-                    case 4:
                         setOnClickListener = false;
                         if (inboxCount > 0) {
                             ((MenuItemViewHolder) holder).menuTextView.setText(baseActivity.getString(R.string.inbox_with_count, inboxCount));
@@ -118,23 +114,21 @@ public class AccountSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recy
                         });
                         break;
                     default:
-                        stringId = R.string.history;
-                        drawableId = R.drawable.ic_history_24dp;
-
+                        stringId = R.string.account_saved_thing_activity_label;
+                        drawableId = R.drawable.ic_outline_bookmarks_24dp;
+                        break;
                 }
             } else {
                 switch (position) {
+
                     case 1:
                         stringId = R.string.subscriptions;
                         drawableId = R.drawable.ic_subscritptions_bottom_app_bar_24dp;
                         break;
-                    case 2:
-                        stringId = R.string.multi_reddit;
-                        drawableId = R.drawable.ic_multi_reddit_24dp;
-                        break;
                     default:
-                        stringId = R.string.history;
-                        drawableId = R.drawable.ic_history_24dp;
+                        stringId = R.string.anonymous_account_instance;
+                        drawableId = R.drawable.ic_account_circle_24dp;
+                        break;
                 }
             }
 

app/src/main/java/eu/toldi/infinityforlemmy/adapters/navigationdrawer/HeaderSectionRecyclerViewAdapter.java

@@ -39,6 +39,7 @@ public class HeaderSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
     private Resources resources;
     private RequestManager glide;
     private String accountName;
+    private String accountQualifiedName;
     private String profileImageUrl;
     private String bannerImageUrl;
     private int karma;
@@ -50,7 +51,7 @@ public class HeaderSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
     private boolean hideKarma;
 
     public HeaderSectionRecyclerViewAdapter(BaseActivity baseActivity, CustomThemeWrapper customThemeWrapper,
-                                            RequestManager glide, String accountName,
+                                            RequestManager glide, String accountName, String accountQualifiedName,
                                             SharedPreferences sharedPreferences,
                                             SharedPreferences navigationDrawerSharedPreferences,
                                             SharedPreferences securitySharedPreferences,
@@ -62,6 +63,7 @@ public class HeaderSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
         this.accountName = accountName;
         isLoggedIn = accountName != null;
         this.pageToggle = pageToggle;
+        this.accountQualifiedName = accountQualifiedName;
         requireAuthToAccountSection = securitySharedPreferences.getBoolean(SharedPreferencesUtils.REQUIRE_AUTHENTICATION_TO_GO_TO_ACCOUNT_SECTION_IN_NAVIGATION_DRAWER, false);
         showAvatarOnTheRightInTheNavigationDrawer = sharedPreferences.getBoolean(SharedPreferencesUtils.SHOW_AVATAR_ON_THE_RIGHT, false);
         showAvatarOnTheRightInTheNavigationDrawer = navigationDrawerSharedPreferences.getBoolean(SharedPreferencesUtils.SHOW_AVATAR_ON_THE_RIGHT, false);
@@ -86,15 +88,11 @@ public class HeaderSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
             }
             ((NavHeaderViewHolder) holder).profileImageView.setLayoutParams(params);
             if (isLoggedIn) {
-                if (hideKarma) {
-                    int karmaTextHeight = ((NavHeaderViewHolder) holder).karmaTextView.getHeight();
-                    ((NavHeaderViewHolder) holder).karmaTextView.setVisibility(View.GONE);
-                    ((NavHeaderViewHolder) holder).accountNameTextView.setTranslationY(karmaTextHeight / 2);
-                } else {
-                    ((NavHeaderViewHolder) holder).karmaTextView.setVisibility(View.VISIBLE);
-                    ((NavHeaderViewHolder) holder).karmaTextView.setText(baseActivity.getString(R.string.karma_info, karma));
-                    ((NavHeaderViewHolder) holder).accountNameTextView.setTranslationY(0);
-                }
+
+                ((NavHeaderViewHolder) holder).karmaTextView.setVisibility(View.VISIBLE);
+                ((NavHeaderViewHolder) holder).karmaTextView.setText(accountQualifiedName);
+                ((NavHeaderViewHolder) holder).accountNameTextView.setTranslationY(0);
+
                 ((NavHeaderViewHolder) holder).accountNameTextView.setText(accountName);
                 if (profileImageUrl != null && !profileImageUrl.equals("")) {
                     glide.load(profileImageUrl)

app/src/main/java/eu/toldi/infinityforlemmy/adapters/navigationdrawer/LemmySectionRecyclerViewAdapter.java

@@ -18,13 +18,13 @@ import eu.toldi.infinityforlemmy.activities.BaseActivity;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 
-public class RedditSectionRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class LemmySectionRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private static final int VIEW_TYPE_MENU_GROUP_TITLE = 1;
     private static final int VIEW_TYPE_MENU_ITEM = 2;
-    private static final int REDDIT_SECTION_ITEMS = 1;
+    private static final int LEMMY_SECTION_ITEMS = 2;
 
-    private static final int REDDIT_SECTION_ANONYMOUS_ITEMS = 2;
+    private static final int LEMMY_SECTION_ANONYMOUS_ITEMS = 2;
     private final boolean isLoggedIn;
 
     private BaseActivity baseActivity;
@@ -34,9 +34,9 @@ public class RedditSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
     private boolean collapseRedditSection;
     private NavigationDrawerRecyclerViewMergedAdapter.ItemClickListener itemClickListener;
 
-    public RedditSectionRecyclerViewAdapter(BaseActivity baseActivity, CustomThemeWrapper customThemeWrapper,
-                                            SharedPreferences navigationDrawerSharedPreferences,
-                                            NavigationDrawerRecyclerViewMergedAdapter.ItemClickListener itemClickListener, boolean isLoggedIn) {
+    public LemmySectionRecyclerViewAdapter(BaseActivity baseActivity, CustomThemeWrapper customThemeWrapper,
+                                           SharedPreferences navigationDrawerSharedPreferences,
+                                           NavigationDrawerRecyclerViewMergedAdapter.ItemClickListener itemClickListener, boolean isLoggedIn) {
         this.baseActivity = baseActivity;
         primaryTextColor = customThemeWrapper.getPrimaryTextColor();
         secondaryTextColor = customThemeWrapper.getSecondaryTextColor();
@@ -76,10 +76,10 @@ public class RedditSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
             holder.itemView.setOnClickListener(view -> {
                 if (collapseRedditSection) {
                     collapseRedditSection = !collapseRedditSection;
-                    notifyItemRangeInserted(holder.getBindingAdapterPosition() + 1, REDDIT_SECTION_ITEMS);
+                    notifyItemRangeInserted(holder.getBindingAdapterPosition() + 1, isLoggedIn ? LEMMY_SECTION_ITEMS : LEMMY_SECTION_ANONYMOUS_ITEMS);
                 } else {
                     collapseRedditSection = !collapseRedditSection;
-                    notifyItemRangeRemoved(holder.getBindingAdapterPosition() + 1, REDDIT_SECTION_ITEMS);
+                    notifyItemRangeRemoved(holder.getBindingAdapterPosition() + 1, isLoggedIn ? LEMMY_SECTION_ITEMS : LEMMY_SECTION_ANONYMOUS_ITEMS);
                 }
                 notifyItemChanged(holder.getBindingAdapterPosition());
             });
@@ -89,12 +89,19 @@ public class RedditSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
 
             switch (position) {
                 case 1:
-                    stringId = R.string.trending;
-                    drawableId = R.drawable.ic_trending_24dp;
+                    stringId = R.string.instance_info;
+                    drawableId = R.drawable.ic_baseline_info_24;
                     break;
                 case 2:
-                    stringId = R.string.anonymous_account_instance;
-                    drawableId = R.drawable.ic_account_circle_24dp;
+                    if (isLoggedIn) {
+                        stringId = R.string.blocks;
+                        drawableId = R.drawable.ic_outline_lock_24dp;
+                        break;
+                    } else {
+                        stringId = R.string.anonymous_account_instance;
+                        drawableId = R.drawable.ic_account_circle_24dp;
+                        break;
+                    }
             }
 
             ((MenuItemViewHolder) holder).menuTextView.setText(stringId);
@@ -106,7 +113,7 @@ public class RedditSectionRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
 
     @Override
     public int getItemCount() {
-        return !collapseRedditSection ? (isLoggedIn ? REDDIT_SECTION_ITEMS + 1 : REDDIT_SECTION_ANONYMOUS_ITEMS + 1) : 1;
+        return !collapseRedditSection ? (isLoggedIn ? LEMMY_SECTION_ITEMS + 1 : LEMMY_SECTION_ANONYMOUS_ITEMS + 1) : 1;
     }
 
     class MenuGroupTitleViewHolder extends RecyclerView.ViewHolder {

app/src/main/java/eu/toldi/infinityforlemmy/adapters/navigationdrawer/NavigationDrawerRecyclerViewMergedAdapter.java

@@ -17,12 +17,11 @@ import eu.toldi.infinityforlemmy.subscribedsubreddit.SubscribedSubredditData;
 public class NavigationDrawerRecyclerViewMergedAdapter {
     private HeaderSectionRecyclerViewAdapter headerSectionRecyclerViewAdapter;
     private AccountSectionRecyclerViewAdapter accountSectionRecyclerViewAdapter;
-    private RedditSectionRecyclerViewAdapter redditSectionRecyclerViewAdapter;
-    private PostSectionRecyclerViewAdapter postSectionRecyclerViewAdapter;
     private PreferenceSectionRecyclerViewAdapter preferenceSectionRecyclerViewAdapter;
     private FavoriteSubscribedSubredditsSectionRecyclerViewAdapter favoriteSubscribedSubredditsSectionRecyclerViewAdapter;
     private SubscribedSubredditsRecyclerViewAdapter subscribedSubredditsRecyclerViewAdapter;
     private AccountManagementSectionRecyclerViewAdapter accountManagementSectionRecyclerViewAdapter;
+    private LemmySectionRecyclerViewAdapter lemmySectionRecyclerViewAdapter;
     private ConcatAdapter mainPageConcatAdapter;
 
     public NavigationDrawerRecyclerViewMergedAdapter(BaseActivity baseActivity, SharedPreferences sharedPreferences,
@@ -30,12 +29,12 @@ public class NavigationDrawerRecyclerViewMergedAdapter {
                                                      SharedPreferences navigationDrawerSharedPreferences,
                                                      SharedPreferences securitySharedPreferences,
                                                      CustomThemeWrapper customThemeWrapper,
-                                                     String accountName,
+                                                     String accountName, String accountQualifiedName,
                                                      ItemClickListener itemClickListener) {
         RequestManager glide = Glide.with(baseActivity);
 
         headerSectionRecyclerViewAdapter = new HeaderSectionRecyclerViewAdapter(baseActivity, customThemeWrapper,
-                glide, accountName, sharedPreferences, navigationDrawerSharedPreferences, securitySharedPreferences,
+                glide, accountName, accountQualifiedName, sharedPreferences, navigationDrawerSharedPreferences, securitySharedPreferences,
                 new HeaderSectionRecyclerViewAdapter.PageToggle() {
                     @Override
                     public void openAccountSection() {
@@ -49,10 +48,6 @@ public class NavigationDrawerRecyclerViewMergedAdapter {
                 });
         accountSectionRecyclerViewAdapter = new AccountSectionRecyclerViewAdapter(baseActivity, customThemeWrapper,
                 navigationDrawerSharedPreferences, accountName != null, itemClickListener);
-        redditSectionRecyclerViewAdapter = new RedditSectionRecyclerViewAdapter(baseActivity, customThemeWrapper,
-                navigationDrawerSharedPreferences, itemClickListener, accountName != null);
-        postSectionRecyclerViewAdapter = new PostSectionRecyclerViewAdapter(baseActivity, customThemeWrapper,
-                navigationDrawerSharedPreferences, accountName != null, itemClickListener);
         preferenceSectionRecyclerViewAdapter = new PreferenceSectionRecyclerViewAdapter(baseActivity, customThemeWrapper,
                 accountName, nsfwAndSpoilerSharedPreferences, navigationDrawerSharedPreferences, itemClickListener);
         favoriteSubscribedSubredditsSectionRecyclerViewAdapter = new FavoriteSubscribedSubredditsSectionRecyclerViewAdapter(
@@ -61,12 +56,13 @@ public class NavigationDrawerRecyclerViewMergedAdapter {
                 customThemeWrapper, navigationDrawerSharedPreferences, itemClickListener);
         accountManagementSectionRecyclerViewAdapter = new AccountManagementSectionRecyclerViewAdapter(baseActivity,
                 customThemeWrapper, glide, accountName != null, itemClickListener);
+        lemmySectionRecyclerViewAdapter = new LemmySectionRecyclerViewAdapter(baseActivity, customThemeWrapper,
+                navigationDrawerSharedPreferences, itemClickListener, accountName != null);
 
         mainPageConcatAdapter = new ConcatAdapter(
                 headerSectionRecyclerViewAdapter,
                 accountSectionRecyclerViewAdapter,
-                redditSectionRecyclerViewAdapter,
-                postSectionRecyclerViewAdapter,
+                lemmySectionRecyclerViewAdapter,
                 preferenceSectionRecyclerViewAdapter,
                 favoriteSubscribedSubredditsSectionRecyclerViewAdapter,
                 subscribedSubredditsRecyclerViewAdapter);
@@ -78,8 +74,7 @@ public class NavigationDrawerRecyclerViewMergedAdapter {
 
     private void openAccountSection() {
         mainPageConcatAdapter.removeAdapter(accountSectionRecyclerViewAdapter);
-        mainPageConcatAdapter.removeAdapter(redditSectionRecyclerViewAdapter);
-        mainPageConcatAdapter.removeAdapter(postSectionRecyclerViewAdapter);
+        mainPageConcatAdapter.removeAdapter(lemmySectionRecyclerViewAdapter);
         mainPageConcatAdapter.removeAdapter(preferenceSectionRecyclerViewAdapter);
         mainPageConcatAdapter.removeAdapter(favoriteSubscribedSubredditsSectionRecyclerViewAdapter);
         mainPageConcatAdapter.removeAdapter(subscribedSubredditsRecyclerViewAdapter);
@@ -91,8 +86,7 @@ public class NavigationDrawerRecyclerViewMergedAdapter {
         mainPageConcatAdapter.removeAdapter(accountManagementSectionRecyclerViewAdapter);
 
         mainPageConcatAdapter.addAdapter(accountSectionRecyclerViewAdapter);
-        mainPageConcatAdapter.addAdapter(redditSectionRecyclerViewAdapter);
-        mainPageConcatAdapter.addAdapter(postSectionRecyclerViewAdapter);
+        mainPageConcatAdapter.addAdapter(lemmySectionRecyclerViewAdapter);
         mainPageConcatAdapter.addAdapter(preferenceSectionRecyclerViewAdapter);
         mainPageConcatAdapter.addAdapter(favoriteSubscribedSubredditsSectionRecyclerViewAdapter);
         mainPageConcatAdapter.addAdapter(subscribedSubredditsRecyclerViewAdapter);

app/src/main/java/eu/toldi/infinityforlemmy/apis/LemmyAPI.java

@@ -1,18 +1,34 @@
 package eu.toldi.infinityforlemmy.apis;
 
+import androidx.annotation.NonNull;
+
 import com.google.common.util.concurrent.ListenableFuture;
 
 import eu.toldi.infinityforlemmy.dto.AccountLoginDTO;
+import eu.toldi.infinityforlemmy.dto.AuthDTO;
+import eu.toldi.infinityforlemmy.dto.BlockCommunityDTO;
 import eu.toldi.infinityforlemmy.dto.CommentDTO;
 import eu.toldi.infinityforlemmy.dto.CommentVoteDTO;
+import eu.toldi.infinityforlemmy.dto.DeleteCommentDTO;
+import eu.toldi.infinityforlemmy.dto.DeletePostDTO;
 import eu.toldi.infinityforlemmy.dto.EditCommentDTO;
 import eu.toldi.infinityforlemmy.dto.EditPostDTO;
 import eu.toldi.infinityforlemmy.dto.FollowCommunityDTO;
 import eu.toldi.infinityforlemmy.dto.PostVoteDTO;
+import eu.toldi.infinityforlemmy.dto.PrivateMessageDTO;
+import eu.toldi.infinityforlemmy.dto.PrivateMessageReadDTO;
+import eu.toldi.infinityforlemmy.dto.PrivateMessageReportDTO;
+import eu.toldi.infinityforlemmy.dto.PrivateMessageUpdateDTO;
+import eu.toldi.infinityforlemmy.dto.ReadCommentDTO;
+import eu.toldi.infinityforlemmy.dto.ReadMessageDTO;
 import eu.toldi.infinityforlemmy.dto.ReadPostDTO;
+import eu.toldi.infinityforlemmy.dto.ReportCommentDTO;
+import eu.toldi.infinityforlemmy.dto.ReportPostDTO;
 import eu.toldi.infinityforlemmy.dto.SaveCommentDTO;
 import eu.toldi.infinityforlemmy.dto.SavePostDTO;
 import eu.toldi.infinityforlemmy.dto.SubmitPostDTO;
+import eu.toldi.infinityforlemmy.dto.UserBlockDTO;
+import eu.toldi.infinityforlemmy.message.MessageCount;
 import okhttp3.MultipartBody;
 import retrofit2.Call;
 import retrofit2.Response;
@@ -34,6 +50,34 @@ public interface LemmyAPI {
     @GET("api/v3/user")
     Call<String> userInfo(@Query("username") String username, @Query("auth") String access_token);
 
+    @Headers("Content-Type: application/json")
+    @POST("api/v3/user/block")
+    Call<String> userBlock(@Body UserBlockDTO params);
+
+    @GET("api/v3/user/mention")
+    Call<String> userMentions(@Query("sort") String sort, @Query("page") Integer page, @Query("limit") Integer limit, @Query("unread_only") boolean unread_only, @Query("auth") String access_token);
+
+    @GET("api/v3/user/replies")
+    Call<String> userReplies(@Query("sort") String sort, @Query("page") Integer page, @Query("limit") Integer limit, @Query("unread_only") boolean unread_only, @Query("auth") String access_token);
+
+    @GET("api/v3/private_message/list")
+    Call<String> privateMessageList(@Query("page") Integer page, @Query("limit") Integer limit, @Query("unread_only") boolean unread_only, @Query("auth") String access_token);
+
+    @GET("api/v3/user/unread_count")
+    Call<MessageCount> userUnreadCount(@NonNull @Query("auth") String access_token);
+
+    @Headers("Content-Type: application/json")
+    @POST("api/v3/user/mention/mark_as_read")
+    Call<String> userMentionMarkAsRead(@Body ReadMessageDTO params);
+
+    @Headers("Content-Type: application/json")
+    @POST("api/v3/comment/mark_as_read")
+    Call<String> commentMarkAsRead(@Body ReadCommentDTO params);
+
+    @Headers("Content-Type: application/json")
+    @POST("api/v3/user/mark_all_as_read")
+    Call<String> userMarkAllAsRead(@Body AuthDTO params);
+
     @GET("api/v3/community")
     Call<String> communityInfo(@Query("name") String name, @Query("auth") String access_token);
 
@@ -44,10 +88,18 @@ public interface LemmyAPI {
     @POST("api/v3/post")
     Call<String> postCreate(@Body SubmitPostDTO params);
 
+    @Headers("Content-Type: application/json")
+    @POST("api/v3/post/report")
+    Call<String> postReport(@Body ReportPostDTO params);
+
     @Headers("Content-Type: application/json")
     @PUT("api/v3/post")
     Call<String> postUpdate(@Body EditPostDTO params);
 
+    @Headers("Content-Type: application/json")
+    @POST("api/v3/post/delete")
+    Call<String> postDelete(@Body DeletePostDTO params);
+
     @GET("api/v3/user")
     ListenableFuture<Response<String>> getUserPosts(
             @Query("username") String username,
@@ -96,10 +148,18 @@ public interface LemmyAPI {
     @POST("api/v3/comment/like")
     Call<String> commentLike(@Body CommentVoteDTO params);
 
+    @Headers("Content-Type: application/json")
+    @POST("api/v3/comment/report")
+    Call<String> commentReport(@Body ReportCommentDTO params);
+
     @Headers("Content-Type: application/json")
     @POST("api/v3/community/follow")
     Call<String> communityFollow(@Body FollowCommunityDTO params);
 
+    @Headers("Content-Type: application/json")
+    @POST("api/v3/community/block")
+    Call<String> communityBlock(@Body BlockCommunityDTO params);
+
     @Headers("Content-Type: application/json")
     @PUT("api/v3/post/save")
     Call<String> postSave(@Body SavePostDTO params);
@@ -159,6 +219,10 @@ public interface LemmyAPI {
     @POST("api/v3/comment")
     Call<String> postComment(@Body CommentDTO params);
 
+    @Headers("Content-Type: application/json")
+    @POST("api/v3/comment/delete")
+    Call<String> commentDelete(@Body DeleteCommentDTO params);
+
     @Headers("Content-Type: application/json")
     @PUT("api/v3/comment")
     Call<String> commentEdit(@Body EditCommentDTO params);
@@ -181,4 +245,42 @@ public interface LemmyAPI {
             @Query("id") int commentId,
             @Query("auth") String auth
     );
+
+    @GET("api/v3/site")
+    Call<String> getSiteInfo(
+            @Query("auth") String auth
+    );
+
+    @GET("api/v3/private_message/list")
+    Call<String> privateMessagesList(
+            @Query("page") Integer page,
+            @Query("limit") Integer limit,
+            @Query("unread_only") Boolean unread_only,
+            @NonNull @Query("auth") String auth
+    );
+
+    @POST("api/v3/private_message")
+    Call<String> privateMessageSend(
+            @Body PrivateMessageDTO params
+    );
+
+    @PUT("api/v3/private_message")
+    Call<String> privateMessageEdit(
+            @Body PrivateMessageUpdateDTO params
+    );
+
+    @POST("api/v3/private_message/delete")
+    Call<String> privateMessageDelete(
+            @Body PrivateMessageUpdateDTO params
+    );
+
+    @POST("api/v3/private_message/mark_as_read")
+    Call<String> privateMessageMarkAsRead(
+            @Body PrivateMessageReadDTO params
+    );
+
+    @POST("api/v3/private_message/report")
+    Call<String> privateMessageReport(
+            @Body PrivateMessageReportDTO params
+    );
 }

app/src/main/java/eu/toldi/infinityforlemmy/asynctasks/InsertBlockedThings.java

@@ -0,0 +1,130 @@
+package eu.toldi.infinityforlemmy.asynctasks;
+
+import android.os.Handler;
+
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Executor;
+
+import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
+import eu.toldi.infinityforlemmy.blockedcommunity.BlockedCommunityDao;
+import eu.toldi.infinityforlemmy.blockedcommunity.BlockedCommunityData;
+import eu.toldi.infinityforlemmy.blockeduser.BlockedUserDao;
+import eu.toldi.infinityforlemmy.blockeduser.BlockedUserData;
+
+
+public class InsertBlockedThings {
+
+    public static void insertBlockedThings(Executor executor, Handler handler,
+                                           RedditDataRoomDatabase redditDataRoomDatabase, @Nullable String accountName,
+                                           List<BlockedCommunityData> blockedCommunityDataList,
+                                           List<BlockedUserData> blockedUserDataDataList,
+
+                                           InsertBlockedThingListener insertSubscribedThingListener) {
+        executor.execute(() -> {
+            if (accountName != null && redditDataRoomDatabase.accountDao().getAccountData(accountName) == null) {
+                handler.post(insertSubscribedThingListener::insertSuccess);
+                return;
+            }
+
+            BlockedUserDao blockedUserDao = redditDataRoomDatabase.blockedUserDao();
+            BlockedCommunityDao blockedCommunityDao = redditDataRoomDatabase.blockedCommunityDao();
+
+
+            if (blockedCommunityDataList != null) {
+                List<BlockedCommunityData> existingBlockedCommunityDaoList =
+                        blockedCommunityDao.getAllBlockedCommunitiesList(accountName);
+                Collections.sort(blockedCommunityDataList, (subscribedSubredditData, t1) -> subscribedSubredditData.getName().compareToIgnoreCase(t1.getName()));
+                List<String> unsubscribedSubreddits = new ArrayList<>();
+                compareTwoSubscribedSubredditList(blockedCommunityDataList, existingBlockedCommunityDaoList,
+                        unsubscribedSubreddits);
+
+                for (String unsubscribed : unsubscribedSubreddits) {
+                    blockedCommunityDao.deleteBlockedCommunity(unsubscribed, accountName);
+                }
+
+                for (BlockedCommunityData s : blockedCommunityDataList) {
+                    blockedCommunityDao.insert(s);
+                }
+            }
+
+            if (blockedUserDataDataList != null) {
+                List<BlockedUserData> existingBlockedUserDataList =
+                        blockedUserDao.getAllBlockedUsersList(accountName);
+                Collections.sort(blockedUserDataDataList, (subscribedUserData, t1) -> subscribedUserData.getName().compareToIgnoreCase(t1.getName()));
+                List<String> unsubscribedUsers = new ArrayList<>();
+                compareTwoSubscribedUserList(blockedUserDataDataList, existingBlockedUserDataList,
+                        unsubscribedUsers);
+
+                for (String unsubscribed : unsubscribedUsers) {
+                    blockedUserDao.deleteBlockedUser(unsubscribed, accountName);
+                }
+
+                for (BlockedUserData s : blockedUserDataDataList) {
+                    blockedUserDao.insert(s);
+                }
+            }
+
+            handler.post(insertSubscribedThingListener::insertSuccess);
+        });
+    }
+
+    private static void compareTwoSubscribedSubredditList(List<BlockedCommunityData> newSubscribedSubreddits,
+                                                          List<BlockedCommunityData> oldSubscribedSubreddits,
+                                                          List<String> unsubscribedSubredditNames) {
+        int newIndex = 0;
+        for (int oldIndex = 0; oldIndex < oldSubscribedSubreddits.size(); oldIndex++) {
+            if (newIndex >= newSubscribedSubreddits.size()) {
+                for (; oldIndex < oldSubscribedSubreddits.size(); oldIndex++) {
+                    unsubscribedSubredditNames.add(oldSubscribedSubreddits.get(oldIndex).getQualified_name());
+                }
+                return;
+            }
+
+            BlockedCommunityData old = oldSubscribedSubreddits.get(oldIndex);
+            for (; newIndex < newSubscribedSubreddits.size(); newIndex++) {
+                if (newSubscribedSubreddits.get(newIndex).getQualified_name().compareToIgnoreCase(old.getQualified_name()) == 0) {
+                    newIndex++;
+                    break;
+                }
+                if (newSubscribedSubreddits.get(newIndex).getQualified_name().compareToIgnoreCase(old.getQualified_name()) > 0) {
+                    unsubscribedSubredditNames.add(old.getQualified_name());
+                    break;
+                }
+            }
+        }
+    }
+
+    private static void compareTwoSubscribedUserList(List<BlockedUserData> newSubscribedUsers,
+                                                     List<BlockedUserData> oldSubscribedUsers,
+                                                     List<String> unsubscribedUserNames) {
+        int newIndex = 0;
+        for (int oldIndex = 0; oldIndex < oldSubscribedUsers.size(); oldIndex++) {
+            if (newIndex >= newSubscribedUsers.size()) {
+                for (; oldIndex < oldSubscribedUsers.size(); oldIndex++) {
+                    unsubscribedUserNames.add(oldSubscribedUsers.get(oldIndex).getQualifiedName());
+                }
+                return;
+            }
+
+            BlockedUserData old = oldSubscribedUsers.get(oldIndex);
+            for (; newIndex < newSubscribedUsers.size(); newIndex++) {
+                if (newSubscribedUsers.get(newIndex).getName().compareToIgnoreCase(old.getName()) == 0) {
+                    newIndex++;
+                    break;
+                }
+                if (newSubscribedUsers.get(newIndex).getName().compareToIgnoreCase(old.getName()) > 0) {
+                    unsubscribedUserNames.add(old.getQualifiedName());
+                    break;
+                }
+            }
+        }
+    }
+
+    public interface InsertBlockedThingListener {
+        void insertSuccess();
+    }
+}

app/src/main/java/eu/toldi/infinityforlemmy/asynctasks/InsertSubscribedThings.java

@@ -38,7 +38,7 @@ public class InsertSubscribedThings {
             if (subscribedSubredditDataList != null) {
                 List<SubscribedSubredditData> existingSubscribedSubredditDataList =
                         subscribedSubredditDao.getAllSubscribedSubredditsList(accountName);
-                Collections.sort(subscribedSubredditDataList, (subscribedSubredditData, t1) -> subscribedSubredditData.getName().compareToIgnoreCase(t1.getName()));
+                Collections.sort(subscribedSubredditDataList, (subscribedSubredditData, t1) -> subscribedSubredditData.getQualified_name().compareToIgnoreCase(t1.getQualified_name()));
                 List<String> unsubscribedSubreddits = new ArrayList<>();
                 compareTwoSubscribedSubredditList(subscribedSubredditDataList, existingSubscribedSubredditDataList,
                         unsubscribedSubreddits);
@@ -48,6 +48,9 @@ public class InsertSubscribedThings {
                 }
 
                 for (SubscribedSubredditData s : subscribedSubredditDataList) {
+                    if (existingSubscribedSubredditDataList.contains(s)) {
+                        continue;
+                    }
                     subscribedSubredditDao.insert(s);
                 }
             }
@@ -79,7 +82,8 @@ public class InsertSubscribedThings {
         });
     }
 
-    public static void insertSubscribedThings(Executor executor, Handler handler, RedditDataRoomDatabase redditDataRoomDatabase,
+    public static void insertSubscribedThings(Executor executor, Handler
+            handler, RedditDataRoomDatabase redditDataRoomDatabase,
                                               SubscribedSubredditData singleSubscribedSubredditData,
                                               InsertSubscribedThingListener insertSubscribedThingListener) {
         executor.execute(() -> {
@@ -94,7 +98,8 @@ public class InsertSubscribedThings {
         });
     }
 
-    public static void insertSubscribedThings(Executor executor, Handler handler, RedditDataRoomDatabase redditDataRoomDatabase,
+    public static void insertSubscribedThings(Executor executor, Handler
+            handler, RedditDataRoomDatabase redditDataRoomDatabase,
                                               SubscribedUserData mSingleSubscribedUserData,
                                               InsertSubscribedThingListener insertSubscribedThingListener) {
         executor.execute(() -> {
@@ -109,35 +114,37 @@ public class InsertSubscribedThings {
         });
     }
 
-    private static void compareTwoSubscribedSubredditList(List<SubscribedSubredditData> newSubscribedSubreddits,
-                                                   List<SubscribedSubredditData> oldSubscribedSubreddits,
-                                                   List<String> unsubscribedSubredditNames) {
+    private static void compareTwoSubscribedSubredditList
+            (List<SubscribedSubredditData> newSubscribedSubreddits,
+             List<SubscribedSubredditData> oldSubscribedSubreddits,
+             List<String> unsubscribedSubredditNames) {
         int newIndex = 0;
         for (int oldIndex = 0; oldIndex < oldSubscribedSubreddits.size(); oldIndex++) {
             if (newIndex >= newSubscribedSubreddits.size()) {
                 for (; oldIndex < oldSubscribedSubreddits.size(); oldIndex++) {
-                    unsubscribedSubredditNames.add(oldSubscribedSubreddits.get(oldIndex).getName());
+                    unsubscribedSubredditNames.add(oldSubscribedSubreddits.get(oldIndex).getQualified_name());
                 }
                 return;
             }
 
             SubscribedSubredditData old = oldSubscribedSubreddits.get(oldIndex);
             for (; newIndex < newSubscribedSubreddits.size(); newIndex++) {
-                if (newSubscribedSubreddits.get(newIndex).getName().compareToIgnoreCase(old.getName()) == 0) {
+                if (newSubscribedSubreddits.get(newIndex).getQualified_name().compareToIgnoreCase(old.getQualified_name()) == 0) {
                     newIndex++;
                     break;
                 }
-                if (newSubscribedSubreddits.get(newIndex).getName().compareToIgnoreCase(old.getName()) > 0) {
-                    unsubscribedSubredditNames.add(old.getName());
+                if (newSubscribedSubreddits.get(newIndex).getQualified_name().compareToIgnoreCase(old.getQualified_name()) > 0) {
+                    unsubscribedSubredditNames.add(old.getQualified_name());
                     break;
                 }
             }
         }
     }
 
-    private static void compareTwoSubscribedUserList(List<SubscribedUserData> newSubscribedUsers,
-                                              List<SubscribedUserData> oldSubscribedUsers,
-                                              List<String> unsubscribedUserNames) {
+    private static void compareTwoSubscribedUserList
+            (List<SubscribedUserData> newSubscribedUsers,
+             List<SubscribedUserData> oldSubscribedUsers,
+             List<String> unsubscribedUserNames) {
         int newIndex = 0;
         for (int oldIndex = 0; oldIndex < oldSubscribedUsers.size(); oldIndex++) {
             if (newIndex >= newSubscribedUsers.size()) {

app/src/main/java/eu/toldi/infinityforlemmy/asynctasks/LoadSubredditIcon.java

@@ -9,6 +9,7 @@ import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
 import eu.toldi.infinityforlemmy.subreddit.FetchSubredditData;
 import eu.toldi.infinityforlemmy.subreddit.SubredditDao;
 import eu.toldi.infinityforlemmy.subreddit.SubredditData;
+import eu.toldi.infinityforlemmy.utils.LemmyUtils;
 import retrofit2.Retrofit;
 
 public class LoadSubredditIcon {
@@ -18,9 +19,9 @@ public class LoadSubredditIcon {
                                          LoadSubredditIconAsyncTaskListener loadSubredditIconAsyncTaskListener) {
         executor.execute(() -> {
             SubredditDao subredditDao = redditDataRoomDatabase.subredditDao();
-            SubredditData subredditData = subredditDao.getSubredditData(subredditName);
+            SubredditData subredditData = subredditDao.getSubredditDataByActorId(LemmyUtils.qualifiedCommunityName2ActorId(subredditName));
             if (subredditData != null) {
-                String iconImageUrl = subredditDao.getSubredditData(subredditName).getIconUrl();
+                String iconImageUrl = subredditDao.getSubredditDataByActorId(LemmyUtils.qualifiedCommunityName2ActorId(subredditName)).getIconUrl();
                 handler.post(() -> loadSubredditIconAsyncTaskListener.loadIconSuccess(iconImageUrl));
             } else {
                 handler.post(() -> FetchSubredditData.fetchSubredditData(retrofit, subredditName, accessToken, new FetchSubredditData.FetchSubredditDataListener() {

app/src/main/java/eu/toldi/infinityforlemmy/asynctasks/LoadUserData.java

@@ -8,6 +8,7 @@ import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
 import eu.toldi.infinityforlemmy.user.FetchUserData;
 import eu.toldi.infinityforlemmy.user.UserDao;
 import eu.toldi.infinityforlemmy.user.UserData;
+import eu.toldi.infinityforlemmy.utils.LemmyUtils;
 import retrofit2.Retrofit;
 
 public class LoadUserData {
@@ -16,8 +17,9 @@ public class LoadUserData {
                                     Retrofit retrofit, LoadUserDataAsyncTaskListener loadUserDataAsyncTaskListener) {
         executor.execute(() -> {
             UserDao userDao = redditDataRoomDatabase.userDao();
-            if (userDao.getUserData(userName) != null) {
-                String iconImageUrl = userDao.getUserData(userName).getIconUrl();
+            UserData userData= userDao.getUserDataByActorId(LemmyUtils.qualifiedUserName2ActorId(userName));
+            if (userData != null) {
+                String iconImageUrl = userData.getIconUrl();
                 handler.post(() -> loadUserDataAsyncTaskListener.loadUserDataSuccess(iconImageUrl));
             } else {
                 handler.post(() -> FetchUserData.fetchUserData(retrofit, userName, new FetchUserData.FetchUserDataListener() {

app/src/main/java/eu/toldi/infinityforlemmy/asynctasks/ParseAndInsertNewAccount.java

@@ -11,11 +11,11 @@ public class ParseAndInsertNewAccount {
 
     public static void parseAndInsertNewAccount(Executor executor, Handler handler, String username,
                                                 String display_name,String accessToken, String profileImageUrl,
-                                                String bannerImageUrl, String code,String instance, AccountDao accountDao,
+                                                String bannerImageUrl, String code,String instance,boolean can_downvote, AccountDao accountDao,
                                                 ParseAndInsertAccountListener parseAndInsertAccountListener) {
         executor.execute(() -> {
             Account account = new Account(username,display_name, accessToken, code, profileImageUrl,
-                    bannerImageUrl, true,instance);
+                    bannerImageUrl, true,instance,true);
             accountDao.markAllAccountsNonCurrent();
             accountDao.insert(account);
 

app/src/main/java/eu/toldi/infinityforlemmy/asynctasks/SwitchAccount.java

@@ -8,6 +8,8 @@ import java.util.concurrent.Executor;
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
 import eu.toldi.infinityforlemmy.RetrofitHolder;
 import eu.toldi.infinityforlemmy.account.Account;
+import eu.toldi.infinityforlemmy.site.FetchSiteInfo;
+import eu.toldi.infinityforlemmy.site.SiteInfo;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 
 public class SwitchAccount {
@@ -26,6 +28,18 @@ public class SwitchAccount {
                     .putString(SharedPreferencesUtils.ACCOUNT_INSTANCE,account.getInstance_url())
                     .putString(SharedPreferencesUtils.ACCOUNT_IMAGE_URL, account.getProfileImageUrl()).apply();
             retrofitHolder.setBaseURL(account.getInstance_url());
+            FetchSiteInfo.fetchSiteInfo(retrofitHolder.getRetrofit(), account.getAccessToken(), new FetchSiteInfo.FetchSiteInfoListener() {
+                @Override
+                public void onFetchSiteInfoSuccess(SiteInfo siteInfo) {
+                    boolean canDownvote = siteInfo.isEnable_downvotes();
+                    currentAccountSharedPreferences.edit().putBoolean(SharedPreferencesUtils.CAN_DOWNVOTE, canDownvote).apply();
+                }
+
+                @Override
+                public void onFetchSiteInfoFailed() {
+                    currentAccountSharedPreferences.edit().putBoolean(SharedPreferencesUtils.CAN_DOWNVOTE, true).apply();
+                }
+            });
             handler.post(() -> switchAccountListener.switched(account));
         });
 

app/src/main/java/eu/toldi/infinityforlemmy/blockedcommunity/BlockedCommunityDao.java

@@ -0,0 +1,30 @@
+package eu.toldi.infinityforlemmy.blockedcommunity;
+
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
+
+import java.util.List;
+
+@Dao
+public interface BlockedCommunityDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    void insert(BlockedCommunityData communityData);
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    void insertAll(List<BlockedCommunityData> blockedCommunityDataList);
+
+    @Query("SELECT * FROM blocked_communities WHERE account_name = :accountName AND name LIKE '%' || :searchQuery || '%' COLLATE NOCASE ORDER BY name COLLATE NOCASE ASC")
+    LiveData<List<BlockedCommunityData>> getAllBlockedCommunitiesWithSearchQuery(String accountName, String searchQuery);
+
+    @Query("SELECT * FROM blocked_communities WHERE account_name = :accountName COLLATE NOCASE ORDER BY name COLLATE NOCASE ASC")
+    List<BlockedCommunityData> getAllBlockedCommunitiesList(String accountName);
+
+    @Query("SELECT * FROM blocked_communities WHERE name = :name COLLATE NOCASE AND account_name = :accountName COLLATE NOCASE LIMIT 1")
+    BlockedCommunityData getBlockedCommunity(String name, String accountName);
+
+    @Query("DELETE FROM blocked_communities WHERE qualified_name = :name COLLATE NOCASE AND account_name = :accountName COLLATE NOCASE")
+    void deleteBlockedCommunity(String name, String accountName);
+}

app/src/main/java/eu/toldi/infinityforlemmy/blockedcommunity/BlockedCommunityData.java

@@ -0,0 +1,80 @@
+package eu.toldi.infinityforlemmy.blockedcommunity;
+
+import androidx.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+
+import eu.toldi.infinityforlemmy.subreddit.SubredditData;
+import eu.toldi.infinityforlemmy.utils.LemmyUtils;
+
+@Entity(tableName = "blocked_communities", primaryKeys = {"id", "account_name"})
+public class BlockedCommunityData {
+
+    @ColumnInfo(name = "id")
+    private final int id;
+
+    @ColumnInfo(name = "name")
+    private String name;
+
+    @ColumnInfo(name = "qualified_name")
+    private String qualified_name;
+    @ColumnInfo(name = "icon")
+    private String iconUrl;
+
+    @NonNull
+    @ColumnInfo(name = "account_name")
+    private String accountName;
+
+    public BlockedCommunityData(int id, String name, String qualified_name, String iconUrl, @NonNull String accountName) {
+        this.id = id;
+        this.name = name;
+        this.qualified_name = qualified_name;
+        this.iconUrl = iconUrl;
+        this.accountName = accountName;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getQualified_name() {
+        return qualified_name;
+    }
+
+    public String getIconUrl() {
+        return iconUrl;
+    }
+
+    @NonNull
+    public String getAccountName() {
+        return accountName;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setQualified_name(String qualified_name) {
+        this.qualified_name = qualified_name;
+    }
+
+    public void setIconUrl(String iconUrl) {
+        this.iconUrl = iconUrl;
+    }
+
+    public void setAccountName(@NonNull String accountName) {
+        this.accountName = accountName;
+    }
+
+    public BlockedCommunityData(SubredditData subredditData, @NonNull String accountName) {
+        this.id = subredditData.getId();
+        this.name = subredditData.getName();
+        this.qualified_name = LemmyUtils.actorID2FullName(subredditData.getActorId());
+        this.iconUrl = subredditData.getIconUrl();
+        this.accountName = accountName;
+    }
+}

app/src/main/java/eu/toldi/infinityforlemmy/blockedcommunity/BlockedCommunityRepository.java

@@ -0,0 +1,42 @@
+package eu.toldi.infinityforlemmy.blockedcommunity;
+
+import android.os.AsyncTask;
+
+import androidx.lifecycle.LiveData;
+
+import java.util.List;
+
+import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
+
+public class BlockedCommunityRepository {
+    private BlockedCommunityDao blockedCommunityDao;
+    private String mAccountName;
+
+    BlockedCommunityRepository(RedditDataRoomDatabase redditDataRoomDatabase, String accountName) {
+        mAccountName = accountName;
+        blockedCommunityDao = redditDataRoomDatabase.blockedCommunityDao();
+    }
+
+    LiveData<List<BlockedCommunityData>> getAllSubscribedSubredditsWithSearchQuery(String searchQuery) {
+        return blockedCommunityDao.getAllBlockedCommunitiesWithSearchQuery(mAccountName, searchQuery);
+    }
+
+    public void insert(BlockedCommunityData subscribedSubredditData) {
+        new insertAsyncTask(blockedCommunityDao).execute(subscribedSubredditData);
+    }
+
+    private static class insertAsyncTask extends AsyncTask<BlockedCommunityData, Void, Void> {
+
+        private BlockedCommunityDao mAsyncTaskDao;
+
+        insertAsyncTask(BlockedCommunityDao dao) {
+            mAsyncTaskDao = dao;
+        }
+
+        @Override
+        protected Void doInBackground(final BlockedCommunityData... params) {
+            mAsyncTaskDao.insert(params[0]);
+            return null;
+        }
+    }
+}

app/src/main/java/eu/toldi/infinityforlemmy/blockedcommunity/BlockedCommunityViewModel.java

@@ -0,0 +1,60 @@
+package eu.toldi.infinityforlemmy.blockedcommunity;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Transformations;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
+
+import java.util.List;
+
+import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
+
+public class BlockedCommunityViewModel extends AndroidViewModel {
+    private BlockedCommunityRepository blockedCommunityRepository;
+    private LiveData<List<BlockedCommunityData>> mAllBlockedCommunities;
+    private MutableLiveData<String> searchQueryLiveData;
+
+    public BlockedCommunityViewModel(Application application, RedditDataRoomDatabase redditDataRoomDatabase, String accountName) {
+        super(application);
+        blockedCommunityRepository = new BlockedCommunityRepository(redditDataRoomDatabase, accountName);
+        searchQueryLiveData = new MutableLiveData<>();
+        searchQueryLiveData.postValue("");
+
+        mAllBlockedCommunities = Transformations.switchMap(searchQueryLiveData, searchQuery -> blockedCommunityRepository.getAllSubscribedSubredditsWithSearchQuery(searchQuery));
+    }
+
+    public LiveData<List<BlockedCommunityData>> getAllBlockedCommunities() {
+        return mAllBlockedCommunities;
+    }
+
+    public void insert(BlockedCommunityData subscribedSubredditData) {
+        blockedCommunityRepository.insert(subscribedSubredditData);
+    }
+
+    public void setSearchQuery(String searchQuery) {
+        searchQueryLiveData.postValue(searchQuery);
+    }
+
+    public static class Factory extends ViewModelProvider.NewInstanceFactory {
+        private Application mApplication;
+        private RedditDataRoomDatabase mRedditDataRoomDatabase;
+        private String mAccountName;
+
+        public Factory(Application application, RedditDataRoomDatabase redditDataRoomDatabase, String accountName) {
+            this.mApplication = application;
+            this.mRedditDataRoomDatabase = redditDataRoomDatabase;
+            this.mAccountName = accountName;
+        }
+
+        @NonNull
+        @Override
+        public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
+            return (T) new BlockedCommunityViewModel(mApplication, mRedditDataRoomDatabase, mAccountName);
+        }
+    }
+}

app/src/main/java/eu/toldi/infinityforlemmy/blockeduser/BlockedUserDao.java

@@ -0,0 +1,31 @@
+package eu.toldi.infinityforlemmy.blockeduser;
+
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
+
+import java.util.List;
+
+@Dao
+public interface BlockedUserDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    void insert(BlockedUserData userData);
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    void insertAll(List<BlockedUserData> blockedUserDataDataList);
+
+    @Query("SELECT * FROM blocked_users WHERE account_name = :accountName AND name LIKE '%' || :searchQuery || '%' COLLATE NOCASE ORDER BY name COLLATE NOCASE ASC")
+    LiveData<List<BlockedUserData>> getAllBlockedUsersWithSearchQuery(String accountName, String searchQuery);
+
+    @Query("SELECT * FROM blocked_users WHERE account_name = :accountName COLLATE NOCASE ORDER BY name COLLATE NOCASE ASC")
+    List<BlockedUserData> getAllBlockedUsersList(String accountName);
+
+    @Query("SELECT * FROM blocked_users WHERE name = :name COLLATE NOCASE AND account_name = :accountName COLLATE NOCASE LIMIT 1")
+    BlockedUserData getBlockedUser(String name, String accountName);
+
+    @Query("DELETE FROM blocked_users WHERE qualified_name = :name COLLATE NOCASE AND account_name = :accountName COLLATE NOCASE")
+    void deleteBlockedUser(String name, String accountName);
+}

app/src/main/java/eu/toldi/infinityforlemmy/blockeduser/BlockedUserData.java

@@ -0,0 +1,80 @@
+package eu.toldi.infinityforlemmy.blockeduser;
+
+import androidx.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+
+import eu.toldi.infinityforlemmy.user.UserData;
+import eu.toldi.infinityforlemmy.utils.LemmyUtils;
+
+@Entity(tableName = "blocked_users", primaryKeys = {"id", "account_name"})
+public class BlockedUserData {
+
+    @ColumnInfo(name = "id")
+    private final int id;
+
+    @ColumnInfo(name = "name")
+    private String name;
+
+    @ColumnInfo(name = "avatar")
+    private String avatar;
+
+    @ColumnInfo(name = "qualified_name")
+    private String qualifiedName;
+
+    @NonNull
+    @ColumnInfo(name = "account_name")
+    private String accountName;
+
+    public BlockedUserData(int id, String name, String avatar, String qualifiedName, String accountName) {
+        this.id = id;
+        this.name = name;
+        this.avatar = avatar;
+        this.qualifiedName = qualifiedName;
+        this.accountName = accountName;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getQualifiedName() {
+        return qualifiedName;
+    }
+
+    public void setQualifiedName(String qualifiedName) {
+        this.qualifiedName = qualifiedName;
+    }
+
+    public String getAccountName() {
+        return accountName;
+    }
+
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+    public BlockedUserData(UserData userData, @NonNull String accountName) {
+        this.id = userData.getId();
+        this.name = userData.getName();
+        this.avatar = userData.getAvatar();
+        this.qualifiedName = LemmyUtils.actorID2FullName(userData.getActorId());
+        this.accountName = accountName;
+    }
+}