Release 3.33.1

Currently translated at 99.0% (1218 of 1230 strings)

Co-authored-by: Christof Damian <christof@damian.net>
Translate-URL: https://hosted.weblate.org/projects/fedilab/strings/de/
Translation: Fedilab/Strings

.gitea/issue_template/bug.md

@@ -36,6 +36,5 @@ Android version:
 
 
 <!-- If you read our contributing advice -->
-[ ] - I read
+- [ ] I read the [contributing page](https://codeberg.org/tom79/Fedilab/src/branch/main/CONTRIBUTING.md)
-the [contributing page](https://codeberg.org/tom79/Fedilab/src/branch/main/CONTRIBUTING.md)
 

.gitea/issue_template/feature.md

@@ -22,5 +22,4 @@ labels:
 
 
 <!-- If you read our contributing advice -->
-[ ] - I read
+- [ ] I read the [contributing page](https://codeberg.org/tom79/Fedilab/src/branch/main/CONTRIBUTING.md)
-the [contributing page](https://codeberg.org/tom79/Fedilab/src/branch/main/CONTRIBUTING.md)

CONTRIBUTING.md

@@ -3,7 +3,7 @@ CONTRIBUTING
 
 ### Localizations:
 
-Fedilab works only with [Weblate]https://hosted.weblate.org/projects/fedilab), which offers nice
+Fedilab works only with [Weblate](https://hosted.weblate.org/projects/fedilab), which offers nice
 tools for helping in translations. New translations will be automatically merged in a branch.
 
 If you're submiting a merge request and your work adds new strings to the app, make sure they only
@@ -18,4 +18,4 @@ important part is how to reproduce the bug and steps to reproduce it.
 
 ### Pull Requests
 
-Please target the develop branch and not the main branch.
+Please target the develop branch and not the main branch.

README.md

@@ -1,24 +1,46 @@
-[![Translation status](https://hosted.weblate.org/widgets/fedilab/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/fedilab/)
-   [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
-# Fedilab is a multi-accounts client for Mastodon, Pleroma, Friendica and Pixelfed
+<img src="src/fdroid/fastlane/metadata/android/en/images/icon.png" width="100"/>
 
-## Donate
+# Fedilab
+A multi-accounts client for Mastodon, Pleroma, Friendica and Pixelfed
 
-[<img alt="Donate using Liberapay" src="https://img.shields.io/liberapay/patrons/tom79.svg?logo=liberapay"/>](https://liberapay.com/tom79/donate)
 
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg?style=for-the-badge)](https://www.gnu.org/licenses/gpl-3.0)
+[![Weblate project translated](https://img.shields.io/weblate/progress/fedilab?server=https%3A%2F%2Fhosted.weblate.org&style=for-the-badge)](https://hosted.weblate.org/engage/fedilab/)
+[![F-Droid Version](https://img.shields.io/f-droid/v/fr.gouv.etalab.mastodon?label=F-Droid&style=for-the-badge)](https://f-droid.org/app/fr.gouv.etalab.mastodon)
+[![Liberapay patrons](https://img.shields.io/liberapay/patrons/tom79?label=Liberapay&style=for-the-badge)](https://liberapay.com/tom79/donate)
+[![Open Collective backers and sponsors](https://img.shields.io/opencollective/all/fedilab?label=Open%20Collective&style=for-the-badge)](https://opencollective.com/fedilab)
+
+## Screenshots
+
+<img src="src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/1.png" width="150"/>
+&nbsp;&nbsp;
+<img src="src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/2.png" width="150"/>
+&nbsp;&nbsp;
+<img src="src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/4.png" width="150"/>
+&nbsp;&nbsp;
+<img src="src/fdroid/fastlane/metadata/android/en/images/phoneScreenshots/7.png" width="150"/>
 
 ## Download
 
-[<img alt='Get it on Google Play' src='./images/get-it-on-play.png' height="80"/>](https://play.google.com/store/apps/details?id=app.fedilab.android)
+[<img alt='Get it on F-Droid' src='./images/get-it-on-fdroid.png' height="80"/>](https://f-droid.org/app/fr.gouv.etalab.mastodon)&nbsp;&nbsp;[<img alt='Get it on Google Play' src='./images/get-it-on-play.png' height="80"/>](https://play.google.com/store/apps/details?id=app.fedilab.android)
-&nbsp;&nbsp;[<img alt='Get it on F-Droid' src='./images/get-it-on-fdroid.png' height="80"/>](https://f-droid.org/app/fr.gouv.etalab.mastodon)
+
-<img src='https://img.shields.io/f-droid/v/fr.gouv.etalab.mastodon?include_prereleases' />
+## Translate
+
+- [Weblate](https://hosted.weblate.org/engage/fedilab/)
+
+## Donate
+
+- [Liberapay](https://liberapay.com/tom79/donate)
+- [Open Collective](https://opencollective.com/fedilab)
+- [More...](https://fedilab.app/page/donations/)
 
 ## Resources
 
-[WIKI](https://fedilab.app/wiki/home/)
+- [Wiki](https://wiki.fedilab.app)
+- [Releases + Changelogs](https://codeberg.org/tom79/Fedilab/releases)
 
-[Release notes](https://codeberg.org/tom79/Fedilab/tags)
+## Contact
+- Fedi:<br>[toot.fedilab.app/@apps](https://toot.fedilab.app/@apps)
 
-Lead developer: [toot.fedilab.app/@apps](https://toot.fedilab.app/@apps)
 

app/build.gradle

@@ -8,13 +8,13 @@ plugins {
 }
 def flavor
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 21
-        targetSdk 33
+        targetSdk 34
-        versionCode 474
+        versionCode 534
-        versionName "3.16.2"
+        versionName "3.33.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions "default"
@@ -25,12 +25,13 @@ android {
         }
         debug {
             applicationIdSuffix '.debug'
+            pseudoLocalesEnabled true
         }
     }
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_17
     }
     productFlavors {
         fdroid {
@@ -46,16 +47,11 @@ android {
             flavor = "playstore"
         }
     }
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
     buildFeatures {
         viewBinding true
     }
     sourceSets {
         playstore {
-            manifest.srcFile "src/playstore/AndroidManifest.xml"
             java.srcDirs = ['src/main/java', 'src/playstore/java']
             res.srcDirs = ['src/main/res', 'src/playstore/res']
         }
@@ -68,22 +64,34 @@ android {
                     'src/main/res/layouts/mastodon',
                     'src/main/res/layouts/peertube',
                     'src/main/res/layouts',
-                    'src/main/layout',
+
                     'src/main/res/drawables/mastodon',
                     'src/main/res/drawables/peertube',
                     'src/main/res/drawables',
+
                     'src/main/res/menus/mastodon',
                     'src/main/res/menus/peertube',
                     'src/main/res/menus',
+
+                    'src/main/res/values',
+
                     'src/main/res'
             ]
         }
     }
     configurations {
+        cleanedAnnotations
+        implementation.exclude group: 'org.jetbrains', module: 'annotations'
         all {
             exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
         }
     }
+    namespace 'app.fedilab.android'
+    lint {
+        abortOnError false
+        checkReleaseBuilds false
+    }
+    buildToolsVersion '35.0.0'
 }
 allprojects {
     repositories {
@@ -92,20 +100,22 @@ allprojects {
     }
 }
 dependencies {
-    implementation project(':autoimageslider')
+    implementation 'org.unifiedpush.android:connector:3.0.9'
-    implementation 'androidx.appcompat:appcompat:1.6.0'
 
-    implementation 'com.google.android.material:material:1.7.0'
+    playstoreImplementation('org.unifiedpush.android:embedded-fcm-distributor:3.0.0')
 
-    implementation 'com.jaredrummler:colorpicker:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
 
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.android.material:material:1.10.0'
-    implementation "com.google.code.gson:gson:2.9.1"
+
+
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation "com.google.code.gson:gson:2.10.1"
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.retrofit2:converter-simplexml:2.9.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.preference:preference:1.2.1'
     implementation "org.conscrypt:conscrypt-android:2.5.2"
     implementation 'com.vanniktech:emoji-one:0.6.0'
     implementation 'com.github.GrenderG:Toasty:1.5.2'
@@ -116,91 +126,88 @@ dependencies {
         transitive = false
     }
 
-    implementation "org.jsoup:jsoup:1.15.1"
+    implementation "org.jsoup:jsoup:1.18.1"
-
     implementation 'com.github.mergehez:ArgPlayer:v3.1'
+
+    implementation project(':autoimageslider')
     implementation project(path: ':mytransl')
     implementation project(path: ':ratethisapp')
     implementation project(path: ':sparkbutton')
+    implementation project(path: ':colorPicker')
+    implementation project(path: ':mathjaxandroid')
+    implementation project(path: ':doubletapplayerview')
 
     implementation 'com.burhanrashid52:photoeditor:1.5.1'
     implementation("com.vanniktech:android-image-cropper:4.3.3")
-    implementation project(path: ':mathjaxandroid')
     annotationProcessor "com.github.bumptech.glide:compiler:4.12.0"
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
-    implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.23.0'
+    implementation 'com.github.penfeizhou.android.animation:glide-plugin:3.0.5'
-    implementation 'com.google.android.exoplayer:exoplayer:2.18.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.2.1'
-    implementation "androidx.viewpager2:viewpager2:1.0.0"
+    implementation "androidx.media3:media3-exoplayer:1.2.1"
+    implementation "androidx.media3:media3-exoplayer-dash:1.2.1"
+    implementation "androidx.media3:media3-ui:1.2.1"
+    implementation "androidx.media3:media3-session:1.2.1"
+
+
+    implementation "androidx.viewpager2:viewpager2:1.1.0"
     implementation 'com.github.piasy:rxandroidaudio:1.7.0'
     implementation 'com.github.piasy:AudioProcessor:1.7.0'
-    implementation "androidx.work:work-runtime:2.7.1"
+    implementation "androidx.work:work-runtime:2.9.0"
     implementation 'app.futured.hauler:hauler:5.0.0'
     implementation "com.github.chrisbanes:PhotoView:2.3.0"
-    implementation "ch.acra:acra-mail:5.9.6"
+    implementation "ch.acra:acra-mail:5.11.3"
-    implementation "ch.acra:acra-limiter:5.9.3"
+    implementation "ch.acra:acra-limiter:5.11.3"
-    implementation "ch.acra:acra-dialog:5.9.6"
+    implementation "ch.acra:acra-dialog:5.11.3"
     implementation "com.madgag.spongycastle:bctls-jdk15on:1.58.0.0"
-    implementation 'com.github.UnifiedPush:android-connector:2.0.1'
-   // implementation 'com.github.UnifiedPush:android-foss_embedded_fcm_distributor:1.0.0-beta1'
-    playstoreImplementation('com.github.UnifiedPush:android-embedded_fcm_distributor:2.1.3') {
-        exclude group: 'com.google.firebase', module: 'firebase-core'
-        exclude group: 'com.google.firebase', module: 'firebase-analytics'
-        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
-    }
     implementation 'com.burhanrashid52:photoeditor:1.5.1'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-livedata:2.8.7'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.8.7'
-    implementation 'androidx.navigation:navigation-fragment:2.5.3'
+    implementation 'androidx.navigation:navigation-fragment:2.8.7'
-    implementation 'androidx.navigation:navigation-ui:2.5.3'
+    implementation 'androidx.navigation:navigation-ui:2.8.7'
     testImplementation 'junit:junit:'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
     implementation 'com.r0adkll:slidableactivity:2.1.0'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
 
-
+    implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
+    implementation "androidx.fragment:fragment:1.8.6"
-    implementation "androidx.fragment:fragment:1.5.5"
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.browser:browser:1.4.0'
+    implementation 'androidx.browser:browser:1.8.0'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'com.github.amoskorir:avatarimagegenerator:1.5.0'
-    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
+
-    implementation 'com.google.android.exoplayer:extension-mediasession:2.18.1'
     implementation "com.github.mabbas007:TagsEditText:1.0.5"
-    implementation "net.gotev:uploadservice:4.7.0"
+    implementation "net.gotev:uploadservice:4.9.2"
-    implementation "net.gotev:uploadservice-okhttp:4.7.0"
+    implementation "net.gotev:uploadservice-okhttp:4.9.2"
-    implementation 'androidx.media:media:1.6.0'
+    implementation 'androidx.media:media:1.7.0'
     implementation 'com.github.mancj:MaterialSearchBar:0.8.5'
 
-    implementation 'com.github.vkay94:DoubleTapPlayerView:1.0.0'
+    implementation 'com.github.androidmads:QRGenerator:1.0.1'
 
+    implementation 'io.noties.markwon:core:4.6.2'
+    implementation 'io.noties.markwon:ext-tables:4.6.2'
+    implementation 'io.noties.markwon:syntax-highlight:4.6.2'
+    implementation 'io.noties.markwon:ext-strikethrough:4.6.2'
+    implementation 'io.noties.markwon:inline-parser:4.6.2'
+    annotationProcessor 'io.noties:prism4j-bundler:2.0.0'
 
     //************ CAST **************///
 
     //---> Google libs (google_full)
-    playstoreImplementation "com.google.android.gms:play-services-cast-tv:19.0.1"
+    playstoreImplementation "com.google.android.gms:play-services-cast-tv:21.1.1"
-    playstoreImplementation "com.google.android.gms:play-services-cast:21.0.1"
+    playstoreImplementation "com.google.android.gms:play-services-cast:22.0.0"
-    playstoreImplementation "androidx.mediarouter:mediarouter:1.3.0"
+    playstoreImplementation "androidx.mediarouter:mediarouter:1.7.0"
-    playstoreImplementation 'com.google.android.gms:play-services-cast-framework:21.0.1'
+    playstoreImplementation 'com.google.android.gms:play-services-cast-framework:22.0.0'
 
-    playstoreImplementation "com.google.android.gms:play-services-cast-tv:19.0.1"
-    playstoreImplementation "com.google.android.gms:play-services-cast:21.0.1"
-    playstoreImplementation "androidx.mediarouter:mediarouter:1.3.0"
-    playstoreImplementation 'com.google.android.gms:play-services-cast-framework:21.0.1'
 
     //----> Other flavors
     fdroidImplementation 'su.litvak.chromecast:api-v2:0.11.3'
     fdroidImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.0'
     fdroidImplementation 'org.slf4j:slf4j-simple:1.7.30'
-    fdroidImplementation 'com.github.evozi:Cyanea:1.0.7'
-
-    fdroidImplementation 'su.litvak.chromecast:api-v2:0.11.3'
-    fdroidImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.0'
-    fdroidImplementation 'org.slf4j:slf4j-simple:1.7.30'
 
 }
 def getCurrentFlavor() {

app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java

@@ -28,9 +28,10 @@ import android.view.View;
 import android.webkit.MimeTypeMap;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.media3.common.Player;
+import androidx.media3.exoplayer.ExoPlayer;
+
 
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.jetbrains.annotations.NotNull;
@@ -38,6 +39,7 @@ import org.jetbrains.annotations.NotNull;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 
+import app.fedilab.android.BuildConfig;
 import app.fedilab.android.R;
 import app.fedilab.android.databinding.ActivityPeertubeBinding;
 import app.fedilab.android.mastodon.activities.BaseBarActivity;
@@ -100,7 +102,7 @@ public class BasePeertubeActivity extends BaseBarActivity {
         if (item.getItemId() == R.id.action_cast) {
             if (PeertubeBaseMainActivity.chromeCasts != null && PeertubeBaseMainActivity.chromeCasts.size() > 0) {
                 String[] chromecast_choice = new String[PeertubeBaseMainActivity.chromeCasts.size()];
-                AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
+                AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(this);
                 alt_bld.setTitle(R.string.chromecast_choice);
                 int i = 0;
                 for (ChromeCast cc : PeertubeBaseMainActivity.chromeCasts) {
@@ -124,7 +126,8 @@ public class BasePeertubeActivity extends BaseBarActivity {
                             if (PeertubeBaseMainActivity.chromecastActivated) {
                                 b.putInt("displayed", 0);
                                 intentBC.putExtras(b);
-                                LocalBroadcastManager.getInstance(BasePeertubeActivity.this).sendBroadcast(intentBC);
+                                intentBC.setPackage(BuildConfig.APPLICATION_ID);
+                                sendBroadcast(intentBC);
                                 Handler mainHandler = new Handler(Looper.getMainLooper());
                                 Runnable myRunnable = () -> {
                                     binding.doubleTapPlayerView.setVisibility(View.VISIBLE);
@@ -136,7 +139,8 @@ public class BasePeertubeActivity extends BaseBarActivity {
                                 b.putInt("displayed", 1);
                                 b.putSerializable("castedTube", peertube);
                                 intentBC.putExtras(b);
-                                LocalBroadcastManager.getInstance(BasePeertubeActivity.this).sendBroadcast(intentBC);
+                                intentBC.setPackage(BuildConfig.APPLICATION_ID);
+                                sendBroadcast(intentBC);
                                 try {
                                     Handler mainHandler = new Handler(Looper.getMainLooper());
                                     Runnable myRunnable = () -> {

app/src/fdroid/java/app/fedilab/android/activities/PeertubeBaseMainActivity.java

@@ -19,12 +19,14 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.view.View;
 
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.core.content.ContextCompat;
+
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -34,6 +36,7 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 
+import app.fedilab.android.BuildConfig;
 import app.fedilab.android.R;
 import app.fedilab.android.databinding.ActivityMainPeertubeBinding;
 import app.fedilab.android.mastodon.activities.BaseActivity;
@@ -49,34 +52,35 @@ public abstract class PeertubeBaseMainActivity extends BaseActivity implements C
     public static List<ChromeCast> chromeCasts;
     public static ChromeCast chromeCast;
     public static boolean chromecastActivated = false;
-    protected ActivityMainPeertubeBinding binding;
+    protected ActivityMainPeertubeBinding parentBinding;
     private BroadcastReceiver manage_chromecast;
     private VideoData.Video castedTube;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        binding = ActivityMainPeertubeBinding.inflate(getLayoutInflater());
+        parentBinding = ActivityMainPeertubeBinding.inflate(getLayoutInflater());
-        View view = binding.getRoot();
+        View view = parentBinding.getRoot();
         setContentView(view);
         ChromeCastsListener chromeCastsListener = this;
         ChromeCasts.registerListener(chromeCastsListener);
 
 
-        binding.castClose.setOnClickListener(v -> {
+        parentBinding.castClose.setOnClickListener(v -> {
             Intent intentBC = new Intent(Helper.RECEIVE_CAST_SETTINGS);
             Bundle b = new Bundle();
             b.putInt("displayed", 0);
             intentBC.putExtras(b);
-            LocalBroadcastManager.getInstance(PeertubeBaseMainActivity.this).sendBroadcast(intentBC);
+            intentBC.setPackage(BuildConfig.APPLICATION_ID);
+            sendBroadcast(intentBC);
         });
 
-        binding.castTogglePlay.setOnClickListener(v -> {
+        parentBinding.castTogglePlay.setOnClickListener(v -> {
             if (chromeCast != null) {
                 new Thread(() -> {
                     try {
                         Handler mainHandler = new Handler(Looper.getMainLooper());
-                        Runnable myRunnable = () -> binding.castTogglePlay.setVisibility(View.GONE);
+                        Runnable myRunnable = () -> parentBinding.castTogglePlay.setVisibility(View.GONE);
                         mainHandler.post(myRunnable);
                         int icon = -1;
                         if (chromeCast.getMediaStatus().playerState == MediaStatus.PlayerState.PLAYING) {
@@ -88,10 +92,10 @@ public abstract class PeertubeBaseMainActivity extends BaseActivity implements C
                         }
                         if (icon != -1) {
                             int finalIcon = icon;
-                            myRunnable = () -> binding.castTogglePlay.setImageResource(finalIcon);
+                            myRunnable = () -> parentBinding.castTogglePlay.setImageResource(finalIcon);
                             mainHandler.post(myRunnable);
                         }
-                        myRunnable = () -> binding.castTogglePlay.setVisibility(View.VISIBLE);
+                        myRunnable = () -> parentBinding.castTogglePlay.setVisibility(View.VISIBLE);
                         mainHandler.post(myRunnable);
                     } catch (IOException e) {
                         e.printStackTrace();
@@ -127,14 +131,14 @@ public abstract class PeertubeBaseMainActivity extends BaseActivity implements C
                 if (displayed == 1) {
                     chromecastActivated = true;
                     if (castedTube != null) {
-                        binding.castInfo.setVisibility(View.VISIBLE);
+                        parentBinding.castInfo.setVisibility(View.VISIBLE);
-                        Helper.loadGiF(PeertubeBaseMainActivity.this, castedTube.getThumbnailPath(), binding.castView);
+                        Helper.loadGiF(PeertubeBaseMainActivity.this, castedTube.getThumbnailPath(), parentBinding.castView);
-                        binding.castTitle.setText(castedTube.getTitle());
+                        parentBinding.castTitle.setText(castedTube.getTitle());
-                        binding.castDescription.setText(castedTube.getDescription());
+                        parentBinding.castDescription.setText(castedTube.getDescription());
                     }
                 } else if (displayed == 0) {
                     chromecastActivated = false;
-                    binding.castInfo.setVisibility(View.GONE);
+                    parentBinding.castInfo.setVisibility(View.GONE);
                     new Thread(() -> {
                         try {
                             if (chromeCast != null) {
@@ -147,7 +151,7 @@ public abstract class PeertubeBaseMainActivity extends BaseActivity implements C
                 }
             }
         };
-        LocalBroadcastManager.getInstance(PeertubeBaseMainActivity.this).registerReceiver(manage_chromecast, new IntentFilter(Helper.RECEIVE_CAST_SETTINGS));
+        ContextCompat.registerReceiver(PeertubeBaseMainActivity.this, manage_chromecast, new IntentFilter(Helper.RECEIVE_CAST_SETTINGS), ContextCompat.RECEIVER_NOT_EXPORTED);
     }
 
     @Override
@@ -169,8 +173,8 @@ public abstract class PeertubeBaseMainActivity extends BaseActivity implements C
         }
         try {
             if (chromeCast.isAppRunning(Helper.CAST_ID) && chromeCast.getMediaStatus() != null && chromeCast.getMediaStatus().playerState != null) {
-                if (binding.castInfo.getVisibility() == View.GONE) {
+                if (parentBinding.castInfo.getVisibility() == View.GONE) {
-                    binding.castInfo.setVisibility(View.VISIBLE);
+                    parentBinding.castInfo.setVisibility(View.VISIBLE);
                 }
             }
         } catch (IOException e) {
@@ -189,8 +193,11 @@ public abstract class PeertubeBaseMainActivity extends BaseActivity implements C
         super.onDestroy();
         ChromeCasts.unregisterListener(this);
         if (manage_chromecast != null) {
-            LocalBroadcastManager.getInstance(PeertubeBaseMainActivity.this).unregisterReceiver(manage_chromecast);
+            try {
-
+                unregisterReceiver(manage_chromecast);
+            } catch (IllegalArgumentException e) {
+                e.printStackTrace();
+            }
             new Thread(() -> {
                 if (chromeCasts != null && chromeCasts.size() > 0) {
                     for (ChromeCast cast : chromeCasts) {

app/src/main/AndroidManifest.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="app.fedilab.android">
 
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
     <uses-feature
         android:name="android.hardware.camera"
@@ -24,6 +25,8 @@
     <application
         android:name="app.fedilab.android.MainApplication"
         android:allowBackup="false"
+        android:dataExtractionRules="@xml/extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
         android:configChanges="orientation|screenSize"
         android:icon="@mipmap/ic_launcher_bubbles"
         android:label="@string/app_name"
@@ -69,106 +72,13 @@
                     android:host="*"
                     android:pathPrefix="/@"
                     android:scheme="https" />
+                <data
+                    android:host="*"
+                    android:pathPrefix="/notes"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
 
-        <activity-alias
-            android:name=".activities.MainActivity.Bubbles"
-            android:enabled="true"
-            android:exported="true"
-            android:icon="@mipmap/ic_launcher_bubbles"
-            android:roundIcon="@mipmap/ic_launcher_bubbles_round"
-            android:targetActivity=".activities.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/compose_shortcuts" />
-        </activity-alias>
-
-        <activity-alias
-            android:name=".activities.MainActivity.Fediverse"
-            android:enabled="false"
-            android:exported="true"
-            android:icon="@mipmap/ic_launcher_fediverse"
-            android:roundIcon="@mipmap/ic_launcher_fediverse_round"
-            android:targetActivity=".activities.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/compose_shortcuts" />
-        </activity-alias>
-
-        <activity-alias
-            android:name=".activities.MainActivity.Hero"
-            android:enabled="false"
-            android:exported="true"
-            android:icon="@mipmap/ic_launcher_hero"
-            android:roundIcon="@mipmap/ic_launcher_hero_round"
-            android:targetActivity=".activities.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/compose_shortcuts" />
-        </activity-alias>
-
-        <activity-alias
-            android:name=".activities.MainActivity.Atom"
-            android:enabled="false"
-            android:exported="true"
-            android:icon="@mipmap/ic_launcher_atom"
-            android:roundIcon="@mipmap/ic_launcher_atom_round"
-            android:targetActivity=".activities.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/compose_shortcuts" />
-        </activity-alias>
-
-        <activity-alias
-            android:name=".activities.MainActivity.BrainCrash"
-            android:enabled="false"
-            android:exported="true"
-            android:icon="@mipmap/ic_launcher_crash"
-            android:roundIcon="@mipmap/ic_launcher_crash_round"
-            android:targetActivity=".activities.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/compose_shortcuts" />
-        </activity-alias>
-
-        <activity-alias
-            android:name=".activities.MainActivity.Mastalab"
-            android:enabled="false"
-            android:exported="true"
-            android:icon="@mipmap/ic_launcher_mastalab"
-            android:roundIcon="@mipmap/ic_launcher_mastalab_round"
-            android:targetActivity=".activities.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/compose_shortcuts" />
-        </activity-alias>
-
 
         <activity
             android:name=".activities.LoginActivity"
@@ -196,6 +106,9 @@
         <activity
             android:name=".mastodon.activities.ContextActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name=".mastodon.activities.DirectMessageActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".mastodon.activities.DraftActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
@@ -259,7 +172,15 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/action_about"
             android:theme="@style/AppThemeBar" />
-
+        <activity
+            android:name=".mastodon.activities.TimelineActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppThemeBar" />
+        <activity
+            android:name=".mastodon.activities.CheckHomeCacheActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/home_cache"
+            android:theme="@style/AppThemeBar" />
         <activity
             android:name=".mastodon.activities.admin.AdminDomainBlockActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -313,6 +234,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".mastodon.activities.MediaActivity"
+            android:hardwareAccelerated="true"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/Transparent" />
 
@@ -342,6 +264,16 @@
             android:label="@string/action_cache"
             android:theme="@style/AppThemeBar" />
 
+        <activity android:name=".activities.WebActivityPub"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="web+ap" />
+            </intent-filter>
+        </activity>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileProvider"
@@ -360,18 +292,12 @@
             </intent-filter>
         </receiver>
 
-        <receiver
+        <service android:name=".mastodon.services.PushServiceImpl"
-            android:name=".mastodon.services.CustomReceiver"
+            android:exported="false">
-            android:enabled="true"
-            android:exported="true">
             <intent-filter>
-                <action android:name="org.unifiedpush.android.connector.MESSAGE" />
+                <action android:name="org.unifiedpush.android.connector.PUSH_EVENT"/>
-                <action android:name="org.unifiedpush.android.connector.UNREGISTERED" />
-                <action android:name="org.unifiedpush.android.connector.NEW_ENDPOINT" />
-                <action android:name="org.unifiedpush.android.connector.REGISTRATION_FAILED" />
-                <action android:name="org.unifiedpush.android.connector.REGISTRATION_REFUSED" />
             </intent-filter>
-        </receiver>
+        </service>
 
 
         <activity
@@ -379,7 +305,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".peertube.activities.PeertubeActivity"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:supportsPictureInPicture="true"
@@ -469,8 +395,366 @@
 
         <service
             android:name=".peertube.services.RetrieveInfoService"
+            android:foregroundServiceType="dataSync"
             android:exported="false" />
 
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            tools:node="merge" />
 
+        <!-- ============ -->
+        <!-- CUSTOM ICONS -->
+        <!-- ============ -->
+
+        <activity-alias
+            android:name=".activities.MainActivity.Bubbles"
+            android:enabled="true"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_bubbles"
+            android:roundIcon="@mipmap/ic_launcher_bubbles_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+
+        <activity-alias
+            android:name=".activities.MainActivity.BubblesUA"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_bubbles_ua"
+            android:roundIcon="@mipmap/ic_launcher_bubbles_ua_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+
+        <activity-alias
+            android:name=".activities.MainActivity.BubblesPeaGreen"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_bubbles_pea_green"
+            android:roundIcon="@mipmap/ic_launcher_bubbles_pea_green_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.BubblesPride"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_bubbles_pride"
+            android:roundIcon="@mipmap/ic_launcher_bubbles_pride_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.BubblesPink"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_bubbles_pink"
+            android:roundIcon="@mipmap/ic_launcher_bubbles_pink_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.BubblesPirate"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_bubbles_pirate"
+            android:roundIcon="@mipmap/ic_launcher_bubbles_pirate_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.Fediverse"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_fediverse"
+            android:roundIcon="@mipmap/ic_launcher_fediverse_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.Hero"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_hero"
+            android:roundIcon="@mipmap/ic_launcher_hero_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.Atom"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_atom"
+            android:roundIcon="@mipmap/ic_launcher_atom_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.BrainCrash"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_crash"
+            android:roundIcon="@mipmap/ic_launcher_crash_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.Mastalab"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_mastalab"
+            android:roundIcon="@mipmap/ic_launcher_mastalab_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.Leaf"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_leaf"
+            android:roundIcon="@mipmap/ic_launcher_leaf_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.Offset"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_offset"
+            android:roundIcon="@mipmap/ic_launcher_offset_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.Jungle"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_jungle"
+            android:roundIcon="@mipmap/ic_launcher_jungle_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.Confetti"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_confetti"
+            android:roundIcon="@mipmap/ic_launcher_confetti_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.Spaghetti"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_spaghetti"
+            android:roundIcon="@mipmap/ic_launcher_spaghetti_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.Warm"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_warm"
+            android:roundIcon="@mipmap/ic_launcher_warm_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.Purple1"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_purple_1"
+            android:roundIcon="@mipmap/ic_launcher_purple_1_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.Purple2"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_purple_2"
+            android:roundIcon="@mipmap/ic_launcher_purple_2_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.YellowHeadedRedBubble"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_yellow_headed_red_bubble"
+            android:roundIcon="@mipmap/ic_launcher_yellow_headed_red_bubble_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
+
+        <activity-alias
+            android:name=".activities.MainActivity.Mosaic"
+            android:enabled="false"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher_mosaic"
+            android:roundIcon="@mipmap/ic_launcher_mosaic_round"
+            android:targetActivity=".activities.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/compose_shortcuts" />
+        </activity-alias>
     </application>
-</manifest>
+</manifest>

app/src/main/assets/languages/iso_639_1.json

@@ -381,7 +381,7 @@
   },
   {
     "code": "lo",
-    "language": "ພາສາ"
+    "language": "ລາວ"
   },
   {
     "code": "lt",
@@ -726,5 +726,109 @@
   {
     "code": "zu",
     "language": "isiZulu"
+  },
+  {
+    "code": "ast",
+    "language": "Asturianu"
+  },
+  {
+    "code": "ckb",
+    "language": "سۆرانی"
+  },
+  {
+    "code": "cnr",
+    "language": "crnogorski"
+  },
+  {
+    "code": "jbo",
+    "language": "la .lojban."
+  },
+  {
+    "code": "kab",
+    "language": "Taqbaylit"
+  },
+  {
+    "code": "kmr",
+    "language": "Kurmancî"
+  },
+  {
+    "code": "ldn",
+    "language": "Láadan"
+  },
+  {
+    "code": "lfn",
+    "language": "lingua franca nova"
+  },
+  {
+    "code": "sco",
+    "language": "Scots"
+  },
+  {
+    "code": "sma",
+    "language": "Åarjelsaemien Gïele"
+  },
+  {
+    "code": "smj",
+    "language": "Julevsámegiella"
+  },
+  {
+    "code": "szl",
+    "language": "ślůnsko godka"
+  },
+  {
+    "code": "tai",
+    "language": "ภาษาไท or ภาษาไต"
+  },
+  {
+    "code": "tok",
+    "language": "toki pona"
+  },
+  {
+    "code": "zba",
+    "language": "باليبلن"
+  },
+  {
+    "code": "zgh",
+    "language": "ⵜⴰⵎⴰⵣⵉⵖⵜ"
+  },
+  {
+    "code": "en-GB",
+    "language": "English (British)"
+  },
+  {
+    "code": "es-AR",
+    "language": "Español (Argentina)"
+  },
+  {
+    "code": "es-MX",
+    "language": "Español (México)"
+  },
+  {
+    "code": "fr-QC",
+    "language": "Français (Canadien)"
+  },
+  {
+    "code": "pt-BR",
+    "language": "Português (Brasil)"
+  },
+  {
+    "code": "pt-PT",
+    "language": "Português (Portugal)"
+  },
+  {
+    "code": "sr-Latn",
+    "language": "Srpski (latinica)"
+  },
+  {
+    "code": "zh-CN",
+    "language": "简体中文"
+  },
+  {
+    "code": "zh-HK",
+    "language": "繁體中文（香港）"
+  },
+  {
+    "code": "zh-TW",
+    "language": "繁體中文（臺灣）"
   }
 ]

app/src/main/assets/release_notes/notes.json

@@ -1,4 +1,249 @@
 [
+  {
+    "version": "3.33.1",
+    "code": "534",
+    "note": "Added:\n- Highlight bottom hashtags\n- Support Trending Links\n- Featured tags displayed in profiles\n- Add/Remove featured tags from the profile editor\n\nChanged:\n- Add confirmation dialog when long pressing the boost button\n- Open messages by tapping on Scheduled Boost\n- Improve language picker when filtered with some languages\n\nFixed:\n- Limits number of fetch for filters\n- Pleroma instances cannot select media\n- Wrong messages deleted for scheduled (messages and boosts)\n- Fix a crash with long threads\n- Fix a potential memory issue for not cropped media\n- Fix embedded quotes not displayed\n- Some crashes"
+  },
+  {
+    "version": "3.32.3",
+    "code": "532",
+    "note": "Fixed:\n- Polls not displayed\n- Pagination with trends\n- Push notifications not working on some devices"
+  },
+  {
+    "version": "3.32.2",
+    "code": "531",
+    "note": "Added:\n- An outline around media\n\nChanged:\n- Make username, display name in nav drawer clickable\n- Gif media not animated by default\n- Disable by default the mention to the booster when replying. Can be enabled in Settings > Compose (per account)\n\nFixed:\n- Wrong preview picture on share from another app\n- Crash when translating with MinT\n- Refresh and pagination broken for the Trending timeline\n- Fix lags / Crashes"
+  },
+  {
+  "version": "3.32.1",
+  "code": "530",
+  "note": "Fixed:\n- Fix a crash on some devices\n- Hide quote button\n- Fix a layout issue with pictures in landscape\n- Fix a crash when opening the original message from a picture"
+},
+  {
+    "version": "3.32.0",
+    "code": "529",
+    "note": "Added:\n- Add option to disable auto hiding compose button\n\nChanged:\n- Add more content descriptions for buttons\n- Update some buttons\n- Update navigation drawer header\n- Squeeze action buttons when needed to prevent overlapping\n\nFixed:\n- Fix crash when media are too heavy\n- Some custom emojis in bio do not render\n- Posting messages does not work on some Friendica instances\n- Fix a crash with auto-split messages\n- Fix a crash when opening conversations\n- Fix a background color issue when displaying media"
+  },
+  {
+    "version": "3.31.3",
+    "code": "528",
+    "note": "Added:\n- Add new icon launchers (Settings > Interface)\n\nChanged:\n- Make logout/proxy button more visible in main menu\n- Remove permission FOREGROUND_SERVICE\n- Improve a little more media layout with translations\n\nFixed:\n- Fix status bar icons not visible in light theme with custom accent color\n- Reaction buttons not clickable for some instances"
+  },
+  {
+    "version": "3.31.2",
+    "code": "527",
+    "note": "Added:\n- Add support to URL scheme \"web+ap\" for opening profiles with the app\n\nChanged:\n- Layout for media descriptions\n\nFixed:\n- Fix a crash when translating media descriptions\n- Handle included twice when replying to a self user's boost\n- Fix color issues when using a custom theme"
+  },
+  {
+    "version": "3.31.1",
+    "code": "526",
+    "note": "Added:\n- Add MinT machine translation system support\n- Add support \"instance only\" for GoToSocial\n\nFixed:\n- GIF not displayed in timelines\n- Fix a crash when unpinning timelines\n- Top bar coloring at scroll for conversations\n- Black screen when going back from the Peertube section"
+  },
+  {
+    "version": "3.31.0",
+    "code": "524",
+    "note": "Added:\n- Pinned Trending Timeline (can be hidden in Manage Timelines)\n- Add a fallback to the default translator\n- New Pixelfed entry in Settings to disable fullscreen for media\n- Add tooltips for tabs in profiles\n\nChanged:\n- Increase touch area of reply buttons\n- Show a dialog after settings export\n\nFixed:\n- Fix media description not updated when there are several\n- Only a part of DeepL translations are shown\n- Fix Lingva truncated translations\n- Fix a crash when fetching remote profiles\n- Fix a crash with animated emoji\n- Fix a crash when displaying Home cache charts"
+  },
+  {
+    "version": "3.30.1",
+    "code": "523",
+    "note": "Added:\n- Follow Twitter tags\n\nChange:\n- Remove automatic backup (Google only)\n\nFixed:\n- Push notifications not working for some devices\n- Filters not applied to media description\n- Fix a crash with animated images in timelines\n- Fix a crash for long threads\n- Fix a crash due to some messages (happened in different timelines)"
+  },
+  {
+    "version": "3.30.0",
+    "code": "522",
+    "note": "Added:\n- Allow to follow the discover timelines of Pixelfed instances\n- Keep media proportions in timeline for Pixelfed\n- Add a like button in timelines for Pixelfed\n- Allow to login with a token\n\nChange:\n- Use Pixelfed layout when following Pixelfed instances\n- Allow to scroll buttons for larger screens in conversations\n- Move QR code into header\n\nFixed:\n- Not clickable URLs when Markdown is enabled\n- Nitter to follow Twitter accounts\n- Pixelfed timeline not displayed by default\n- Fix admin reports not accessible\n- Top bar coloring at scroll\n- Drafts not saved when adding/editing media descriptions\n- User search suggestions have duplicates\n- Some minor crashes"
+  },
+  {
+    "version": "3.29.2",
+    "code": "518",
+    "note": "Fixed:\n- Fix crash when changing the type of notifications\n- Fix issue with names not displayed fully\n- Fix a crash with notifications and Sharkey\n- Fix a crash when app is back to the foreground\n- Fix xmpp links not opening xmpp clients\n- Fix wrong muted time"
+  },
+  {
+    "version": "3.29.1",
+    "code": "517",
+    "note": "Added:\n- Allow to edit scheduled messages from server side\n\nChanged:\n- Order list name alphabetically in profiles\n- Remove registration for Google\n\nFixed:\n- Push notifications\n- Peertube instances picker\n- Edit scheduled threads (local)\n- Instant search of Hashtag repeats results\n- Quotes broken with Markdowns\n- Fix reports crashes after submitting\n- Fix emoji picker when there is no result\n- Fix other crashes"
+  },
+  {
+    "version": "3.28.2",
+    "code": "515",
+    "note": "Added:\n- Display a QR code on profiles\n\nFixed:\n- Fix tap on messages in conversations\n- Pronouns taking too much place"
+  },
+  {
+    "version": "3.28.1",
+    "code": "514",
+    "note": "Added:\n- Allow to disable pronouns support (default: enabled)\n- Add more support for pronouns (localization in different languages)\n\nFixed:\n- Fix a crash when reporting messages\n- Fix a crash when following tags\n- Fix some display issues\n- Several fixes from the last release (3.28.0)"
+  },
+  {
+    "version": "3.28.0",
+    "code": "513",
+    "note": "Added:\n- Pronouns support (Timeline/Compose/Autocomplete)\n\nChanged:\n- Use Media3 library\n\nFixed:\n- Timed mute duration too long\n- Sharing videos only download them\n- Crashes from previous release"
+  },
+  {
+    "version": "3.27.1",
+    "code": "511",
+    "note": "Added:\n- Tap on account banners to display them as media\n\nFixed:\n- Position lost when switching between accounts\n- Wrong profiles when enabling remote conversations\n- Peertube local timeline\n- Peertube instances search\n- Crashes of the previous release"
+  },
+  {
+    "version": "3.27.0",
+    "code": "510",
+    "note": "Added:\n- Fixed top bar (default: disabled)\n- Usage frequency of tags when composing\n\nChanged:\n- Markdown support disabled by default\n\nFixed:\n- Fix crashes during interactions or when opening a new screen\n- Fix color of dialogs in Settings\n- Some minor crashes"
+  },
+  {
+    "version": "3.26.0",
+    "code": "505",
+    "note": "Added:\n- Android 14 support\n- Automatically split long messages in threads (default: ASK)\n- Links and media are clickable when composing\n- Allow to underline clickable elements (Settings > Timelines - default: disabled)\n- Allow to disable relative date in messages\n- Add a scroll bar for timelines (default: disabled)\n- Add a search bar for custom emojis\n- Links clickable in media descriptions\n\nChanged:\n- Counters close to action buttons\n- Hide emoji picker if the instance has no emoji\n- Followed tags are ordered\n- Account picker when opening with another account\n\nFixed:\n- Avoid error 429 with NTFY\n- Fix custom colors (Android 14)\n- Fix a crash when composing\n- Display issue with followed tags\n- Crashes with profiles\n- Fix an issue with poll and Pleroma\n- Emoji not displayed in the picker\n- Several crashes are fixed"
+  },
+  {
+    "version": "3.25.3",
+    "code": "504",
+    "note": "Added:\n- Add a scroll bar for timelines (default: disabled)\n- Add a search bar for custom emojis\n\nFixed:\n- Fix prompt to split asked several times when refusing\n- Crashes with profiles\n- Fix an issue with poll and Pleroma\n- Emoji not displayed in the picker"
+  },
+  {
+    "version": "3.25.2",
+    "code": "503",
+    "note": "Added:\n- Allow to underline clickable elements (Settings > Timelines - default: disabled)\n- Allow to disable relative date in messages\n\nChanged:\n- Counters close to action buttons\n- Hide emoji picker if the instance has no emoji\n- Followed tags are ordered\n- Account picker when opening with another account\n\nFixed:\n- Fix a crash when composing\n- Fix an issue with the back button\n- Display issue with followed tags"
+  },
+  {
+    "version": "3.25.1",
+    "code": "502",
+    "note": "Fix a crash from release 3.25.0"
+  },
+  {
+    "version": "3.25.0",
+    "code": "501",
+    "note": "Added:\n- Android 14 support\n- Automatically split long messages in threads (default: ASK)\n- Links and media are clickable when composing\n\nFixed:\n- Avoid error 429 with NTFY\n- Several crashes are fixed"
+  },
+  {
+    "version": "3.24.1",
+    "code": "500",
+    "note": "Added:\n- Three new app icons (Pride, Pink and Pirate)\n- Keep position with remote conversations\n\nFixed:\n- Markdown: stop parsing tags and support strike text\n- Cursor more visible when composing\n- Fix custom instance max char length not working\n- Tabs in profiles\n- Fix not clickable tags for some languages\n- Bug with account having huge amount of followers\n- Crash with several gif in same message\n- Poll max chars\n- Some crashes"
+  },
+  {
+    "version": "3.24.0",
+    "code": "499",
+    "note": "Added:\n- Markdown support (can be disabled in Settings > Timelines)\n- Hide / Show Self boosts, self replies and your own messages (Long press the Home tab)\n\nChanged:\n- Full screen size when writing media descriptions.\n- Move media descriptions to the top\n\nFixed:\n- Holes in timelines due to a cache bug\n- Spoiler issue when composing threads\n- CamelCase tags when forwarding them in replies\n- Buttons hidden by keyboard when composing\n- Overlay with menu and buttons when playing videos\n- Clicks on card do not open Mastodon posts inside the app\n- Scrollable bio when editing profiles\n- Crash when adding a user into a list\n- Longer fields when editing bio\n- Crash with Pixelfed\n"
+  },
+  {
+    "version": "3.23.5",
+    "code": "498",
+    "note": "Added:\n- Hide / Show Self boosts and self replies (Long press the Home tab)\n\nChanged:\n- Full screen size when writing media descriptions."
+  },
+  {
+    "version": "3.23.4",
+    "code": "497",
+    "note": "Fixed:\n\n- Holes in timelines due to a cache bug\n- Fix tags issue with RTL and the markdown format\n- Scrollable bio when editing profiles\n- Crash when adding a user into a list"
+  },
+  {
+    "version": "3.23.3",
+    "code": "496",
+    "note": "- Longer fields when editing bio\n- Clicks on card do not open Mastodon posts inside the app\n- Crash with Pixelfed\n- Line breaks with Markdown\n- Side effects with Markdown and some links"
+  },
+  {
+    "version": "3.23.2",
+    "code": "495",
+    "note": "Added:\n- Markdown support (can be disabled in Settings > Timelines)"
+  },
+  {
+    "version": "3.23.1",
+    "code": "494",
+    "note": "Added:\n- Scrollable media description\n\nFixed:\n- Crashes with profiles"
+  },
+  {
+    "version": "3.23.0",
+    "code": "493",
+    "note": "Added:\n- Add preview for app icons\n- Two new app icons\n\nFixed:\n- Fix Nitter feeds\n- Crash with Pixelfed accounts\n- Lingva encoding issue\n- Avoid sleep mode for media activity\n- Videos are played simultaneously\n- Voice messages for Android 10+\n- Punycode not supported for domains"
+  },
+  {
+    "version": "3.22.2",
+    "code": "492",
+    "note": "Added:\n- Follow Lemmy instances (from Manage Timelines)\n- View remote conversations (default: disabled - Settings > Interface)\n\nFixed:\n- Add 50 chars max for poll options\n- Too many requests\n- Blank Home page\n- Crashes when visiting profiles\n- Some audio files cannot be uploaded\n- Multiple notifications\n- Fix some other crashes"
+  },
+  {
+    "version": "3.22.1",
+    "code": "491",
+    "note": "Added:\n- Follow Lemmy instance (from Manage Timelines)\nFixed:\n- Add 50 chars max for poll options"
+  },
+  {
+    "version": "3.22.0",
+    "code": "490",
+    "note": "Fixed:\n- Too many requests\n- Blank Home page\n- Crashes when visiting profiles\n- Some audio files cannot be uploaded"
+  },
+  {
+    "version": "3.21.2",
+    "code": "489",
+    "note": "Added:\n- Android 12+ : Customize accent colors for light/dark theme and per account (Settings > Theming > Custom accent color)\n"
+  },
+  {
+    "version": "3.21.1",
+    "code": "488",
+    "note": "Added:\n- Filter messages in profiles (hide/show boosts or replies) via a long press on the tab\n\nChanged:\n- Some layout improvements for Peertube\n- Better management of resolution with Peertube\n- Improve instance picker for Peertube\n\nFixed:\n- URL in upper cases\n- Issues with Peertube player\n- False positive error when listening to audio\n- GIF does not honor nsfw\n- Polls having html\n- Fix crashes when scrolling timeline with animated gif"
+  },
+  {
+    "version": "3.21.0",
+    "code": "487",
+    "note": "Added:\n- Dedicated Peertube entry in main menu (My app)\n- Select instances (Instances picker with Filters)\n- Comment/Boost/Fav Peertube videos with Mastodon accounts\n\nFixed:\n- Fix a crash when searching and with the user directory"
+  },
+  {
+    "version": "3.20.3",
+    "code": "486",
+    "note": "Added:\n- Display all following/followers lists from remote profiles\n- Display all accounts that boosted/fav from a remote message\n\nFixed:\n- Fix a crash with auto-fetch messages"
+  },
+  {
+    "version": "3.20.2",
+    "code": "485",
+    "note": "Added:\n- Visual indicator when fetching missing messages\n- Open media description when it is missing from the warning dialog\n\nChanged:\n- Maths formula aligned to the left\n- Faster access to delete all notifications\n\nFixed:\n- Fix an issue with Nitter and some URLs\n- Fix refresh issue with notifications\n- Fix an issue when entering a Peertube instance\n- Fix jumps with Akkoma/Pleroma when media preview size is not set\n- Some crashes"
+  },
+  {
+    "version": "3.20.1",
+    "code": "484",
+    "note": "Added:\n- Add a button to fetch remote media when it fails\n- Add a settings to automatically fetch remote media when it fails (default: disabled)\n- Display on profiles & list of accounts if users have requested to follow you\n- Warn before boosting a message having no media descriptions (default: enabled)\n\nChanged:\n- Warn when there are missing descriptions enabled by default\n\nFixed:\n- Some settings not properly restored (multiple choices)\n- Cancel a follow request\n- Media with a lot of height in landscape\n- Some crashes"
+  },
+  {
+    "version": "3.20.0",
+    "code": "483",
+    "note": "Added:\n- \"Follows you\" indicator in accounts list\n- Settings compose: display a dialog to warn if there are missing media description (default: disabled)\n- Settings > Cache:  disable battery optimization\n- Settings > Cache - Add charts to check cache logs\n- Settings > Timelines: AutoPlay gif media (default: enabled)\n- Google: Automatic backup of data and settings\n\nChanged:\n- Improve detections of gap in timelines\n- Improve media description\n- Chat view by default\n- Chat view add an indicator for messages when not direct\n\nFixed:\n- Fix an issue with cache and fetch more\n- Cache view with large fonts\n- Bad behaviors with truncated messages"
+  },
+  {
+    "version": "3.19.1",
+    "code": "482",
+    "note": "Added:\n- Settings compose: display a dialog to warn if there are missing media description (default disabled)\n- Settings > Notification:  disable battery optimization\n- Settings > Timelines: AutoPlay gif media (default: enabled)\n\nFixed:\n- Fix an issue with cache and fetch more\n- Cache view with large fonts\n- Bad behaviors with truncated messages"
+  },
+  {
+    "version": "3.19.0",
+    "code": "481",
+    "note": "Added:\n- Settings compose: don't send media if there are no description (default: disabled)\n- Settings Timelines: Enable/Disable truncate links\n- Allow to set max link length (20 - 150 chars)\n\nChanged:\n- Align media with text (left margin enabled)\n\nFixed:\n- Media previews remain the same when sharing\n- Edit media description not working\n- Accessibility (larger fonts): profiles/DM\n- Cross replies: Wrong visibility with the selected account\n- Several crashes"
+  },
+  {
+    "version": "3.18.2",
+    "code": "480",
+    "note": "Changed:\n- First media layout will depend of its ratio\n\nFixed:\n- Impossible to add media with the chat view\n- Chat view limited in chars\n- Freezes / bad behaviors due to the new media presentation"
+  },
+  {
+    "version": "3.18.1",
+    "code": "479",
+    "note": "Added:\n- Add Lingva translator (Settings > Timelines)\n- Add support for Nyastodon-style emoji reactions (skyevg)\n- Add chat view for DM (default: disable / Settings > Timelines)"
+  },
+  {
+    "version": "3.18.0",
+    "code": "478",
+    "note": "Added:\n- Support camel case tags (automatically recorded when composing)\n- Manage tags when composing (top right menu)\n- Custom tabs (default: enabled)\n\nChanged:\n- Media heights now use the screen size\n- Remove horizontal scroll for media\n- Reduce size of emoji when text size is increased\n- Update available languages in picker\n\nFixed:\n- Forwarded tags are added back after being deleted\n- TalkBack issues\n- Some crashes"
+  },
+  {
+    "version": "3.17.0",
+    "code": "477",
+    "note": "Added:\n- Peertube 2FA support\n- Cache home in background (default disabled -> New settings category and per account) / change frequency\n- Auto-fetch missing messages for the Home (default disabled -> in Settings - Timelines)\n- Automatically switch between tabs when searching\n- More deep links detection\n- Allow to group mentions at the top (default: disabled)\n\n\nFixed:\n- Dynamic color for Android 12+\n- Missing media description for previews\n- Fix a crash when replying\n- Fix button size not changed\n- Forward tags in replies\n- Media cannot be downloaded or shared with Android 10\n- Some crashes"
+  },
+  {
+    "version": "3.16.4",
+    "code": "476",
+    "note": "Added:\n- Cache home in background (default disabled -> New settings category and per account) / change frequency\n- Auto-fetch missing messages for the Home (default disabled -> in Settings - Timelines)\n- Automatically switch between tabs when searching\n\nFixed:\n- Some crashes"
+  },
+  {
+    "version": "3.16.3",
+    "code": "475",
+    "note": "Added:\n- Peertube 2FA support\n\nFixed:\n- Dynamic color for Android 12+"
+  },
   {
     "version": "3.16.2",
     "code": "474",
@@ -48,330 +293,6 @@
     "version": "3.14.3",
     "code": "465",
     "note": "Added:\n- Display date of the message instead of the boost (default: disabled)\n- Allow to disable release notes popup in Settings\n\nFixed:\n- Fix timelines slow down and stuttering after some scrolls\n- Fix color issues with follow buttons\n- Fix import from settings (import from login was OK)"
-  },
-  {
-    "version": "3.14.2",
-    "code": "464",
-    "note": "Added:\n- Display familiar followers on profiles\n- Display and filter Instance directory\n\nChanged:\n- Bot and reply icon indicators more visible\n- Single media are hidden with link previews\n\nFixed:\n- Fix a crash with Art timelines\n- Friendica: media cannot be downloaded/shared\n- Fix a crash with pinned timelines"
-  },
-  {
-    "version": "3.14.1",
-    "code": "463",
-    "note": "Added:\n- Search bar: display suggestions when starting by \"@\" or \"#\"\n\nChanged:\n- Preload media in timelines to avoid jumps\n- Search: Automatically switch to account tab if no results for tags\n\nFixed:\n- Fix jumps with the fetch more feature\n- Fix videos cannot be saved\n- Tags cannot be pinned when there are no custom tabs\n- PixelFed view: NSFW not honored\n- Fix crashes"
-  },
-  {
-    "version": "3.14.0",
-    "code": "462",
-    "note": "Added:\n\n- Add Bubble timeline support in extra-features with filters\n- Allow to display public profiles by default to get all messages (Settings > Interface)\n- Glitch: Allow to post messages locally (Can be turned off in Settings)\n- Pixelfed: Custom layout to display Media fully (Also works for other software when there are media)\n- Allow to align left action buttons in messages\n\nChanged:\n- Full rework on links in messages (also mentions and tags)\n- Add pinned tag in \"any\" to avoid to lose it when renaming timeline\n\nFixed:\n- Links to messages not handled by the app\n- CW when editing a message\n- Fix push notifications with several accounts\n- New messages or edition notifications not pushed\n- Fix quotes with tags/mentions\n- Fix notifications\n- Fix sending multiple media\n- Fix crashes"
-  },
-  {
-    "version": "3.13.7",
-    "code": "461",
-    "note": "Added:\n- Pixelfed: Custom layout to display Media fully \n*(Settings > Timelines > Pixelfed Presentation) - Also works for other softwares when there are media\n\nChanged:\n- Add pinned tag in \"any\" to avoid to lose it when renaming timeline\n\nFixed:\n- Fix push notifications with several accounts\n- Fix quotes with tags/mentions\n- Fix notifications\n- Fix sending multiple media\n- Some crashes"
-  },
-  {
-    "version": "3.13.6",
-    "code": "460",
-    "note": "Fixed:\n- Cross-compose: Wrong instance emojis\n- Custom emojis not displayed in notifications\n- Fav/Boost markers with shared messages\n- Empty notifications\n- Fix cw removed when replying\n- Fix expand media with fit preview images when sensitive\n- Fix an issue with fetch more displayed too often (cache clear will help or wait new messages)"
-  },
-  {
-    "version": "3.13.5",
-    "code": "459",
-    "note": "Added:\n- Glitch: Allow to post messages locally (Can be turned off in Settings)\n\nFixed:\n- Crashes"
-  },
-  {
-    "version": "3.13.4",
-    "code": "458",
-    "note": "Added:\n- Add Bubble timeline support in extra-features with filters\n- Allow to display public profiles by default to get all messages (Settings > Interface)\n\nChanged:\n- Full rework on links in messages (also mentions and tags)\n\nFixed:\n- Spoiler text when editing\n- Fix watermarks"
-  },
-  {
-    "version": "3.13.3",
-    "code": "457",
-    "note": "Added:\n- Allow to enable extra features in Settings\n- Customizable settings for extra features\n- Support quotes, reactions with messages\n- Support text format (html, markdown, etc.) when composing\n\nFixed:\n- CW not working with media\n- Media not displayed for older instances\n- Some crashes\n"
-  },
-  {
-    "version": "3.13.2",
-    "code": "456",
-    "note": "Changed:\n- Hidden media smaller with preview images\n\nFixed:\n- Issue with Media for Android 11+\n- Crash when not setting a translation key\n- Fix DeepL for API pro\n- Crash when visiting a profile with a lot of media\n- Home muted accounts not working without filters\n- Animated custom emoji not displayed"
-  },
-  {
-    "version": "3.13.1",
-    "code": "455",
-    "note": "Added:\n- DeepL translation support free/pro keys\n\nChanged:\n- Hide buttons for media when editing\n\nFixed:\n- GIF loaded as static images\n- Suggested accounts cannot be followed"
-  },
-  {
-    "version": "3.13.0",
-    "code": "454",
-    "note": "Added:\n- Post random quotes\n- Group reblogs in home timeline\n- Rename Nitter timelines\n- Android 13 support\n- Pagination with search / trending\n- Allow to remove left margin in messages (default: disabled)\n\nChanged:\n- Display translate button only when language is different\n- Respect blank spaces between words in messages\n- Focus button more accessible when editing media\n- Visual feedback for block on account list\n- Visual changes with compose / top bar\n- Use custom Nitter timeline name in manage timelines\n\nFixed:\n- Behavior with cw toggle\n- Truncated gimini links\n- Nav buttons not visible with media (Light theme)\n- Status bar with Android 5\n- Fix links not clickable\n- Fix deep links\n- Fix remote threads not fetched for some instances\n- Adding description to shared media\n- Open with another accounts\n- Chars size not respected for Android 5-6\n- Wrong instance fetched for instances.social\n- Bouncing Timeline on refresh\n- Links to mentions, tags, urls, not visible.\n- Custom channel sounds not applied\n- users with short username are not linked\n- Fix crashes"
-  },
-  {
-    "version": "3.12.3",
-    "code": "453",
-    "note": "Added:\n- Pagination with search / trending\n\nFixed:\n- Long press on Nitter tabs\n- Open with another accounts\n- Chars size not respected for Android 5-6\n- Wrong instance fetched for instances.social"
-  },
-  {
-    "version": "3.12.2",
-    "code": "452",
-    "note": "Added:\n- Rename Nitter timelines\n- Android 13 support\n\nChanged:\n- Visual feedback for block on account list\n- Visual changes with compose / top bar\n\nFixed:\n- Nav buttons not visible with media (Light theme)\n- Status bar with Android 5\n- Fix links not clickable\n- Fix deep links\n- Fix remote threads not fetched for some instances\n- Adding description to shared media\n- Fix crashes"
-  },
-  {
-    "version": "3.12.1",
-    "code": "451",
-    "note": "Added:\n- Post random quotes\n- Group reblogs in home timeline\n\nChanged:\n- Display translate button only when language is different\n- Respect blank spaces between words in messages\n- Focus button more accessible when editing media\n\nFixed:\n- Behavior with cw toggle\n- Truncated gimini links"
-  },
-  {
-    "version": "3.12.0",
-    "code": "450",
-    "note": "Added:\n- Full data import/export feature\n- Android 13 themed icon support\n\nFixed:\n- Fix a regression with filters\n- Fix dark solarized theme\n- Fix hide link previews for CW\n- Fix status bar color for all themes\n- Fix language in compose \"...\"\n- Fix add all home muted accounts from lists\n- Fix top notification badges"
-  },
-  {
-    "version": "3.11.3",
-    "code": "449",
-    "note": "Added:\n- Add more targeted languages in picker for translations\n- Add account name in push notifications\n\nFixed:\n- Fix a crash when changing language\n- Fix counter colors\n- Fix default link color\n- Fix a crash when clicking on mentions"
-  },
-  {
-    "version": "3.11.2",
-    "code": "448",
-    "note": "Added:\n- Mute/Unmute accounts in the Home timeline from their messages or their profiles\n- Add all users from a list to \"Muted home\" in one click\n- Display/Manage users that are muted for home\n\nFixed:\n- Timeline crashes"
-  },
-  {
-    "version": "3.11.0",
-    "code": "446",
-    "note": "Added:\n- Display all messages in threads from remote instances (when possible)\n- Allow to unmute/unfollow/unpin a tag from tag timelines\n- Display most used accounts in header menu for an easy switch\n- Automatically add the tag when composing from a tag timeline\n- Add a translate button at the bottom of messages (default: disabled)\n- Add account role in profiles\n- Translate morse\n\nChanged:\n- Disable animations after a refresh\n\nFixed:\n- Contact not working when composing\n- Status bar for black theme\n- Message duplicated in conversations when edited\n- Color issue on Android 5\n- Several crashes"
-  },
-  {
-    "version": "3.10.2",
-    "code": "445",
-    "note": "Added:\n- Allow to unmute/unfollow/unpin a tag from tag timelines\n- Automatically add the tag when composing from a tag timeline\n- Add a translate button at the bottom of messages (default: disabled)\n- Add account role in profiles\n\nFixed:\n- Contact not working when composing\n- Status bar for black theme\n- Message duplicated in conversations when edited\n- Color issue on Android 5"
-  },
-  {
-    "version": "3.10.1",
-    "code": "444",
-    "note": "Added:\n- Display all messages in threads from remote instances (when possible)\n* Only public messages for instances using the Mastodon API\n* A dedicated button is displayed at the top right when conditions are filled."
-  },
-  {
-    "version": "3.10.0",
-    "code": "443",
-    "note": "Added:\n- Dracula theme\n- Customize message colors\n- Enable/Disable Card presentation\n\nChanged:\n- Colors for some themes\n- Space between buttons\n\nFixed:\n- Animated profile pictures not displayed\n- Mentions broken in profile bio and fields\n- Jumps with fit preview images when scrolling up\n- Fetch more button broken with cache\n- Tag patterns in URL break the link\n- Typo in followed tags"
-  },
-  {
-    "version": "3.9.7",
-    "code": "442",
-    "note": "Added:\n- Dracula theme\n\nChanged:\n- Colors for Light/Dark/Black themes\n\nFixed:\n- Animated profile pictures not displayed\n- Mentions broken in profile bio and fields\n- Tag patterns in URL break the link\n- Typo in followed tags"
-  },
-  {
-    "version": "3.9.6",
-    "code": "441",
-    "note": "Fixed:\n- Jumps with fit preview images when scrolling up\n- Fetch more button broken with cache"
-  },
-  {
-    "version": "3.9.5",
-    "code": "440",
-    "note": "Fixed:\n- Custom emoji are not always displayed\n- Jumps in timeline when using \"fit preview images\"\n- Dark theme: timeline buttons without toggle"
-  },
-  {
-    "version": "3.9.4",
-    "code": "439",
-    "note": "Changed:\n- Remove card presentation\n- Link color for black theme\n\nFixed:\n- Crash when changing the theme"
-  },
-  {
-    "version": "3.9.3",
-    "code": "438",
-    "note": "Added:\n- New design with 5 themes\n\nChanged:\n- Remove built-in browser support\n- Fit preview image displays images vertically\n- Add counters next to images\n\nFixed:\n- Jumps in timelines\n- Replies to wrong messages with followed instances\n- Bug with delete&redraft with a media\n- List cannot be hidden\n- Some crashes"
-  },
-  {
-    "version": "3.9.1",
-    "code": "436",
-    "note": "Changed:\n- Remove built-in browser support\n- More spaces between action buttons in messages\n\nFixed:\n- Text size issue\n- Text overlap\n- Wrong background for solarized black\n- Mix between light and dark theme\n- Save button hidden"
-  },
-  {
-    "version": "3.9.0",
-    "code": "435",
-    "note": "Added:\n- Migrate to Material Design 3\n- 5 Themes (Light, Dark, Solarized Light/Dark, Black)\n- Automatically switch between Light/Dark\n- Light and Dark theme can be defined for time-based switch\n- Android 12+: Dynamic color\n\nFixed:\n- Jumps in timelines\n"
-  },
-  {
-    "version": "3.8.1",
-    "code": "434",
-    "note": "Added:\n- Mute tags with long press in timelines\n\nChanged:\n- Muted account messages are now removed from cache\n\nFixed:\n- Open with another account\n- Fix jumps in profiles\n- Media not displayed in album -> force indexation\n- Built-in browser does not give admin scope\n- Some crashes"
-  },
-  {
-    "version": "3.8.0",
-    "code": "433",
-    "note": "Added:\n- List of blocked domains (allow to unblock)\n- Support gemini links\n- Suggested followers\n- Mod/Adm: Manage instance blocked domains\n- Open messages with another account\n- Allow to disable notifications for admins\n- Sort lists\n\nChanged:\n- Allow search term to be edited\n\nFixed:\n- Drafts deleted with no warning\n- Remove lists from \"Manage timelines\"\n- App crashes when proxy is set\n- Filter not synced after being edited\n- Some crashes / improvements"
-  },
-  {
-    "version": "3.7.5",
-    "code": "432",
-    "note": "Added:\n- List of blocked domains (allow to unblock)\n- Support gemini links\n- Suggested followers\n\nChanged:\n- Allow search term to be edited\n\nFixed:\n- Drafts deleted with no warning\n- App crashes when proxy is set\n- Filter not synced after being edited\n- Some crashes"
-  },
-  {
-    "version": "3.7.4",
-    "code": "431",
-    "note": "Added:\n- Full support to new filters for Mastodon 4\n- Visit profiles without being authenticated / Allow to display all their messages\n\nChanged:\n- Compose view takes the whole width even in threads\n- Accounts can be timed-mute from their profile\n\nFixed:\n- Draft stored when replying \"no\" or dialog prompted without changes\n- Empty pages when starting the app\n- Saving and sharing media fails on some devices\n- Add support for admin notifications\n- Copying content of a message"
-  },
-  {
-    "version": "3.7.3",
-    "code": "430",
-    "note": "Added:\n- Visit profiles without being authenticated / Allow to display all their messages\n\nFixed:\n- Saving media fails on some devices"
-  },
-  {
-    "version": "3.7.2",
-    "code": "429",
-    "note": "Added:\n- Full support to new filters for Mastodon 4"
-  },
-  {
-    "version": "3.7.1",
-    "code": "428",
-    "note": "Added:\n- Support to open links containing /@display_name/ in their path (works on older devices)\n- Display reply count when counters are enabled\n- Add support for filtering profile messages\n\nChanged:\n- Compose view takes the whole width even in threads\n- Reset push notification marker when clearing cache\n\nFixed:\n- Draft stored when replying \"no\" or dialog prompted without changes\n- Filters not working with tags\n- Add a specific error message for followed tags\n- Empty pages when starting the app"
-  },
-  {
-    "version": "3.7.0",
-    "code": "427",
-    "note": "Added:\n- Follow tags (dedicated entry in menu)\n- Reduce the list of languages when composing (Settings > Compose)\n- Language indicator when composing\n- Replies are automatically set to first message language\n- Two new Light themes\n- More moderation features\n- List name can be edited\n\nFixed:\n- Filter not working\n- Crash with trends\n- Issue with themes\n- Some content lost when sending messages (mentions)\n- Fix freezes in timelines\n- Some other fixes"
-  },
-  {
-    "version": "3.6.5",
-    "code": "426",
-    "note": "- Two new Light themes\n- More moderation features\n\nFixed:\n- Filter not working\n- Crash with trends\n- Some content lost when sending messages (mentions)\n- Some other fixes"
-  },
-  {
-    "version": "3.6.4",
-    "code": "425",
-    "note": "Changed:\n- Tag search ordered by popularity\n\nFixed:\n- Unable to get client ID on some devices\n- Issue with messages/notifications not correctly displayed\n- Notifications not received\n- Friendica: issues with mentions and tags (open browser)\n- Improve sharing behaviour"
-  },
-  {
-    "version": "3.6.3",
-    "code": "424",
-    "note": "Fixed:\n- Issue with messages/notifications not correctly displayed\n- Friendica: issues with mentions and tags (open browser)\n- Improve sharing behaviour\n"
-  },
-  {
-    "version": "3.6.2",
-    "code": "423",
-    "note": "Fixed:\n- Order of notifications\n- URL when sharing boosted message\n- Blank pages when restarting\n- Fix some crashes"
-  },
-  {
-    "version": "3.6.1",
-    "code": "422",
-    "note": "Added:\n- Display client in detailed messages\n- Visual support for quotes starting with \">\"\n- Increase indentations for threads (zero to 20, default 5)\n- Visibility for public replies set to unlisted (can be disabled)\n\nChanged:\n- Reduce title size when text size is increased\n\nFixed:\n- Filters are not applied\n- Blocking an account doesn't remove messages in cache\n- Fix some crashes"
-  },
-  {
-    "version": "3.6.0",
-    "code": "421",
-    "note": "Added:\n- Edit messages (if your instance supports that feature)\n- Pin/Unpin messages\n- Set the default language for translations\n- Change app icon (Settings > Interface)\n- Allow to disable \"remember position\" in timelines\n- Allow to disable notification aggregation in settings\n- Icon on media previews if a description is available\n\nChanged:\n- Allow to disable/enable media for notifications\n\nFixed:\n- Post loses \"spoiler message\" when adding a media\n- Camera not working on Android 11\n- Notification aggregation\n- Vibrations when fetching new notifications\n- Fix an issue with media timelines\n- Fix some theme issues\n- Fix an issue with built-in browser & openId\n- Bad behaviours with Art Timelines\n- Some crashes"
-  },
-  {
-    "version": "3.5.3",
-    "code": "420",
-    "note": "- Edit messages (if your instance support that feature)\n- Some fixes"
-  },
-  {
-    "version": "3.5.2",
-    "code": "419",
-    "note": "Added:\n- Pin/Unpin messages\n- Set the default language for translations\n\nChanged:\n- Allow to disable/enable media for notifications\n\nFixed:\n- Wrong images in notification timeline\n- Double icon bug\n- Fix some crashes"
-  },
-  {
-    "version": "3.5.1",
-    "code": "418",
-    "note": "Added:\n- Change app icon (Settings > Interface)\n- Allow to disable \"remember position\" in timelines\n- Allow to disable notification aggregation in settings\n\nChanged:\n- Allow to disable/enable media for notifications\n\nFixed:\n- Post loses \"spoiler message\" when adding a media\n- Camera not working on Android 11\n- Notification aggregation\n- Vibrations when fetching new notifications\n- Fix an issue with media timelines\n- Some crashes"
-  },
-  {
-    "version": "3.5.0",
-    "code": "417",
-    "note": "Changed:\n- Swipe between timelines\n- Improve cache\n- Button sizes can be changed in settings\n- French translation\n\nFixed:\n- Pleroma: Emoji reactions\n- Sharing (several fixes)\n- Theme issues\n- Rendering issue for links\n- Notifications not removed from cache\n- Issue with watermarks\n- Pagination with bookmarks/favourites\n- Some crashes"
-  },
-  {
-    "version": "3.4.2",
-    "code": "415",
-    "note": "Fixed:\n- Attach media to a reply"
-  },
-  {
-    "version": "3.4.1",
-    "code": "414",
-    "note": "Added:\n- Disable counters in settings\nFixed:\n- Duplicated messages from cache\n- Notifications in double\n- Drafts not automatically removed\n- Messages not removed from cache after deletion"
-  },
-  {
-    "version": "3.4.0",
-    "code": "413",
-    "note": "Added:\n- New cache mechanism (can be disabled in settings)\n- Set thumbnails load behavior Always/Wifi only /ask\n- Add counters for new messages in timelines\nFixed:\n- Contextual menu not working in threads\n- Tag search issue with Friendica\n- Notifications click open the wrong tab\n- Encoding issue with media descriptions\n- Some other fixes."
-  },
-  {
-    "version": "3.3.2",
-    "code": "409",
-    "note": "- Fix an issue with cache and home timeline\n- Nitter timelines use the custom instance from settings\n- Fix Nitter issues (only RT)\n- No longer accepts invalid certificate for onion URLs(Google)\n- Fix some crashes"
-  },
-  {
-    "version": "3.3.1",
-    "code": "408",
-    "note": "- Improve speed for Nitter instances\n- Allow to edit Nitter accounts with a long press on tabs\n- Fix pagination issue with pinned timelines\n- Fix some crashes\n- Fix visibility when displaying counters"
-  },
-  {
-    "version": "3.3.0",
-    "code": "407",
-    "note": "Added:\n- Settings to set all timelines at the top (default disabled)\n- Settings to display timelines in a list (default disabled)\n- Display counters for fav/reblog in timelines (default disabled)\n\nFixed:\n- Visibility issue when replying\n- Some theme issues when composing\n- Some crashes"
-  },
-  {
-    "version": "3.2.0",
-    "code": "405",
-    "note": "Added:\n- Export Settings\n- Propagate manual reordering of lists in timeline to \"Lists\" submenu\n- Allow to change the push distributor in settings\n\nChanged:\n- Improve fit preview images\n- Improve notifications\n- Profile media displayed in a grid\n\nFixed:\n- Some Peertube videos not working\n- Respect the default visibility account when replying\n- Discriminate gif from images\n- App crashes when opening external instance timeline\n- Remove button in thread composer crashes the app\n- Back button opens a lot of old activities before closing the app\n- Problems with sharing\n- Reorder Lists with UI issue on change the visibility\n- Link is not shown correctly in posts from Friendica"
-  },
-  {
-    "version": "3.1.0",
-    "code": "402",
-    "note": "Added:\n- New theme: Dark Elephant from S1m\n- Error messages from server side when posting fails\n\nChanged:\n- Fetch more buttons more visible\n\nFixed:\n- Issue when fetching missing messages\n- Some issues with themes\n- Too much lost space with reaction (Pleroma)\n- Delete and redraft crashes\n- Crash when playing a video\n- Other crash fixes"
-  },
-  {
-    "version": "3.0.11",
-    "code": "401",
-    "note": "Added:\n- New theme: Dark Elephant from S1m\n- Error messages from server side when posting fails\n- Allow to set the fetch time for delayed notifications\n\nChanged:\n- Fetch more buttons more visible\n\nFixed:\n- Issue when fetching missing messages\n- Some issues with themes\n- Too much lost space with reaction (Pleroma)\n- Delete and redraft crashes\n- Crash when playing a video\n- Other crash fixes"
-  },
-  {
-    "version": "3.0.10",
-    "code": "400",
-    "note": "Added:\n- Allow to define the max chars count when not detected (In about the instance)\n- Add emoji one picker when composing (must be enabled in settings)\n- Add release notes with the ability to translate them\n\nFixed:\n- Friendica custom emojis not displayed\n- Long press to store media\n- Some bug fixes"
-  },
-  {
-    "version": "3.0.9",
-    "code": "399",
-    "note": "Added:\n- Set compose language (from compose menu -> three vertical dots)\n- Add reactions support for Pleroma\n- Add privacy indicator at the top right\n\nChanged\n- Improve the scrolling behaviour\n- Scroll to top (tab reselection) will fetch new messages and then scroll to top\n\nFixed:\n- Empty tag timelines\n- Remove focus point for fit media preview\n- Fix cannot share with one account\n- Fix black theme\n- Theme cannot be selected\n- Fix some button colors"
-  },
-  {
-    "version": "3.0.8",
-    "code": "398",
-    "note": "- Keep improving the scroll behaviour\n- Scroll to top (tab reselection) will fetch new messages and then scroll to top\n- Remove focus point for fit media preview\n- Fix cannot share with one account\n- Fix black theme\n- Fix some button colors"
-  },
-  {
-    "version": "3.0.7",
-    "code": "397",
-    "note": "- Fix some bugs reported."
-  },
-  {
-    "version": "3.0.6",
-    "code": "396",
-    "note": "Added:\n- Allow to set a focus point on previews (media editor)\n- Respect the focus point with previews\n- Pagination with the fetch more button support reading up or down\n- Add trends\n\nFixed:\n- Only last push notification is displayed (not grouped)\n- Bad behavior with the right/left scroll\n- Fix long profiles not fully displayed\n- Issues with some polls\n- Some crashes\n- Some bad behaviors"
-  },
-  {
-    "version": "3.0.5",
-    "code": "395",
-    "note": "- Fix some bugs\n- Allow to share with the app"
-  },
-  {
-    "version": "3.0.4",
-    "code": "394",
-    "note": "- Fix crashes for some Pleroma instances"
-  },
-  {
-    "version": "3.0.2",
-    "code": "393",
-    "note": "- Some bug fixes\n- Improve pinned timelines"
-  },
-  {
-    "version": "3.0.1",
-    "code": "391",
-    "note": "Some quick fixes"
-  },
-  {
-    "version": "3.0.0",
-    "code": "390",
-    "note": "New version of Fedilab with new feature.\n- You can now compose threads\n- See the whole thread when replying\n- Cache support\n- New design"
   }
+
 ]

app/src/main/java/app/fedilab/android/MainApplication.java

@@ -27,8 +27,6 @@ import androidx.multidex.MultiDex;
 import androidx.multidex.MultiDexApplication;
 import androidx.preference.PreferenceManager;
 
-import com.google.android.material.color.DynamicColors;
-
 import net.gotev.uploadservice.UploadServiceConfig;
 import net.gotev.uploadservice.observer.request.GlobalRequestObserver;
 
@@ -44,7 +42,9 @@ import java.util.Objects;
 import app.fedilab.android.mastodon.helper.ThemeHelper;
 import app.fedilab.android.peertube.services.GlobalUploadObserver;
 import es.dmoral.toasty.Toasty;
+import io.noties.prism4j.annotations.PrismBundle;
 
+@PrismBundle(includeAll = true, grammarLocatorClassName = ".MySuperGrammerLocator")
 
 public class MainApplication extends MultiDexApplication {
 
@@ -54,15 +54,10 @@ public class MainApplication extends MultiDexApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(MainApplication.this);
         try {
             webView = new WebView(this);
         } catch (Exception ignored) {
         }
-        boolean dynamicColor = sharedpreferences.getBoolean(getString(R.string.SET_DYNAMICCOLOR), false);
-        if (dynamicColor) {
-            DynamicColors.applyToActivitiesIfAvailable(this);
-        }
         StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
         StrictMode.setVmPolicy(builder.build());
         Toasty.Config.getInstance().apply();

app/src/main/java/app/fedilab/android/activities/AboutActivity.java

@@ -15,14 +15,17 @@ package app.fedilab.android.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Toast;
 
-import androidx.core.app.ActivityOptionsCompat;
 import androidx.lifecycle.ViewModelProvider;
 
 import java.util.ArrayList;
@@ -36,10 +39,12 @@ import app.fedilab.android.mastodon.activities.BaseBarActivity;
 import app.fedilab.android.mastodon.activities.ProfileActivity;
 import app.fedilab.android.mastodon.client.entities.api.Account;
 import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.app.CachedBundle;
 import app.fedilab.android.mastodon.helper.CrossActionHelper;
 import app.fedilab.android.mastodon.helper.Helper;
 import app.fedilab.android.mastodon.helper.MastodonHelper;
 import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
+import es.dmoral.toasty.Toasty;
 
 
 public class AboutActivity extends BaseBarActivity {
@@ -58,10 +63,10 @@ public class AboutActivity extends BaseBarActivity {
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         }
-
+        String version = "";
         try {
             PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
-            String version = pInfo.versionName;
+            version = pInfo.versionName;
             binding.aboutVersion.setText(getResources().getString(R.string.about_vesrion, version));
         } catch (PackageManager.NameNotFoundException ignored) {
         }
@@ -77,6 +82,20 @@ public class AboutActivity extends BaseBarActivity {
         }
         binding.aboutSupportPaypal.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://www.paypal.me/Mastalab"));
 
+
+        String finalVersion = version;
+        binding.aboutVersionCopy.setOnClickListener(v -> {
+
+            ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+            String content = "Fedilab v" + finalVersion + " for " + (BuildConfig.DONATIONS ? "FDroid" : "Google");
+
+            ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, content);
+            if (clipboard != null) {
+                clipboard.setPrimaryClip(clip);
+                Toasty.info(AboutActivity.this, getString(R.string.clipboard_version), Toast.LENGTH_LONG).show();
+            }
+
+        });
         if (BuildConfig.DONATIONS) {
             binding.aboutSupportPaypal.setVisibility(View.VISIBLE);
         } else {
@@ -100,12 +119,14 @@ public class AboutActivity extends BaseBarActivity {
                     binding.accountUn.setText(account.acct);
                     binding.accountPp.setOnClickListener(v -> {
                         Intent intent = new Intent(AboutActivity.this, ProfileActivity.class);
-                        Bundle b = new Bundle();
+                        Bundle args = new Bundle();
-                        b.putSerializable(Helper.ARG_ACCOUNT, account);
+                        args.putSerializable(Helper.ARG_ACCOUNT, account);
-                        intent.putExtras(b);
+                        new CachedBundle(AboutActivity.this).insertBundle(args, Helper.getCurrentAccount(AboutActivity.this), bundleId -> {
-                        ActivityOptionsCompat options = ActivityOptionsCompat
+                            Bundle bundle = new Bundle();
-                                .makeSceneTransitionAnimation(AboutActivity.this, binding.accountPp, getString(R.string.activity_porfile_pp));
+                            bundle.putLong(Helper.ARG_INTENT_ID, bundleId);
-                        startActivity(intent, options.toBundle());
+                            intent.putExtras(bundle);
+                            startActivity(intent);
+                        });
                     });
                     AccountsVM accountsVM = new ViewModelProvider(AboutActivity.this).get(AccountsVM.class);
                     List<String> ids = new ArrayList<>();

app/src/main/java/app/fedilab/android/activities/LoginActivity.java

@@ -150,7 +150,6 @@ public class LoginActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(LoginActivity.this);
         setContentView(new FrameLayout(this));
         FragmentLoginMain fragmentLoginMain = new FragmentLoginMain();
         Helper.addFragment(getSupportFragmentManager(), android.R.id.content, fragmentLoginMain, null, null, null);

app/src/main/java/app/fedilab/android/activities/WebActivityPub.java

@@ -0,0 +1,102 @@
+package app.fedilab.android.activities;
+/* Copyright 2025 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import app.fedilab.android.mastodon.activities.ProfileActivity;
+import app.fedilab.android.mastodon.client.entities.app.CachedBundle;
+import app.fedilab.android.mastodon.helper.Helper;
+
+
+public class WebActivityPub extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent appIntent = getIntent();
+        String acct = null;
+        String intent = null;
+        if(appIntent == null) {
+            finish();
+            return;
+        }
+        Uri uri = appIntent.getData();
+        if(uri == null) {
+            finish();
+            return;
+        }
+        String scheme = uri.getScheme();
+        String uriString = uri.toString();
+        if(!uriString.startsWith(scheme+"://")) {
+            uriString = uri.toString().replace(scheme+":",scheme+"://");
+            uri = Uri.parse(uriString);
+            if(uri == null) {
+                finish();
+                return;
+            }
+        }
+
+        String host = uri.getHost();
+        String path = uri.getPath();
+        String query = uri.getQuery();
+
+        if(path == null || path.isEmpty()) {
+            finish();
+            return;
+        }
+        if(query != null) {
+            String intentPatternString = "intent=(\\w+)";
+            final Pattern intentPattern = Pattern.compile(intentPatternString, Pattern.CASE_INSENSITIVE);
+            Matcher matcherIntent = intentPattern.matcher(query);
+            while (matcherIntent.find()) {
+                intent = matcherIntent.group(1);
+            }
+        }
+        if(path.startsWith("/@")) {
+            String[] params = path.split("@");
+            if(params.length == 2) {
+                acct = params[1] + "@" + host;
+            }
+        } else if(path.split("/").length > 2) {
+            String[] params = path.split("/");
+            String root = params[1].toLowerCase();
+            if (root.equals("users")) {
+                acct = params[2] + "@" + host;
+            }
+        }
+        if(acct != null) {
+            Intent intentProfile = new Intent(WebActivityPub.this, ProfileActivity.class);
+            Bundle args = new Bundle();
+            args.putString(Helper.ARG_MENTION, acct);
+            new CachedBundle(WebActivityPub.this).insertBundle(args, Helper.getCurrentAccount(WebActivityPub.this), bundleId -> {
+                Bundle bundle = new Bundle();
+                bundle.putLong(Helper.ARG_INTENT_ID, bundleId);
+                intentProfile.putExtras(bundle);
+                intentProfile.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intentProfile);
+            });
+        }
+        finish();
+    }
+}

app/src/main/java/app/fedilab/android/mastodon/activities/AccountReportActivity.java

@@ -27,6 +27,7 @@ import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import java.util.ArrayList;
+import java.util.Objects;
 
 import app.fedilab.android.R;
 import app.fedilab.android.activities.MainActivity;
@@ -34,6 +35,7 @@ import app.fedilab.android.databinding.ActivityAdminReportBinding;
 import app.fedilab.android.mastodon.client.entities.api.Status;
 import app.fedilab.android.mastodon.client.entities.api.admin.AdminAccount;
 import app.fedilab.android.mastodon.client.entities.api.admin.AdminReport;
+import app.fedilab.android.mastodon.client.entities.app.CachedBundle;
 import app.fedilab.android.mastodon.helper.Helper;
 import app.fedilab.android.mastodon.helper.ThemeHelper;
 import app.fedilab.android.mastodon.ui.drawer.StatusReportAdapter;
@@ -47,6 +49,7 @@ public class AccountReportActivity extends BaseBarActivity {
     private AdminReport report;
     private ActivityAdminReportBinding binding;
     private AdminVM adminVM;
+    private AdminAccount targeted_account;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -60,12 +63,22 @@ public class AccountReportActivity extends BaseBarActivity {
         }
 
         report = null;
-        AdminAccount targeted_account = null;
+        targeted_account = null;
-        Bundle b = getIntent().getExtras();
+        Bundle args = getIntent().getExtras();
-        if (b != null) {
+        if (args != null) {
-            account_id = b.getString(Helper.ARG_ACCOUNT_ID, null);
+            long bundleId = args.getLong(Helper.ARG_INTENT_ID, -1);
-            targeted_account = (AdminAccount) b.getSerializable(Helper.ARG_ACCOUNT);
+            new CachedBundle(AccountReportActivity.this).getBundle(bundleId, Helper.getCurrentAccount(AccountReportActivity.this), this::initializeAfterBundle);
-            report = (AdminReport) b.getSerializable(Helper.ARG_REPORT);
+        } else {
+            initializeAfterBundle(null);
+        }
+    }
+
+    private void initializeAfterBundle(Bundle bundle) {
+
+        if (bundle != null) {
+            account_id = bundle.getString(Helper.ARG_ACCOUNT_ID, null);
+            targeted_account = (AdminAccount) bundle.getSerializable(Helper.ARG_ACCOUNT);
+            report = (AdminReport) bundle.getSerializable(Helper.ARG_REPORT);
         }
 
         binding.allow.getBackground().setColorFilter(ThemeHelper.getAttColor(this, R.attr.colorPrimary), PorterDuff.Mode.MULTIPLY);
@@ -102,7 +115,6 @@ public class AccountReportActivity extends BaseBarActivity {
             account_id = targeted_account.username;
         }
 
-
     }
 
     private void fillReport(AdminAccount accountAdmin, actionType type) {
@@ -134,12 +146,12 @@ public class AccountReportActivity extends BaseBarActivity {
         binding.reject.setOnClickListener(view -> adminVM.reject(MainActivity.currentInstance, MainActivity.currentToken, account_id).observe(this, account -> fillReport(account, actionType.REJECT)));
         binding.allow.setOnClickListener(view -> adminVM.approve(MainActivity.currentInstance, MainActivity.currentToken, account_id).observe(this, account -> fillReport(account, actionType.APPROVE)));
         binding.warn.setOnClickListener(view -> {
-            adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "none", null, null, binding.comment.getText().toString().trim(), binding.emailUser.isChecked());
+            adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "none", null, null, Objects.requireNonNull(binding.comment.getText()).toString().trim(), binding.emailUser.isChecked());
             fillReport(accountAdmin, actionType.NONE);
         });
         binding.silence.setOnClickListener(view -> {
             if (!accountAdmin.silenced) {
-                adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "silence", null, null, binding.comment.getText().toString().trim(), binding.emailUser.isChecked());
+                adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "silence", null, null, Objects.requireNonNull(binding.comment.getText()).toString().trim(), binding.emailUser.isChecked());
                 accountAdmin.silenced = true;
                 fillReport(accountAdmin, actionType.SILENCE);
             } else {
@@ -148,7 +160,7 @@ public class AccountReportActivity extends BaseBarActivity {
         });
         binding.disable.setOnClickListener(view -> {
             if (!accountAdmin.disabled) {
-                adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "disable", null, null, binding.comment.getText().toString().trim(), binding.emailUser.isChecked());
+                adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "disable", null, null, Objects.requireNonNull(binding.comment.getText()).toString().trim(), binding.emailUser.isChecked());
                 accountAdmin.disabled = true;
                 fillReport(accountAdmin, actionType.DISABLE);
             } else {
@@ -158,7 +170,7 @@ public class AccountReportActivity extends BaseBarActivity {
 
         binding.suspend.setOnClickListener(view -> {
             if (!accountAdmin.suspended) {
-                adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "suspend", null, null, binding.comment.getText().toString().trim(), binding.emailUser.isChecked());
+                adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "suspend", null, null, Objects.requireNonNull(binding.comment.getText()).toString().trim(), binding.emailUser.isChecked());
                 accountAdmin.suspended = true;
                 fillReport(accountAdmin, actionType.SUSPEND);
             } else {
@@ -170,35 +182,21 @@ public class AccountReportActivity extends BaseBarActivity {
         if (type != null) {
             String message = null;
             switch (type) {
-                case SILENCE:
+                case SILENCE -> message = getString(R.string.account_silenced);
-                    message = getString(R.string.account_silenced);
+                case UNSILENCE -> message = getString(R.string.account_unsilenced);
-                    break;
+                case DISABLE -> message = getString(R.string.account_disabled);
-                case UNSILENCE:
+                case ENABLE -> message = getString(R.string.account_undisabled);
-                    message = getString(R.string.account_unsilenced);
+                case SUSPEND -> message = getString(R.string.account_suspended);
-                    break;
+                case UNSUSPEND -> message = getString(R.string.account_unsuspended);
-                case DISABLE:
+                case NONE -> message = getString(R.string.account_warned);
-                    message = getString(R.string.account_disabled);
+                case APPROVE -> {
-                    break;
-                case ENABLE:
-                    message = getString(R.string.account_undisabled);
-                    break;
-                case SUSPEND:
-                    message = getString(R.string.account_suspended);
-                    break;
-                case UNSUSPEND:
-                    message = getString(R.string.account_unsuspended);
-                    break;
-                case NONE:
-                    message = getString(R.string.account_warned);
-                    break;
-                case APPROVE:
                     binding.allowRejectGroup.setVisibility(View.GONE);
                     message = getString(R.string.account_approved);
-                    break;
+                }
-                case REJECT:
+                case REJECT -> {
                     binding.allowRejectGroup.setVisibility(View.GONE);
                     message = getString(R.string.account_rejected);
-                    break;
+                }
             }
             if (message != null) {
                 Toasty.success(AccountReportActivity.this, message, Toast.LENGTH_LONG).show();

app/src/main/java/app/fedilab/android/mastodon/activities/ActionActivity.java

@@ -60,64 +60,53 @@ public class ActionActivity extends BaseBarActivity {
     private void displayTimeline(Timeline.TimeLineEnum type) {
         canGoBack = true;
         if (type == Timeline.TimeLineEnum.MUTED_TIMELINE || type == Timeline.TimeLineEnum.BLOCKED_TIMELINE || type == Timeline.TimeLineEnum.MUTED_TIMELINE_HOME) {
-
+            fragmentMastodonAccount = new FragmentMastodonAccount();
+            Bundle bundle = new Bundle();
+            bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, type);
+            bundle.putString(Helper.ARG_VIEW_MODEL_KEY, "FEDILAB_" + type.getValue());
+            fragmentMastodonAccount.setArguments(bundle);
+            FragmentManager fragmentManager = getSupportFragmentManager();
+            FragmentTransaction fragmentTransaction =
+                    fragmentManager.beginTransaction();
+            fragmentTransaction.replace(R.id.fragment_container, fragmentMastodonAccount);
+            fragmentTransaction.commit();
             ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {
-                fragmentMastodonAccount = new FragmentMastodonAccount();
+
-                Bundle bundle = new Bundle();
-                bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, type);
-                bundle.putString(Helper.ARG_VIEW_MODEL_KEY, "FEDILAB_" + type.getValue());
-                fragmentMastodonAccount.setArguments(bundle);
-                FragmentManager fragmentManager = getSupportFragmentManager();
-                FragmentTransaction fragmentTransaction =
-                        fragmentManager.beginTransaction();
-                fragmentTransaction.replace(R.id.fragment_container, fragmentMastodonAccount);
-                fragmentTransaction.commit();
             });
 
         } else if (type == Timeline.TimeLineEnum.BLOCKED_DOMAIN_TIMELINE) {
+            fragmentMastodonDomainBlock = new FragmentMastodonDomainBlock();
+            FragmentManager fragmentManager = getSupportFragmentManager();
+            FragmentTransaction fragmentTransaction =
+                    fragmentManager.beginTransaction();
+            fragmentTransaction.replace(R.id.fragment_container, fragmentMastodonDomainBlock);
+            fragmentTransaction.commit();
             ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {
-                fragmentMastodonDomainBlock = new FragmentMastodonDomainBlock();
+
-                FragmentManager fragmentManager = getSupportFragmentManager();
-                FragmentTransaction fragmentTransaction =
-                        fragmentManager.beginTransaction();
-                fragmentTransaction.replace(R.id.fragment_container, fragmentMastodonDomainBlock);
-                fragmentTransaction.commit();
             });
         } else {
-
+            fragmentMastodonTimeline = new FragmentMastodonTimeline();
+            Bundle bundle = new Bundle();
+            bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, type);
+            bundle.putString(Helper.ARG_VIEW_MODEL_KEY, "FEDILAB_" + type.getValue());
+            fragmentMastodonTimeline.setArguments(bundle);
+            FragmentManager fragmentManager = getSupportFragmentManager();
+            FragmentTransaction fragmentTransaction =
+                    fragmentManager.beginTransaction();
+            fragmentTransaction.replace(R.id.fragment_container, fragmentMastodonTimeline);
+            fragmentTransaction.commit();
             ThemeHelper.slideViewsToLeft(binding.buttonContainer, binding.fragmentContainer, () -> {
-                fragmentMastodonTimeline = new FragmentMastodonTimeline();
+
-                Bundle bundle = new Bundle();
-                bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, type);
-                bundle.putString(Helper.ARG_VIEW_MODEL_KEY, "FEDILAB_" + type.getValue());
-                fragmentMastodonTimeline.setArguments(bundle);
-                FragmentManager fragmentManager = getSupportFragmentManager();
-                FragmentTransaction fragmentTransaction =
-                        fragmentManager.beginTransaction();
-                fragmentTransaction.replace(R.id.fragment_container, fragmentMastodonTimeline);
-                fragmentTransaction.commit();
             });
 
         }
         switch (type) {
-            case MUTED_TIMELINE:
+            case MUTED_TIMELINE -> setTitle(R.string.muted_menu);
-                setTitle(R.string.muted_menu);
+            case FAVOURITE_TIMELINE -> setTitle(R.string.favourite);
-                break;
+            case BLOCKED_TIMELINE -> setTitle(R.string.blocked_menu);
-            case FAVOURITE_TIMELINE:
+            case BOOKMARK_TIMELINE -> setTitle(R.string.bookmarks);
-                setTitle(R.string.favourite);
+            case BLOCKED_DOMAIN_TIMELINE -> setTitle(R.string.blocked_domains);
-                break;
+            case MUTED_TIMELINE_HOME -> setTitle(R.string.muted_menu_home);
-            case BLOCKED_TIMELINE:
-                setTitle(R.string.blocked_menu);
-                break;
-            case BOOKMARK_TIMELINE:
-                setTitle(R.string.bookmarks);
-                break;
-            case BLOCKED_DOMAIN_TIMELINE:
-                setTitle(R.string.blocked_domains);
-                break;
-            case MUTED_TIMELINE_HOME:
-                setTitle(R.string.muted_menu_home);
-                break;
         }
     }
 

app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java

@@ -15,6 +15,10 @@ package app.fedilab.android.mastodon.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
+import static app.fedilab.android.BaseMainActivity.currentInstance;
+import static app.fedilab.android.BaseMainActivity.currentNightMode;
+import static app.fedilab.android.BaseMainActivity.currentUserID;
+
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -22,9 +26,11 @@ import android.content.res.Configuration;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
+import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
@@ -51,8 +57,10 @@ public class BaseActivity extends AppCompatActivity {
         EmojiManager.install(new EmojiOneProvider());
     }
 
+    @SuppressLint("RestrictedApi")
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+
         boolean patch_provider = true;
         final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
         try {
@@ -67,81 +75,94 @@ public class BaseActivity extends AppCompatActivity {
         }
 
         String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));
-        //Default automatic switch
+        boolean customAccentEnabled = sharedpreferences.getBoolean(getString(R.string.SET_CUSTOM_ACCENT) + currentUserID + currentInstance, false);
-        if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {
 
-            int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        //Default automatic switch
+        currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+
+
+        if(customAccentEnabled && currentNightMode == Configuration.UI_MODE_NIGHT_NO) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR|View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+            }else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+            }
+        }
+
+        if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {
             switch (currentNightMode) {
-                case Configuration.UI_MODE_NIGHT_NO:
+                case Configuration.UI_MODE_NIGHT_NO -> {
                     String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
                     switch (defaultLight) {
-                        case "LIGHT":
+                        case "LIGHT" -> {
                             setTheme(R.style.AppTheme);
                             currentThemeId = R.style.AppTheme;
-                            break;
+                        }
-                        case "SOLARIZED_LIGHT":
+                        case "SOLARIZED_LIGHT" -> {
                             setTheme(R.style.SolarizedAppTheme);
                             currentThemeId = R.style.SolarizedAppTheme;
-                            break;
+                        }
                     }
-                    break;
+                }
-                case Configuration.UI_MODE_NIGHT_YES:
+                case Configuration.UI_MODE_NIGHT_YES -> {
                     String defaultDark = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_DARK), "DARK");
                     switch (defaultDark) {
-                        case "DARK":
+                        case "DARK" -> {
                             setTheme(R.style.AppTheme);
                             currentThemeId = R.style.AppTheme;
-                            break;
+                        }
-                        case "SOLARIZED_DARK":
+                        case "SOLARIZED_DARK" -> {
                             setTheme(R.style.SolarizedAppTheme);
                             currentThemeId = R.style.SolarizedAppTheme;
-                            break;
+                        }
-                        case "BLACK":
+                        case "BLACK" -> {
                             setTheme(R.style.BlackAppTheme);
                             currentThemeId = R.style.BlackAppTheme;
-                            break;
+                        }
-                        case "DRACULA":
+                        case "DRACULA" -> {
                             setTheme(R.style.DraculaAppTheme);
                             currentThemeId = R.style.DraculaAppTheme;
-                            break;
+                        }
                     }
-                    break;
+                }
             }
         } else {
             switch (currentTheme) {
-                case "LIGHT":
+                case "LIGHT" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                     setTheme(R.style.AppTheme);
                     currentThemeId = R.style.AppTheme;
-                    break;
+                }
-                case "DARK":
+                case "DARK" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                     setTheme(R.style.AppTheme);
                     currentThemeId = R.style.AppTheme;
-                    break;
+                }
-                case "SOLARIZED_LIGHT":
+                case "SOLARIZED_LIGHT" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                     setTheme(R.style.SolarizedAppTheme);
                     currentThemeId = R.style.SolarizedAppTheme;
-                    break;
+                }
-                case "SOLARIZED_DARK":
+                case "SOLARIZED_DARK" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                     setTheme(R.style.SolarizedAppTheme);
                     currentThemeId = R.style.SolarizedAppTheme;
-                    break;
+                }
-                case "BLACK":
+                case "BLACK" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                     setTheme(R.style.BlackAppTheme);
                     currentThemeId = R.style.BlackAppTheme;
-                    break;
+                }
-                case "DRACULA":
+                case "DRACULA" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                     setTheme(R.style.DraculaAppTheme);
                     currentThemeId = R.style.DraculaAppTheme;
-                    break;
+                }
             }
         }
         super.onCreate(savedInstanceState);
+
+        ThemeHelper.applyThemeColor(this);
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N) {
             ThemeHelper.adjustFontScale(this, getResources().getConfiguration());
         }
@@ -157,11 +178,18 @@ public class BaseActivity extends AppCompatActivity {
     @Override
     protected void attachBaseContext(Context newBase) {
         if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {
-            final Configuration override = new Configuration(newBase.getResources().getConfiguration());
+            final Configuration override = new Configuration();
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(newBase);
             override.fontScale = prefs.getFloat(newBase.getString(R.string.SET_FONT_SCALE), 1.1f);
             applyOverrideConfiguration(override);
         }
         super.attachBaseContext(newBase);
     }
+
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.clear();
+    }
+
 }

app/src/main/java/app/fedilab/android/mastodon/activities/BaseAlertDialogActivity.java

@@ -1,153 +0,0 @@
-package app.fedilab.android.mastodon.activities;
-/* Copyright 2021 Thomas Schneider
- *
- * This file is a part of Fedilab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Fedilab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.preference.PreferenceManager;
-
-import com.vanniktech.emoji.EmojiManager;
-import com.vanniktech.emoji.one.EmojiOneProvider;
-
-import org.conscrypt.Conscrypt;
-
-import java.security.Security;
-
-import app.fedilab.android.R;
-import app.fedilab.android.mastodon.helper.Helper;
-import app.fedilab.android.mastodon.helper.ThemeHelper;
-
-
-@SuppressLint("Registered")
-public class BaseAlertDialogActivity extends AppCompatActivity {
-
-    static {
-        EmojiManager.install(new EmojiOneProvider());
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        boolean patch_provider = true;
-        try {
-            patch_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);
-        } catch (Exception ignored) {
-        }
-        if (patch_provider) {
-            try {
-                Security.insertProviderAt(Conscrypt.newProvider(), 1);
-            } catch (Exception ignored) {
-            }
-        }
-
-        String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));
-        //Default automatic switch
-        if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {
-
-            int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-            switch (currentNightMode) {
-                case Configuration.UI_MODE_NIGHT_NO:
-                    String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
-                    switch (defaultLight) {
-                        case "LIGHT":
-                            setTheme(R.style.AppThemeAlertDialog);
-                            break;
-                        case "SOLARIZED_LIGHT":
-                            setTheme(R.style.SolarizedAlertDialog);
-                            break;
-                    }
-                    break;
-                case Configuration.UI_MODE_NIGHT_YES:
-                    String defaultDark = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_DARK), "DARK");
-                    switch (defaultDark) {
-                        case "DARK":
-                            setTheme(R.style.AppThemeAlertDialog);
-                            break;
-                        case "SOLARIZED_DARK":
-                            setTheme(R.style.SolarizedAlertDialog);
-                            break;
-                        case "BLACK":
-                            Window window = getWindow();
-                            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-                            window.setStatusBarColor(Color.BLACK);
-                            setTheme(R.style.BlackAlertDialog);
-                            break;
-                        case "DRACULA":
-                            setTheme(R.style.DraculaAlertDialog);
-                            break;
-                    }
-                    break;
-            }
-        } else {
-            switch (currentTheme) {
-                case "LIGHT":
-                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-                    setTheme(R.style.AppThemeAlertDialog);
-                    break;
-                case "DARK":
-                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-                    setTheme(R.style.AppThemeAlertDialog);
-                    break;
-                case "SOLARIZED_LIGHT":
-                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-                    setTheme(R.style.SolarizedAlertDialog);
-                    break;
-                case "SOLARIZED_DARK":
-                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-                    setTheme(R.style.SolarizedAlertDialog);
-                    break;
-                case "BLACK":
-                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-                    Window window = getWindow();
-                    window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-                    window.setStatusBarColor(Color.BLACK);
-                    setTheme(R.style.BlackAlertDialog);
-                    break;
-                case "DRACULA":
-                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-                    setTheme(R.style.DraculaAlertDialog);
-                    break;
-            }
-        }
-        super.onCreate(savedInstanceState);
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N) {
-            ThemeHelper.adjustFontScale(this, getResources().getConfiguration());
-        }
-        Helper.setLocale(this);
-    }
-
-    @Override
-    protected void attachBaseContext(Context newBase) {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {
-            final Configuration override = new Configuration(newBase.getResources().getConfiguration());
-            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(newBase);
-            override.fontScale = prefs.getFloat(newBase.getString(R.string.SET_FONT_SCALE), 1.1f);
-            applyOverrideConfiguration(override);
-        }
-        super.attachBaseContext(newBase);
-    }
-}

app/src/main/java/app/fedilab/android/mastodon/activities/BaseBarActivity.java

@@ -15,6 +15,10 @@ package app.fedilab.android.mastodon.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
+import static app.fedilab.android.BaseMainActivity.currentInstance;
+import static app.fedilab.android.BaseMainActivity.currentNightMode;
+import static app.fedilab.android.BaseMainActivity.currentUserID;
+
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -22,9 +26,11 @@ import android.content.res.Configuration;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
+import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
@@ -64,70 +70,67 @@ public class BaseBarActivity extends AppCompatActivity {
             }
         }
         String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));
+        boolean customAccentEnabled = sharedpreferences.getBoolean(getString(R.string.SET_CUSTOM_ACCENT) + currentUserID + currentInstance, false);
         //Default automatic switch
+        currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        if(customAccentEnabled && currentNightMode == Configuration.UI_MODE_NIGHT_NO) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR|View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+            }else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+            }
+        }
         if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {
-
-            int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
             switch (currentNightMode) {
-                case Configuration.UI_MODE_NIGHT_NO:
+                case Configuration.UI_MODE_NIGHT_NO -> {
                     String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
                     switch (defaultLight) {
-                        case "LIGHT":
+                        case "LIGHT" -> setTheme(R.style.AppThemeBar);
-                            setTheme(R.style.AppThemeBar);
+                        case "SOLARIZED_LIGHT" -> setTheme(R.style.SolarizedAppThemeBar);
-                            break;
-                        case "SOLARIZED_LIGHT":
-                            setTheme(R.style.SolarizedAppThemeBar);
-                            break;
                     }
-                    break;
+                }
-                case Configuration.UI_MODE_NIGHT_YES:
+                case Configuration.UI_MODE_NIGHT_YES -> {
                     String defaultDark = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_DARK), "DARK");
                     switch (defaultDark) {
-                        case "DARK":
+                        case "DARK" -> setTheme(R.style.AppThemeBar);
-                            setTheme(R.style.AppThemeBar);
+                        case "SOLARIZED_DARK" -> setTheme(R.style.SolarizedAppThemeBar);
-                            break;
+                        case "BLACK" -> setTheme(R.style.BlackAppThemeBar);
-                        case "SOLARIZED_DARK":
+                        case "DRACULA" -> setTheme(R.style.DraculaAppThemeBar);
-                            setTheme(R.style.SolarizedAppThemeBar);
-                            break;
-                        case "BLACK":
-                            setTheme(R.style.BlackAppThemeBar);
-                            break;
-                        case "DRACULA":
-                            setTheme(R.style.DraculaAppThemeBar);
-                            break;
                     }
-                    break;
+                }
             }
 
         } else {
             switch (currentTheme) {
-                case "LIGHT":
+                case "LIGHT" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                     setTheme(R.style.AppThemeBar);
-                    break;
+                }
-                case "DARK":
+                case "DARK" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                     setTheme(R.style.AppThemeBar);
-                    break;
+                }
-                case "SOLARIZED_LIGHT":
+                case "SOLARIZED_LIGHT" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                     setTheme(R.style.SolarizedAppThemeBar);
-                    break;
+                }
-                case "SOLARIZED_DARK":
+                case "SOLARIZED_DARK" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                     setTheme(R.style.SolarizedAppThemeBar);
-                    break;
+                }
-                case "BLACK":
+                case "BLACK" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                     setTheme(R.style.BlackAppThemeBar);
-                    break;
+                }
-                case "DRACULA":
+                case "DRACULA" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                     setTheme(R.style.DraculaAppThemeBar);
-                    break;
+                }
             }
         }
         super.onCreate(savedInstanceState);
+        ThemeHelper.applyThemeColor(this);
+
         if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             Window window = getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
@@ -144,7 +147,7 @@ public class BaseBarActivity extends AppCompatActivity {
     protected void attachBaseContext(Context newBase) {
 
         if (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {
-            final Configuration override = new Configuration(newBase.getResources().getConfiguration());
+            final Configuration override = new Configuration();
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(newBase);
             override.fontScale = prefs.getFloat(newBase.getString(R.string.SET_FONT_SCALE), 1.1f);
             applyOverrideConfiguration(override);
@@ -153,4 +156,11 @@ public class BaseBarActivity extends AppCompatActivity {
 
         super.attachBaseContext(newBase);
     }
+
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.clear();
+    }
+
 }

app/src/main/java/app/fedilab/android/mastodon/activities/BaseFragmentActivity.java

@@ -1,59 +0,0 @@
-package app.fedilab.android.mastodon.activities;
-/* Copyright 2022 Thomas Schneider
- *
- * This file is a part of Fedilab
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Fedilab; if not,
- * see <http://www.gnu.org/licenses>. */
-
-import android.annotation.SuppressLint;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceManager;
-
-import com.vanniktech.emoji.EmojiManager;
-import com.vanniktech.emoji.one.EmojiOneProvider;
-
-import org.conscrypt.Conscrypt;
-
-import java.security.Security;
-
-import app.fedilab.android.mastodon.helper.Helper;
-
-
-@SuppressLint("Registered")
-public class BaseFragmentActivity extends FragmentActivity {
-
-
-    static {
-        EmojiManager.install(new EmojiOneProvider());
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        boolean patch_provider = true;
-        try {
-            SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
-            patch_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);
-        } catch (Exception ignored) {
-        }
-        if (patch_provider) {
-            try {
-                Security.insertProviderAt(Conscrypt.newProvider(), 1);
-            } catch (Exception ignored) {
-            }
-        }
-        super.onCreate(savedInstanceState);
-    }
-}

app/src/main/java/app/fedilab/android/mastodon/activities/BaseTransparentActivity.java

@@ -15,6 +15,8 @@ package app.fedilab.android.mastodon.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
+import static app.fedilab.android.BaseMainActivity.currentNightMode;
+
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -65,69 +67,58 @@ public class BaseTransparentActivity extends AppCompatActivity {
         }
         String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));
         //Default automatic switch
+        currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
         if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {
 
-            int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
             switch (currentNightMode) {
-                case Configuration.UI_MODE_NIGHT_NO:
+                case Configuration.UI_MODE_NIGHT_NO -> {
                     String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
                     switch (defaultLight) {
-                        case "LIGHT":
+                        case "LIGHT" -> setTheme(R.style.Transparent);
-                            setTheme(R.style.Transparent);
+                        case "SOLARIZED_LIGHT" -> setTheme(R.style.TransparentSolarized);
-                            break;
-                        case "SOLARIZED_LIGHT":
-                            setTheme(R.style.TransparentSolarized);
-                            break;
                     }
-                    break;
+                }
-                case Configuration.UI_MODE_NIGHT_YES:
+                case Configuration.UI_MODE_NIGHT_YES -> {
                     String defaultDark = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_DARK), "DARK");
                     switch (defaultDark) {
-                        case "DARK":
+                        case "DARK" -> setTheme(R.style.Transparent);
-                            setTheme(R.style.Transparent);
+                        case "SOLARIZED_DARK" -> setTheme(R.style.TransparentSolarized);
-                            break;
+                        case "BLACK" -> setTheme(R.style.TransparentBlack);
-                        case "SOLARIZED_DARK":
+                        case "DRACULA" -> setTheme(R.style.TransparentDracula);
-                            setTheme(R.style.TransparentSolarized);
-                            break;
-                        case "BLACK":
-                            setTheme(R.style.TransparentBlack);
-                            break;
-                        case "DRACULA":
-                            setTheme(R.style.TransparentDracula);
-                            break;
                     }
-                    break;
+                }
             }
 
         } else {
             switch (currentTheme) {
-                case "LIGHT":
+                case "LIGHT" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                     setTheme(R.style.Transparent);
-                    break;
+                }
-                case "DARK":
+                case "DARK" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                     setTheme(R.style.Transparent);
-                    break;
+                }
-                case "SOLARIZED_LIGHT":
+                case "SOLARIZED_LIGHT" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                     setTheme(R.style.TransparentSolarized);
-                    break;
+                }
-                case "SOLARIZED_DARK":
+                case "SOLARIZED_DARK" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                     setTheme(R.style.TransparentSolarized);
-                    break;
+                }
-                case "BLACK":
+                case "BLACK" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                     setTheme(R.style.TransparentBlack);
-                    break;
+                }
-                case "DRACULA":
+                case "DRACULA" -> {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                     setTheme(R.style.TransparentDracula);
-                    break;
+                }
             }
         }
         super.onCreate(savedInstanceState);
+        ThemeHelper.applyThemeColor(this);
         if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             Window window = getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
@@ -144,7 +135,7 @@ public class BaseTransparentActivity extends AppCompatActivity {
     protected void attachBaseContext(Context newBase) {
 
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {
-            final Configuration override = new Configuration(newBase.getResources().getConfiguration());
+            final Configuration override = new Configuration();
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(newBase);
             override.fontScale = prefs.getFloat(newBase.getString(R.string.SET_FONT_SCALE), 1.1f);
             applyOverrideConfiguration(override);

app/src/main/java/app/fedilab/android/mastodon/activities/CacheActivity.java

@@ -121,7 +121,7 @@ public class CacheActivity extends BaseBarActivity {
             finish();
             return true;
         } else if (item.getItemId() == R.id.action_clear) {
-            AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(CacheActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(CacheActivity.this);
             deleteConfirm.setTitle(getString(R.string.delete_cache));
             deleteConfirm.setMessage(getString(R.string.delete_cache_message));
             deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
@@ -131,7 +131,7 @@ public class CacheActivity extends BaseBarActivity {
                         size = size / 1000000.0f;
                     }
                     binding.fileCacheSize.setText(String.format("%s %s", String.format(Locale.getDefault(), "%.2f", size), getString(R.string.cache_units)));
-                    AlertDialog.Builder restartBuilder = new MaterialAlertDialogBuilder(CacheActivity.this, Helper.dialogStyle());
+                    AlertDialog.Builder restartBuilder = new MaterialAlertDialogBuilder(CacheActivity.this);
                     restartBuilder.setMessage(getString(R.string.restart_the_app));
                     restartBuilder.setNegativeButton(R.string.no, (dialogRestart, whichRestart) -> {
                         recreate();

app/src/main/java/app/fedilab/android/mastodon/activities/CheckHomeCacheActivity.java

@@ -0,0 +1,518 @@
+package app.fedilab.android.mastodon.activities;
+/* Copyright 2023 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+import static app.fedilab.android.mastodon.helper.Helper.dateDiffFull;
+import static app.fedilab.android.mastodon.helper.Helper.dateDiffFullShort;
+import static app.fedilab.android.mastodon.viewmodel.mastodon.TimelinesVM.sortAsc;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
+import com.github.mikephil.charting.components.Description;
+import com.github.mikephil.charting.components.Legend;
+import com.github.mikephil.charting.components.MarkerView;
+import com.github.mikephil.charting.components.XAxis;
+import com.github.mikephil.charting.components.YAxis;
+import com.github.mikephil.charting.data.BarData;
+import com.github.mikephil.charting.data.BarDataSet;
+import com.github.mikephil.charting.data.BarEntry;
+import com.github.mikephil.charting.data.CombinedData;
+import com.github.mikephil.charting.data.Entry;
+import com.github.mikephil.charting.data.LineData;
+import com.github.mikephil.charting.data.LineDataSet;
+import com.github.mikephil.charting.formatter.IndexAxisValueFormatter;
+import com.github.mikephil.charting.highlight.Highlight;
+import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
+import com.github.mikephil.charting.utils.MPPointF;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+import app.fedilab.android.R;
+import app.fedilab.android.databinding.ActivityCheckHomeCachetBinding;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.app.StatusCache;
+import app.fedilab.android.mastodon.client.entities.app.TimelineCacheLogs;
+import app.fedilab.android.mastodon.exception.DBException;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.ThemeHelper;
+import es.dmoral.toasty.Toasty;
+
+
+public class CheckHomeCacheActivity extends BaseBarActivity {
+
+
+    private ActivityCheckHomeCachetBinding binding;
+    private List<Status> statuses;
+    private List<TimelineCacheLogs> timelineCacheLogsList;
+    private List<Status> statusesDay;
+    private List<TimelineCacheLogs> timelineCacheLogsDayList;
+    private ArrayList<String> xVals;
+
+    private ArrayList<String> xVals2;
+
+    private List<TimelineCacheLogs> timelineCacheLogsListToAnalyse;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        binding = ActivityCheckHomeCachetBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        }
+        if (Helper.getCurrentAccount(CheckHomeCacheActivity.this) == null || Helper.getCurrentAccount(CheckHomeCacheActivity.this).mastodon_account == null) {
+            finish();
+            return;
+        }
+        drawCacheGraph(range.ALL);
+        drawCacheLogsGraph(range.ALL);
+        binding.chartToggle.setOnCheckedChangeListener((compoundButton, checked) -> {
+            drawCacheGraph(checked ? range.DAY : range.ALL);
+            drawCacheLogsGraph(checked ? range.DAY : range.ALL);
+        });
+    }
+
+    private void drawCacheGraph(range myRange) {
+        binding.progress.setVisibility(View.VISIBLE);
+        binding.chartToggle.setEnabled(false);
+        new Thread(() -> {
+            try {
+                if (myRange == range.ALL) {
+                    if (statuses == null) {
+                        statuses = new StatusCache(this).getHome(Helper.getCurrentAccount(CheckHomeCacheActivity.this));
+                        sortAsc(statuses);
+                    }
+                } else if (myRange == range.DAY) {
+                    if (statusesDay == null && statuses != null) {
+                        statusesDay = new ArrayList<>();
+                        Calendar calendar = Calendar.getInstance();
+                        calendar.add(Calendar.DAY_OF_YEAR, -1);
+                        for (Status status : statuses) {
+                            if (status.created_at.after(calendar.getTime())) {
+                                statusesDay.add(status);
+                            }
+                        }
+                    }
+                }
+                if ((statuses == null || statuses.size() < 2) && myRange == range.ALL) {
+                    runOnUiThread(() -> binding.chartToggle.setEnabled(true));
+                    return;
+                }
+                if ((statusesDay == null || statusesDay.size() < 2) && myRange == range.DAY) {
+                    runOnUiThread(() -> binding.chartToggle.setEnabled(true));
+                    return;
+                }
+
+                List<Status> statusToAnalyse = new ArrayList<>();
+                if (myRange == range.ALL) {
+                    statusToAnalyse.addAll(statuses);
+                } else {
+                    statusToAnalyse.addAll(statusesDay);
+                }
+                Date firstMessageDate = statusToAnalyse.get(0).created_at;
+                Date lastMessageDate = statusToAnalyse.get(statusToAnalyse.size() - 1).created_at;
+                long diff = lastMessageDate.getTime() - firstMessageDate.getTime();
+                int numberOfHour = (int) Math.ceil((double) diff / (1000 * 60 * 60));
+                List<GraphElement> graphElements = new ArrayList<>();
+                xVals = new ArrayList<>();
+                String xDateH;
+                SimpleDateFormat df;
+                String xDateD;
+                String xDate;
+                for (int i = 0; i < numberOfHour; i++) {
+
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.setTime(firstMessageDate);
+                    calendar.add(Calendar.HOUR, i);
+
+                    xDateH = new SimpleDateFormat("HH", Locale.getDefault()).format(calendar.getTime());
+                    df = (SimpleDateFormat) DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
+                    xDateD = df.format(calendar.getTime());
+                    xDate = xDateD + " " + String.format(Locale.getDefault(), "%sh", xDateH);
+                    xVals.add(xDate);
+                    GraphElement graphElement = new GraphElement();
+                    graphElement.dateLabel = xDate;
+                    int count = 0;
+                    for (Status status : statusToAnalyse) {
+                        xDateH = new SimpleDateFormat("HH", Locale.getDefault()).format(status.created_at);
+                        df = (SimpleDateFormat) DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
+                        xDateD = df.format(status.created_at.getTime());
+                        xDate = xDateD + " " + String.format(Locale.getDefault(), "%sh", xDateH);
+                        if (xDate.equalsIgnoreCase(graphElement.dateLabel)) {
+                            count++;
+                        }
+                    }
+                    graphElement.count = count;
+                    graphElements.add(graphElement);
+                }
+
+                runOnUiThread(() -> {
+                    binding.chartToggle.setEnabled(true);
+                    binding.progress.setVisibility(View.GONE);
+
+                    //We loop through cache
+                    List<Entry> statusEntry = new ArrayList<>();
+
+                    int inc = 0;
+                    for (GraphElement ge : graphElements) {
+                        statusEntry.add(new Entry(inc, ge.count));
+                        inc++;
+                    }
+                    List<ILineDataSet> dataSets = new ArrayList<>();
+                    LineDataSet dataStatus = new LineDataSet(statusEntry, getString(R.string.cached_messages));
+                    dataStatus.setColor(ThemeHelper.getAttColor(this, R.attr.colorPrimary));
+                    dataStatus.setFillColor(ThemeHelper.getAttColor(this, R.attr.colorPrimary));
+                    dataStatus.setDrawValues(false);
+                    dataStatus.setDrawFilled(true);
+                    dataStatus.setDrawCircles(false);
+                    dataStatus.setDrawCircleHole(false);
+                    dataStatus.setMode(LineDataSet.Mode.CUBIC_BEZIER);
+                    dataSets.add(dataStatus);
+
+                    LineData data = new LineData(dataSets);
+                    binding.chart.setData(data);
+                    IndexAxisValueFormatter formatter = new IndexAxisValueFormatter() {
+                        @Override
+                        public String getFormattedValue(float value) {
+                            if (value >= 0 && value < xVals.size()) {
+                                return xVals.get((int) value);
+                            } else
+                                return "";
+                        }
+                    };
+                    binding.chart.setExtraBottomOffset(80);
+                    //  binding.chart.getXAxis().setGranularity(1f);
+                    binding.chart.getXAxis().setPosition(XAxis.XAxisPosition.BOTTOM);
+                    binding.chart.getXAxis().setLabelRotationAngle(-45f);
+                    binding.chart.getXAxis().setValueFormatter(formatter);
+                    binding.chart.getXAxis().setEnabled(true);
+                    binding.chart.getXAxis().setTextColor(ThemeHelper.getAttColor(CheckHomeCacheActivity.this, R.attr.colorOnBackground));
+                    binding.chart.getAxisLeft().setTextColor(ThemeHelper.getAttColor(CheckHomeCacheActivity.this, R.attr.colorOnBackground));
+                    binding.chart.getAxisRight().setTextColor(ThemeHelper.getAttColor(CheckHomeCacheActivity.this, R.attr.colorOnBackground));
+                    binding.chart.getLegend().setTextColor(ThemeHelper.getAttColor(CheckHomeCacheActivity.this, R.attr.colorOnBackground));
+                    binding.chart.getAxisLeft().setAxisMinimum(0f);
+                    binding.chart.getAxisRight().setAxisMinimum(0f);
+                    binding.chart.getXAxis().setLabelCount(10, true);
+                    binding.chart.getLegend().setEnabled(false);
+                    binding.chart.setTouchEnabled(true);
+                    Description description = binding.chart.getDescription();
+                    description.setEnabled(false);
+                    CustomMarkerView mv = new CustomMarkerView(CheckHomeCacheActivity.this, R.layout.custom_marker_view_layout);
+                    binding.chart.setMarker(mv);
+
+                    binding.chart.invalidate();
+                });
+
+
+            } catch (DBException | NegativeArraySizeException e) {
+                Toasty.error(this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
+                throw new RuntimeException(e);
+            }
+        }).start();
+    }
+
+
+    private void drawCacheLogsGraph(range myRange) {
+        binding.progress2.setVisibility(View.VISIBLE);
+        new Thread(() -> {
+            xVals2 = new ArrayList<>();
+            try {
+                if (myRange == range.ALL) {
+                    if (timelineCacheLogsList == null) {
+                        timelineCacheLogsList = new TimelineCacheLogs(this).getHome(Helper.getCurrentAccount(CheckHomeCacheActivity.this));
+                    }
+                } else if (myRange == range.DAY) {
+                    if (timelineCacheLogsDayList == null && timelineCacheLogsList != null) {
+                        timelineCacheLogsDayList = new ArrayList<>();
+                        Calendar calendar = Calendar.getInstance();
+                        calendar.add(Calendar.DAY_OF_YEAR, -1);
+                        for (TimelineCacheLogs timelineCacheLogs : timelineCacheLogsList) {
+                            if (timelineCacheLogs.created_at.after(calendar.getTime())) {
+                                timelineCacheLogsDayList.add(timelineCacheLogs);
+                            }
+                        }
+                    }
+                }
+                if ((timelineCacheLogsList == null || timelineCacheLogsList.size() < 2) && myRange == range.ALL) {
+                    return;
+                }
+                if ((timelineCacheLogsDayList == null || timelineCacheLogsDayList.size() < 2) && myRange == range.DAY) {
+                    return;
+                }
+
+                timelineCacheLogsListToAnalyse = new ArrayList<>();
+                if (myRange == range.ALL) {
+                    timelineCacheLogsListToAnalyse.addAll(timelineCacheLogsList);
+                } else {
+                    timelineCacheLogsListToAnalyse.addAll(timelineCacheLogsDayList);
+                }
+                List<BarEntry> failEntry = new ArrayList<>();
+                List<Entry> updateEntry = new ArrayList<>();
+                List<Entry> insertEntry = new ArrayList<>();
+                List<Entry> frequencyEntry = new ArrayList<>();
+                List<Entry> fetchedEntry = new ArrayList<>();
+                int inc = 0;
+                for (TimelineCacheLogs timelineCacheLogs : timelineCacheLogsListToAnalyse) {
+                    //X-Axis
+                    //X-Axis
+                    String xDate = dateDiffFullShort(timelineCacheLogs.created_at);
+                    xVals2.add(xDate);
+                    //Entries
+                    failEntry.add(new BarEntry(inc, timelineCacheLogs.failed));
+                    updateEntry.add(new Entry(inc, timelineCacheLogs.updated));
+                    insertEntry.add(new Entry(inc, timelineCacheLogs.inserted));
+                    frequencyEntry.add(new Entry(inc, timelineCacheLogs.frequency));
+                    fetchedEntry.add(new Entry(inc, timelineCacheLogs.fetched));
+                    inc++;
+                }
+
+
+                runOnUiThread(() -> {
+                    binding.progress2.setVisibility(View.GONE);
+
+                    LineData lineData = new LineData();
+                    BarData barDataFailed = new BarData();
+
+                    BarDataSet dataFailed = new BarDataSet(failEntry, getString(R.string.fails));
+                    LineDataSet dataNewMessage = new LineDataSet(insertEntry, getString(R.string.new_messages));
+                    LineDataSet dataUpdatedMessage = new LineDataSet(updateEntry, getString(R.string.updated_messages));
+                    LineDataSet dataFrequency = new LineDataSet(frequencyEntry, getString(R.string.frequency_minutes));
+                    LineDataSet dataFetched = new LineDataSet(fetchedEntry, getString(R.string.total_fetched));
+
+                    dataFailed.setColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.errorColor));
+                    dataFailed.setDrawValues(false);
+                    dataFailed.setAxisDependency(YAxis.AxisDependency.RIGHT);
+                    barDataFailed.addDataSet(dataFailed);
+
+                    dataNewMessage.setColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.decoration_1));
+                    dataNewMessage.setFillColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.transparent));
+                    dataNewMessage.setDrawValues(false);
+                    dataNewMessage.setDrawFilled(true);
+                    dataNewMessage.setDrawCircles(false);
+                    dataNewMessage.setDrawCircleHole(false);
+                    dataNewMessage.setAxisDependency(YAxis.AxisDependency.LEFT);
+                    dataNewMessage.setMode(LineDataSet.Mode.CUBIC_BEZIER);
+                    lineData.addDataSet(dataNewMessage);
+
+                    dataUpdatedMessage.setColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.decoration_2));
+                    dataUpdatedMessage.setFillColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.transparent));
+                    dataUpdatedMessage.setDrawValues(false);
+                    dataUpdatedMessage.setDrawFilled(true);
+                    dataUpdatedMessage.setDrawCircles(false);
+                    dataUpdatedMessage.setDrawCircleHole(false);
+                    dataUpdatedMessage.setAxisDependency(YAxis.AxisDependency.LEFT);
+                    dataUpdatedMessage.setMode(LineDataSet.Mode.CUBIC_BEZIER);
+                    lineData.addDataSet(dataUpdatedMessage);
+
+                    dataFrequency.setColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.decoration_3));
+                    dataFrequency.setFillColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.transparent));
+                    dataFrequency.setDrawValues(false);
+                    dataFrequency.setDrawFilled(true);
+                    dataFrequency.setDrawCircles(false);
+                    dataFrequency.setDrawCircleHole(false);
+                    dataFrequency.setAxisDependency(YAxis.AxisDependency.LEFT);
+                    dataFrequency.setMode(LineDataSet.Mode.CUBIC_BEZIER);
+                    lineData.addDataSet(dataFrequency);
+
+
+                    dataFetched.setColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.decoration_4));
+                    dataFetched.setFillColor(ContextCompat.getColor(CheckHomeCacheActivity.this, R.color.transparent));
+                    dataFetched.setDrawValues(false);
+                    dataFetched.setDrawFilled(true);
+                    dataFetched.setDrawCircles(false);
+                    dataFetched.setDrawCircleHole(false);
+                    dataFetched.setAxisDependency(YAxis.AxisDependency.LEFT);
+                    dataFetched.setMode(LineDataSet.Mode.CUBIC_BEZIER);
+                    lineData.addDataSet(dataFetched);
+
+
+                    CombinedData data = new CombinedData();
+                    data.setData(barDataFailed);
+                    data.setData(lineData);
+
+
+                    binding.chart2.setData(data);
+                    IndexAxisValueFormatter formatter = new IndexAxisValueFormatter() {
+                        @Override
+                        public String getFormattedValue(float value) {
+                            if (value >= 0 && value < xVals2.size()) {
+                                return xVals2.get((int) value);
+                            } else
+                                return "";
+                        }
+                    };
+                    binding.chart2.setExtraBottomOffset(80);
+                    //  binding.chart.getXAxis().setGranularity(1f);
+                    binding.chart2.getXAxis().setPosition(XAxis.XAxisPosition.BOTTOM);
+                    binding.chart2.getXAxis().setLabelRotationAngle(-45f);
+                    binding.chart2.getXAxis().setValueFormatter(formatter);
+                    binding.chart2.getXAxis().setEnabled(true);
+                    binding.chart2.getXAxis().setTextColor(ThemeHelper.getAttColor(CheckHomeCacheActivity.this, R.attr.colorOnBackground));
+                    binding.chart2.getAxisLeft().setTextColor(ThemeHelper.getAttColor(CheckHomeCacheActivity.this, R.attr.colorOnBackground));
+                    binding.chart2.getAxisRight().setTextColor(ThemeHelper.getAttColor(CheckHomeCacheActivity.this, R.attr.colorOnBackground));
+                    binding.chart2.getLegend().setTextColor(ThemeHelper.getAttColor(CheckHomeCacheActivity.this, R.attr.colorOnBackground));
+                    binding.chart2.getAxisLeft().setAxisMinimum(0f);
+                    binding.chart2.getAxisRight().setAxisMinimum(0f);
+                    binding.chart2.getXAxis().setLabelCount(10, true);
+                    binding.chart2.getLegend().setEnabled(true);
+                    binding.chart2.getLegend().setOrientation(Legend.LegendOrientation.HORIZONTAL);
+                    binding.chart2.getLegend().setVerticalAlignment(Legend.LegendVerticalAlignment.BOTTOM);
+                    binding.chart2.getLegend().setDrawInside(false);
+                    binding.chart2.getLegend().setWordWrapEnabled(true);
+                    binding.chart2.setTouchEnabled(true);
+                    Description description = binding.chart2.getDescription();
+                    description.setEnabled(true);
+                    CustomMarkerView2 mv = new CustomMarkerView2(CheckHomeCacheActivity.this, R.layout.custom_marker_view_layout);
+                    binding.chart2.setMarker(mv);
+
+                    binding.chart2.invalidate();
+                });
+
+
+            } catch (DBException | NegativeArraySizeException e) {
+                Toasty.error(this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
+                throw new RuntimeException(e);
+            }
+        }).start();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    public enum range {
+        ALL,
+        DAY
+    }
+
+    public static class GraphElement {
+        String dateLabel;
+        int count;
+
+        @Override
+        public boolean equals(@Nullable Object obj) {
+            boolean same = false;
+            if (obj instanceof GraphElement) {
+                same = this.dateLabel.equals(((GraphElement) obj).dateLabel);
+            }
+            return same;
+        }
+    }
+
+    public class CustomMarkerView extends MarkerView {
+
+        private final TextView tvContent;
+        private MPPointF mOffset;
+
+        public CustomMarkerView(Context context, int layoutResource) {
+            super(context, layoutResource);
+
+            // find your layout components
+            tvContent = findViewById(R.id.tvContent);
+        }
+
+        // callbacks everytime the MarkerView is redrawn, can be used to update the
+        // content (user-interface)
+        @Override
+        public void refreshContent(Entry e, Highlight highlight) {
+            if (xVals.size() > (int) e.getX()) {
+                tvContent.setText(getString(R.string.messages, (int) e.getY()));
+            }
+
+            // this will perform necessary layouting
+            super.refreshContent(e, highlight);
+        }
+
+        @Override
+        public MPPointF getOffset() {
+            if (mOffset == null) {
+                // center the marker horizontally and vertically
+                mOffset = new MPPointF(-(int) (getWidth() / 2), -getHeight());
+            }
+
+            return mOffset;
+        }
+
+    }
+
+
+    public class CustomMarkerView2 extends MarkerView {
+
+        private final TextView tvContent;
+        private MPPointF mOffset;
+
+        public CustomMarkerView2(Context context, int layoutResource) {
+            super(context, layoutResource);
+
+            // find your layout components
+            tvContent = findViewById(R.id.tvContent);
+        }
+
+        // callbacks everytime the MarkerView is redrawn, can be used to update the
+        // content (user-interface)
+        @Override
+        public void refreshContent(Entry e, Highlight highlight) {
+            if (xVals2.size() > (int) e.getX()) {
+                if (timelineCacheLogsListToAnalyse != null && (int) e.getX() < timelineCacheLogsListToAnalyse.size()) {
+                    String text = getString(R.string.fail_count, timelineCacheLogsListToAnalyse.get((int) e.getX()).failed) + "\r\n";
+                    text += getString(R.string.fetched_count, timelineCacheLogsListToAnalyse.get((int) e.getX()).fetched) + "\r\n";
+                    text += getString(R.string.inserted_count, timelineCacheLogsListToAnalyse.get((int) e.getX()).inserted) + "\r\n";
+                    text += getString(R.string.updated_count, timelineCacheLogsListToAnalyse.get((int) e.getX()).updated) + "\r\n";
+                    text += getString(R.string.frequency_count_minutes, timelineCacheLogsListToAnalyse.get((int) e.getX()).frequency) + "\r\n\r\n";
+                    text += dateDiffFull(timelineCacheLogsListToAnalyse.get((int) e.getX()).created_at);
+                    tvContent.setText(text);
+                } else {
+                    tvContent.setText(getString(R.string.messages, (int) e.getY()));
+                }
+            }
+
+            // this will perform necessary layouting
+            super.refreshContent(e, highlight);
+        }
+
+        @Override
+        public MPPointF getOffset() {
+            if (mOffset == null) {
+                // center the marker horizontally and vertically
+                mOffset = new MPPointF(-(int) (getWidth() / 2), -getHeight());
+            }
+
+            return mOffset;
+        }
+
+    }
+}

app/src/main/java/app/fedilab/android/mastodon/activities/ContextActivity.java

@@ -15,7 +15,7 @@ package app.fedilab.android.mastodon.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
-import static app.fedilab.android.BaseMainActivity.currentAccount;
+import static app.fedilab.android.BaseMainActivity.currentInstance;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -29,10 +29,13 @@ import android.view.MenuItem;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.preference.PreferenceManager;
 
+import com.google.android.material.appbar.AppBarLayout;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.regex.Matcher;
@@ -43,6 +46,7 @@ import app.fedilab.android.R;
 import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.databinding.ActivityConversationBinding;
 import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.app.CachedBundle;
 import app.fedilab.android.mastodon.client.entities.app.StatusCache;
 import app.fedilab.android.mastodon.exception.DBException;
 import app.fedilab.android.mastodon.helper.Helper;
@@ -60,12 +64,16 @@ public class ContextActivity extends BaseActivity implements FragmentMastodonCon
     Fragment currentFragment;
     private Status firstMessage;
     private String remote_instance;
+    private Status focusedStatus;
+    private String focusedStatusURI;
+    private boolean checkRemotely;
+    private ActivityConversationBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        ActivityConversationBinding binding = ActivityConversationBinding.inflate(getLayoutInflater());
+        binding = ActivityConversationBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
         ActionBar actionBar = getSupportActionBar();
@@ -82,50 +90,101 @@ public class ContextActivity extends BaseActivity implements FragmentMastodonCon
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
         }
-        Bundle b = getIntent().getExtras();
+        manageTopBarScrolling(binding.toolbar, sharedpreferences);
         displayCW = sharedpreferences.getBoolean(getString(R.string.SET_EXPAND_CW), false);
-        Status focusedStatus = null; // or other values
+        focusedStatus = null; // or other values
-        if (b != null) {
+
-            focusedStatus = (Status) b.getSerializable(Helper.ARG_STATUS);
+
-            remote_instance = b.getString(Helper.ARG_REMOTE_INSTANCE, null);
+        Bundle args = getIntent().getExtras();
-        }
+        if (args != null) {
-        if (focusedStatus == null || currentAccount == null || currentAccount.mastodon_account == null) {
+            long bundleId = args.getLong(Helper.ARG_INTENT_ID, -1);
-            finish();
+            new CachedBundle(ContextActivity.this).getBundle(bundleId, Helper.getCurrentAccount(ContextActivity.this), this::initializeAfterBundle);
-            return;
+        } else {
-        }
+            initializeAfterBundle(null);
-        MastodonHelper.loadPPMastodon(binding.profilePicture, currentAccount.mastodon_account);
-        Bundle bundle = new Bundle();
-        bundle.putSerializable(Helper.ARG_STATUS, focusedStatus);
-        bundle.putString(Helper.ARG_REMOTE_INSTANCE, remote_instance);
-        FragmentMastodonContext fragmentMastodonContext = new FragmentMastodonContext();
-        fragmentMastodonContext.firstMessage = this;
-        currentFragment = Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_content_main, fragmentMastodonContext, bundle, null, null);
-        if (remote_instance == null) {
-            StatusesVM timelinesVM = new ViewModelProvider(ContextActivity.this).get(StatusesVM.class);
-            timelinesVM.getStatus(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, focusedStatus.id).observe(ContextActivity.this, status -> {
-                if (status != null) {
-                    StatusCache statusCache = new StatusCache();
-                    statusCache.instance = BaseMainActivity.currentInstance;
-                    statusCache.user_id = BaseMainActivity.currentUserID;
-                    statusCache.status = status;
-                    statusCache.status_id = status.id;
-                    //Update cache
-                    new Thread(() -> {
-                        try {
-                            new StatusCache(getApplication()).updateIfExists(statusCache);
-                            Handler mainHandler = new Handler(Looper.getMainLooper());
-                            //Update UI
-                            Runnable myRunnable = () -> StatusAdapter.sendAction(ContextActivity.this, Helper.ARG_STATUS_ACTION, status, null);
-                            mainHandler.post(myRunnable);
-                        } catch (DBException e) {
-                            e.printStackTrace();
-                        }
-                    }).start();
-                }
-            });
         }
     }
 
+    private void initializeAfterBundle(Bundle bundle) {
+        if (bundle != null) {
+            focusedStatus = (Status) bundle.getSerializable(Helper.ARG_STATUS);
+            remote_instance = bundle.getString(Helper.ARG_REMOTE_INSTANCE, null);
+            focusedStatusURI = bundle.getString(Helper.ARG_FOCUSED_STATUS_URI, null);
+        }
+        if (focusedStatus == null || Helper.getCurrentAccount(ContextActivity.this) == null || Helper.getCurrentAccount(ContextActivity.this).mastodon_account == null) {
+            finish();
+            return;
+        }
+        if (focusedStatusURI == null && remote_instance == null) {
+            focusedStatusURI = focusedStatus.uri;
+        }
+        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+        checkRemotely = sharedpreferences.getBoolean(getString(R.string.SET_CONVERSATION_REMOTELY), false);
+        if (!checkRemotely) {
+            loadLocalConversation();
+        } else {
+            loadRemotelyConversation(true);
+            invalidateOptionsMenu();
+        }
+        if (Helper.getCurrentAccount(ContextActivity.this) != null) {
+            MastodonHelper.loadPPMastodon(binding.profilePicture, Helper.getCurrentAccount(ContextActivity.this).mastodon_account);
+        }
+    }
+
+
+    private void manageTopBarScrolling(Toolbar toolbar, SharedPreferences sharedpreferences) {
+        final boolean topBarScrolling = !sharedpreferences.getBoolean(getString(R.string.SET_DISABLE_TOPBAR_SCROLLING), false);
+
+        final AppBarLayout.LayoutParams toolbarLayoutParams = (AppBarLayout.LayoutParams) toolbar.getLayoutParams();
+
+        int scrollFlags = toolbarLayoutParams.getScrollFlags();
+
+        if (topBarScrolling) {
+            scrollFlags |= AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL;
+
+        } else {
+            scrollFlags &= ~AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL;
+        }
+        toolbarLayoutParams.setScrollFlags(scrollFlags);
+    }
+
+    private void loadLocalConversation() {
+        Bundle args = new Bundle();
+        args.putSerializable(Helper.ARG_STATUS, focusedStatus);
+        args.putString(Helper.ARG_REMOTE_INSTANCE, remote_instance);
+        new CachedBundle(ContextActivity.this).insertBundle(args, Helper.getCurrentAccount(ContextActivity.this), bundleId -> {
+            Bundle bundle = new Bundle();
+            bundle.putLong(Helper.ARG_INTENT_ID, bundleId);
+            FragmentMastodonContext fragmentMastodonContext = new FragmentMastodonContext();
+            fragmentMastodonContext.firstMessage = this;
+            currentFragment = Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_content_main, fragmentMastodonContext, bundle, null, null);
+            //Update the status
+            if (remote_instance == null) {
+                StatusesVM timelinesVM = new ViewModelProvider(ContextActivity.this).get(StatusesVM.class);
+                timelinesVM.getStatus(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, focusedStatus.id).observe(ContextActivity.this, status -> {
+                    if (status != null) {
+                        StatusCache statusCache = new StatusCache();
+                        statusCache.instance = BaseMainActivity.currentInstance;
+                        statusCache.user_id = BaseMainActivity.currentUserID;
+                        statusCache.status = status;
+                        statusCache.status_id = status.id;
+                        //Update cache
+                        new Thread(() -> {
+                            try {
+                                new StatusCache(getApplication()).updateIfExists(statusCache);
+                                Handler mainHandler = new Handler(Looper.getMainLooper());
+                                //Update UI
+                                Runnable myRunnable = () -> StatusAdapter.sendAction(ContextActivity.this, Helper.ARG_STATUS_ACTION, status, null);
+                                mainHandler.post(myRunnable);
+                            } catch (DBException e) {
+                                e.printStackTrace();
+                            }
+                        }).start();
+                    }
+                });
+            }
+        });
+    }
 
     @Override
     public boolean onCreateOptionsMenu(@NonNull Menu menu) {
@@ -144,7 +203,7 @@ public class ContextActivity extends BaseActivity implements FragmentMastodonCon
             itemDisplayCW.setIcon(R.drawable.ic_outline_remove_red_eye_24);
         }
         MenuItem action_remote = menu.findItem(R.id.action_remote);
-        if (remote_instance != null) {
+        if (remote_instance != null || checkRemotely) {
             action_remote.setVisible(false);
         } else {
             if (firstMessage != null && !firstMessage.visibility.equalsIgnoreCase("direct") && !firstMessage.visibility.equalsIgnoreCase("private")) {
@@ -181,10 +240,67 @@ public class ContextActivity extends BaseActivity implements FragmentMastodonCon
             }
             invalidateOptionsMenu();
         } else if (item.getItemId() == R.id.action_remote) {
+            loadRemotelyConversation(false);
 
+        }
+        return true;
+    }
+
+    private void loadRemotelyConversation(boolean fallback) {
+        if (fallback) {
+            StatusesVM statusesVM;
+            statusesVM = new ViewModelProvider(this).get(StatusesVM.class);
+            statusesVM.getContext(currentInstance, null, focusedStatus.id)
+                    .observe(this, result -> {
+                        if (result != null && result.ancestors != null && result.ancestors.size() > 0) {
+                            firstMessage = result.ancestors.get(0);
+                            String instance = null;
+                            try {
+                                URL url = new URL(firstMessage.uri);
+                                instance = url.getHost();
+                            } catch (MalformedURLException e) {
+                                e.printStackTrace();
+                            }
+                            if (instance == null) {
+                                loadLocalConversation();
+                                return;
+                            }
+                            Pattern pattern = Helper.statusIdInUrl;
+                            Matcher matcher = pattern.matcher(firstMessage.uri);
+                            String remoteId = null;
+                            if (matcher.find()) {
+                                remoteId = matcher.group(1);
+                            }
+                            if (remoteId == null) {
+                                loadLocalConversation();
+                                return;
+                            }
+                            String finalInstance = instance;
+                            statusesVM.getStatus(instance, null, remoteId).observe(ContextActivity.this, status -> {
+                                if (status != null) {
+                                    Bundle args = new Bundle();
+                                    args.putSerializable(Helper.ARG_STATUS, status);
+                                    args.putString(Helper.ARG_REMOTE_INSTANCE, finalInstance);
+                                    args.putString(Helper.ARG_FOCUSED_STATUS_URI, focusedStatusURI);
+                                    new CachedBundle(ContextActivity.this).insertBundle(args, Helper.getCurrentAccount(ContextActivity.this), bundleId -> {
+                                        Bundle bundle = new Bundle();
+                                        bundle.putLong(Helper.ARG_INTENT_ID, bundleId);
+                                        FragmentMastodonContext fragmentMastodonContext = new FragmentMastodonContext();
+                                        fragmentMastodonContext.firstMessage = ContextActivity.this;
+                                        currentFragment = Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_content_main, fragmentMastodonContext, bundle, null, null);
+                                    });
+                                } else {
+                                    loadLocalConversation();
+                                }
+                            });
+                        } else {
+                            loadLocalConversation();
+                        }
+                    });
+        } else {
             if (firstMessage == null) {
                 Toasty.warning(ContextActivity.this, getString(R.string.toast_try_later), Toasty.LENGTH_SHORT).show();
-                return true;
+                return;
             }
             if (firstMessage.account.acct != null) {
                 String instance = null;
@@ -196,11 +312,11 @@ public class ContextActivity extends BaseActivity implements FragmentMastodonCon
                 }
                 if (instance == null) {
                     Toasty.info(ContextActivity.this, getString(R.string.toast_error_fetch_message), Toasty.LENGTH_SHORT).show();
-                    return true;
+                    return;
                 }
                 if (instance.equalsIgnoreCase(MainActivity.currentInstance)) {
                     Toasty.info(ContextActivity.this, getString(R.string.toast_on_your_instance), Toasty.LENGTH_SHORT).show();
-                    return true;
+                    return;
                 }
                 Pattern pattern = Helper.statusIdInUrl;
                 Matcher matcher = pattern.matcher(firstMessage.uri);
@@ -214,10 +330,17 @@ public class ContextActivity extends BaseActivity implements FragmentMastodonCon
                     statusesVM.getStatus(instance, null, remoteId).observe(ContextActivity.this, status -> {
                         if (status != null) {
                             Intent intentContext = new Intent(ContextActivity.this, ContextActivity.class);
-                            intentContext.putExtra(Helper.ARG_STATUS, status);
+                            Bundle args = new Bundle();
-                            intentContext.putExtra(Helper.ARG_REMOTE_INSTANCE, finalInstance);
+                            args.putSerializable(Helper.ARG_STATUS, status);
-                            intentContext.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                            args.putString(Helper.ARG_FOCUSED_STATUS_URI, focusedStatusURI);
-                            startActivity(intentContext);
+                            args.putString(Helper.ARG_REMOTE_INSTANCE, finalInstance);
+                            new CachedBundle(ContextActivity.this).insertBundle(args, Helper.getCurrentAccount(ContextActivity.this), bundleId -> {
+                                Bundle bundle = new Bundle();
+                                bundle.putLong(Helper.ARG_INTENT_ID, bundleId);
+                                intentContext.putExtras(bundle);
+                                intentContext.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                startActivity(intentContext);
+                            });
                         } else {
                             Toasty.warning(ContextActivity.this, getString(R.string.toast_error_fetch_message), Toasty.LENGTH_SHORT).show();
                         }
@@ -229,7 +352,6 @@ public class ContextActivity extends BaseActivity implements FragmentMastodonCon
                 Toasty.warning(ContextActivity.this, getString(R.string.toast_error_fetch_message), Toasty.LENGTH_SHORT).show();
             }
         }
-        return true;
     }
 
     @Override

app/src/main/java/app/fedilab/android/mastodon/activities/CustomSharingActivity.java

@@ -14,7 +14,6 @@ package app.fedilab.android.mastodon.activities;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import static app.fedilab.android.BaseMainActivity.currentAccount;
 
 import android.content.SharedPreferences;
 import android.net.Uri;
@@ -28,6 +27,7 @@ import android.widget.Toast;
 import androidx.preference.PreferenceManager;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import app.fedilab.android.R;
@@ -36,6 +36,7 @@ import app.fedilab.android.mastodon.client.entities.api.Attachment;
 import app.fedilab.android.mastodon.client.entities.api.Emoji;
 import app.fedilab.android.mastodon.client.entities.api.Status;
 import app.fedilab.android.mastodon.client.entities.api.Tag;
+import app.fedilab.android.mastodon.client.entities.app.CachedBundle;
 import app.fedilab.android.mastodon.helper.Helper;
 import app.fedilab.android.mastodon.helper.customsharing.CustomSharingAsyncTask;
 import app.fedilab.android.mastodon.helper.customsharing.CustomSharingResponse;
@@ -64,23 +65,34 @@ public class CustomSharingActivity extends BaseBarActivity implements OnCustomSh
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(CustomSharingActivity.this);
+
         binding = ActivityCustomSharingBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setDisplayShowHomeEnabled(true);
         }
-        Bundle b = getIntent().getExtras();
+        Bundle args = getIntent().getExtras();
         status = null;
-        if (b != null) {
+        if (args != null) {
-            status = (Status) b.getSerializable(Helper.ARG_STATUS);
+            long bundleId = args.getLong(Helper.ARG_INTENT_ID, -1);
+            new CachedBundle(CustomSharingActivity.this).getBundle(bundleId, Helper.getCurrentAccount(CustomSharingActivity.this), this::initializeAfterBundle);
+        } else {
+            initializeAfterBundle(null);
+        }
+
+    }
+
+    private void initializeAfterBundle(Bundle bundle) {
+
+        if (bundle != null) {
+            status = (Status) bundle.getSerializable(Helper.ARG_STATUS);
         }
         if (status == null) {
             finish();
             return;
         }
-
+        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(CustomSharingActivity.this);
         bundle_creator = status.account.acct;
         bundle_url = status.url;
         bundle_id = status.uri;
@@ -97,7 +109,7 @@ public class CustomSharingActivity extends BaseBarActivity implements OnCustomSh
             bundle_thumbnailurl = status.account.avatar;
         }
         if (!bundle_creator.contains("@")) {
-            bundle_creator = bundle_creator + "@" + currentAccount.instance;
+            bundle_creator = bundle_creator + "@" + Helper.getCurrentAccount(CustomSharingActivity.this).instance;
         }
 
         binding.setCustomSharingTitle.setEllipsize(TextUtils.TruncateAt.END);
@@ -126,7 +138,7 @@ public class CustomSharingActivity extends BaseBarActivity implements OnCustomSh
         binding.setCustomSharingSave.setOnClickListener(v -> {
             // obtain title, description, keywords
             title = binding.setCustomSharingTitle.getText().toString();
-            keywords = binding.setCustomSharingKeywords.getText().toString();
+            keywords = Objects.requireNonNull(binding.setCustomSharingKeywords.getText()).toString();
             CharSequence comma_only = ",";
             CharSequence space_only = " ";
             CharSequence double_space = "  ";
@@ -194,38 +206,38 @@ public class CustomSharingActivity extends BaseBarActivity implements OnCustomSh
             String param_value = uri.getQueryParameter(param_name);
             if (param_value != null)
                 switch (param_value) {
-                    case "${url}":
+                    case "${url}" -> {
                         paramFound = true;
                         builder.appendQueryParameter(param_name, bundle_url);
-                        break;
+                    }
-                    case "${title}":
+                    case "${title}" -> {
                         paramFound = true;
                         builder.appendQueryParameter(param_name, title);
-                        break;
+                    }
-                    case "${source}":
+                    case "${source}" -> {
                         paramFound = true;
                         builder.appendQueryParameter(param_name, bundle_source);
-                        break;
+                    }
-                    case "${id}":
+                    case "${id}" -> {
                         paramFound = true;
                         builder.appendQueryParameter(param_name, bundle_id);
-                        break;
+                    }
-                    case "${description}":
+                    case "${description}" -> {
                         paramFound = true;
                         builder.appendQueryParameter(param_name, bundle_content);
-                        break;
+                    }
-                    case "${keywords}":
+                    case "${keywords}" -> {
                         paramFound = true;
                         builder.appendQueryParameter(param_name, keywords);
-                        break;
+                    }
-                    case "${creator}":
+                    case "${creator}" -> {
                         paramFound = true;
                         builder.appendQueryParameter(param_name, bundle_creator);
-                        break;
+                    }
-                    case "${thumbnailurl}":
+                    case "${thumbnailurl}" -> {
                         paramFound = true;
                         builder.appendQueryParameter(param_name, bundle_thumbnailurl);
-                        break;
+                    }
                 }
             if (!paramFound) {
                 builder.appendQueryParameter(param_name, param_value);

app/src/main/java/app/fedilab/android/mastodon/activities/DirectMessageActivity.java

@@ -0,0 +1,171 @@
+package app.fedilab.android.mastodon.activities;
+/* Copyright 2023 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+import static app.fedilab.android.mastodon.activities.ComposeActivity.PICK_MEDIA;
+
+import android.content.ClipData;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.TypedValue;
+import android.view.MenuItem;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.preference.PreferenceManager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import app.fedilab.android.BaseMainActivity;
+import app.fedilab.android.R;
+import app.fedilab.android.databinding.ActivityDirectMessageBinding;
+import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.app.CachedBundle;
+import app.fedilab.android.mastodon.client.entities.app.StatusCache;
+import app.fedilab.android.mastodon.exception.DBException;
+import app.fedilab.android.mastodon.helper.Helper;
+import app.fedilab.android.mastodon.helper.MastodonHelper;
+import app.fedilab.android.mastodon.ui.drawer.StatusAdapter;
+import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonDirectMessage;
+import app.fedilab.android.mastodon.viewmodel.mastodon.StatusesVM;
+
+public class DirectMessageActivity extends BaseActivity implements FragmentMastodonDirectMessage.FirstMessage {
+
+    public static boolean expand;
+    public static boolean displayCW;
+
+    FragmentMastodonDirectMessage currentFragment;
+    private String remote_instance;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        ActivityDirectMessageBinding binding = ActivityDirectMessageBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        setSupportActionBar(binding.toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        //Remove title
+        if (actionBar != null) {
+            actionBar.setDisplayShowTitleEnabled(false);
+        }
+        binding.title.setText(R.string.context_conversation);
+        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        float scale = sharedpreferences.getFloat(getString(R.string.SET_FONT_SCALE), 1.1f);
+        binding.title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18 * 1.1f / scale);
+        MastodonHelper.loadPPMastodon(binding.profilePicture, Helper.getCurrentAccount(DirectMessageActivity.this).mastodon_account);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+        Bundle args = getIntent().getExtras();
+        displayCW = sharedpreferences.getBoolean(getString(R.string.SET_EXPAND_CW), false);
+
+        if (args != null) {
+            long bundleId = args.getLong(Helper.ARG_INTENT_ID, -1);
+            new CachedBundle(DirectMessageActivity.this).getBundle(bundleId, Helper.getCurrentAccount(DirectMessageActivity.this), this::initializeAfterBundle);
+        } else {
+            initializeAfterBundle(null);
+        }
+
+
+    }
+
+    private void initializeAfterBundle(Bundle bundle) {
+        Status focusedStatus = null; // or other values
+        if (bundle != null) {
+            focusedStatus = (Status) bundle.getSerializable(Helper.ARG_STATUS);
+            remote_instance = bundle.getString(Helper.ARG_REMOTE_INSTANCE, null);
+        }
+
+        if (focusedStatus == null || Helper.getCurrentAccount(DirectMessageActivity.this) == null || Helper.getCurrentAccount(DirectMessageActivity.this).mastodon_account == null) {
+            finish();
+            return;
+        }
+
+        Bundle args = new Bundle();
+        args.putSerializable(Helper.ARG_STATUS, focusedStatus);
+        args.putString(Helper.ARG_REMOTE_INSTANCE, remote_instance);
+        Status finalFocusedStatus = focusedStatus;
+        new CachedBundle(DirectMessageActivity.this).insertBundle(args, Helper.getCurrentAccount(DirectMessageActivity.this), bundleId -> {
+            Bundle args2 = new Bundle();
+            args2.putLong(Helper.ARG_INTENT_ID, bundleId);
+            FragmentMastodonDirectMessage FragmentMastodonDirectMessage = new FragmentMastodonDirectMessage();
+            FragmentMastodonDirectMessage.firstMessage = this;
+            currentFragment = (FragmentMastodonDirectMessage) Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_content_main, FragmentMastodonDirectMessage, args2, null, null);
+            StatusesVM timelinesVM = new ViewModelProvider(DirectMessageActivity.this).get(StatusesVM.class);
+            timelinesVM.getStatus(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, finalFocusedStatus.id).observe(DirectMessageActivity.this, status -> {
+                if (status != null) {
+                    StatusCache statusCache = new StatusCache();
+                    statusCache.instance = BaseMainActivity.currentInstance;
+                    statusCache.user_id = BaseMainActivity.currentUserID;
+                    statusCache.status = status;
+                    statusCache.status_id = status.id;
+                    //Update cache
+                    new Thread(() -> {
+                        try {
+                            new StatusCache(getApplication()).updateIfExists(statusCache);
+                            Handler mainHandler = new Handler(Looper.getMainLooper());
+                            //Update UI
+                            Runnable myRunnable = () -> StatusAdapter.sendAction(DirectMessageActivity.this, Helper.ARG_STATUS_ACTION, status, null);
+                            mainHandler.post(myRunnable);
+                        } catch (DBException e) {
+                            e.printStackTrace();
+                        }
+                    }).start();
+                }
+            });
+        });
+
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        List<Uri> uris = new ArrayList<>();
+        if (requestCode >= PICK_MEDIA && resultCode == RESULT_OK) {
+            ClipData clipData = data.getClipData();
+            if (clipData != null) {
+                for (int i = 0; i < clipData.getItemCount(); i++) {
+                    ClipData.Item item = clipData.getItemAt(i);
+                    uris.add(item.getUri());
+                }
+            } else {
+                uris.add(data.getData());
+            }
+            currentFragment.addAttachment(uris);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return true;
+    }
+
+    @Override
+    public void get(Status status) {
+        invalidateOptionsMenu();
+    }
+}

app/src/main/java/app/fedilab/android/mastodon/activities/DraftActivity.java

@@ -14,7 +14,6 @@ package app.fedilab.android.mastodon.activities;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import static app.fedilab.android.BaseMainActivity.currentAccount;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -83,7 +82,7 @@ public class DraftActivity extends BaseActivity implements StatusDraftAdapter.Dr
             getSupportActionBar().setDisplayShowHomeEnabled(true);
         }
         timelinesVM = new ViewModelProvider(DraftActivity.this).get(TimelinesVM.class);
-        timelinesVM.getDrafts(currentAccount)
+        timelinesVM.getDrafts(Helper.getCurrentAccount(DraftActivity.this))
                 .observe(DraftActivity.this, this::initializeDraftView);
     }
 
@@ -100,7 +99,7 @@ public class DraftActivity extends BaseActivity implements StatusDraftAdapter.Dr
             finish();
             return true;
         } else if (item.getItemId() == R.id.action_delete) {
-            AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(DraftActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(DraftActivity.this);
             unfollowConfirm.setTitle(getString(R.string.delete_all));
             unfollowConfirm.setMessage(getString(R.string.remove_draft));
             unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
@@ -179,7 +178,7 @@ public class DraftActivity extends BaseActivity implements StatusDraftAdapter.Dr
         super.onResume();
         //We need to check if drafts changed (ie when coming back from the compose activity)
         if (statusDrafts != null && timelinesVM != null) {
-            timelinesVM.getDrafts(currentAccount)
+            timelinesVM.getDrafts(Helper.getCurrentAccount(DraftActivity.this))
                     .observe(DraftActivity.this, this::updateDrafts);
         }
     }

app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java

@@ -14,9 +14,10 @@ package app.fedilab.android.mastodon.activities;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import static app.fedilab.android.BaseMainActivity.currentAccount;
+
 import static app.fedilab.android.BaseMainActivity.instanceInfo;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
@@ -26,27 +27,34 @@ import android.text.Html;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.bumptech.glide.Glide;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textfield.TextInputEditText;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 
 import app.fedilab.android.BaseMainActivity;
+import app.fedilab.android.BuildConfig;
 import app.fedilab.android.R;
+import app.fedilab.android.databinding.AccountFeaturedHashtagItemBinding;
 import app.fedilab.android.databinding.AccountFieldItemBinding;
 import app.fedilab.android.databinding.ActivityEditProfileBinding;
 import app.fedilab.android.mastodon.client.entities.api.Account;
+import app.fedilab.android.mastodon.client.entities.api.FeaturedTag;
 import app.fedilab.android.mastodon.client.entities.api.Field;
+import app.fedilab.android.mastodon.client.entities.api.Tag;
+import app.fedilab.android.mastodon.client.entities.app.CachedBundle;
 import app.fedilab.android.mastodon.exception.DBException;
 import app.fedilab.android.mastodon.helper.Helper;
 import app.fedilab.android.mastodon.helper.MastodonHelper;
@@ -59,7 +67,10 @@ public class EditProfileActivity extends BaseBarActivity {
     public static final int PICK_MEDIA_HEADER = 5706;
     private ActivityEditProfileBinding binding;
     private AccountsVM accountsVM;
+    private static final int MAX_FIELDS = 4;
+    private static final int MAX_FEATURED_HASHTAGS = 10;
 
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -70,62 +81,132 @@ public class EditProfileActivity extends BaseBarActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         }
 
-        new ViewModelProvider(EditProfileActivity.this).get(AccountsVM.class).getConnectedAccount(BaseMainActivity.currentInstance, BaseMainActivity.currentToken)
+        binding.scrollContainer.setOnTouchListener((v, event) -> {
+
+            binding.bio.getParent().requestDisallowInterceptTouchEvent(false);
+
+            return false;
+        });
+
+        binding.bio.setOnTouchListener((v, event) -> {
+
+            binding.bio.getParent().requestDisallowInterceptTouchEvent(true);
+
+            return false;
+        });
+        accountsVM = new ViewModelProvider(EditProfileActivity.this).get(AccountsVM.class);
+
+        accountsVM.getConnectedAccount(BaseMainActivity.currentInstance, BaseMainActivity.currentToken)
                 .observe(EditProfileActivity.this, account -> {
                     if (account != null) {
-                        currentAccount.mastodon_account = account;
+                        Helper.setCurrentAccountMastodonAccount(EditProfileActivity.this, account);
                         initializeView();
                     } else {
                         Helper.sendToastMessage(getApplication(), Helper.RECEIVE_TOAST_TYPE_ERROR, getString(R.string.toast_error));
                     }
                 });
-    }
 
 
+    }
+
     @SuppressWarnings("deprecation")
     private void initializeView() {
         //Hydrate values
-        MastodonHelper.loadProfileMediaMastodon(EditProfileActivity.this, binding.bannerPp, currentAccount.mastodon_account, MastodonHelper.MediaAccountType.HEADER);
+        MastodonHelper.loadProfileMediaMastodon(EditProfileActivity.this, binding.bannerPp, Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account, MastodonHelper.MediaAccountType.HEADER);
-        MastodonHelper.loadPPMastodon(binding.accountPp, currentAccount.mastodon_account);
+        MastodonHelper.loadPPMastodon(binding.accountPp, Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account);
-        binding.displayName.setText(currentAccount.mastodon_account.display_name);
+        binding.displayName.setText(Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.display_name);
-        binding.acct.setText(String.format(Locale.getDefault(), "%s@%s", currentAccount.mastodon_account.acct, BaseMainActivity.currentInstance));
+        binding.acct.setText(String.format(Locale.getDefault(), "%s@%s", Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.acct, BaseMainActivity.currentInstance));
         String bio;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-            bio = Html.fromHtml(currentAccount.mastodon_account.note, Html.FROM_HTML_MODE_LEGACY).toString();
+            bio = Html.fromHtml(Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.note, Html.FROM_HTML_MODE_LEGACY).toString();
         else
-            bio = Html.fromHtml(currentAccount.mastodon_account.note).toString();
+            bio = Html.fromHtml(Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.note).toString();
         binding.bio.setText(bio);
-        if (currentAccount.mastodon_account.source != null) {
+
-            binding.sensitive.setChecked(currentAccount.mastodon_account.source.sensitive);
+        accountsVM.getFeaturedTagsSuggestions(BaseMainActivity.currentInstance, BaseMainActivity.currentToken).observe(this, featuredTags -> {
-            switch (currentAccount.mastodon_account.source.privacy) {
+            StringBuilder text = new StringBuilder(getString(R.string.no_feature_hashtag_suggestion));
-                case "public":
+            if(featuredTags != null && !featuredTags.isEmpty()) {
-                    binding.visibilityPublic.setChecked(true);
+                text = new StringBuilder();
-                    break;
+                for (Tag tag : featuredTags) {
-                case "unlisted":
+                    text.append(String.format("#%s ", tag.name));
-                    binding.visibilityUnlisted.setChecked(true);
+                }
-                    break;
+            }
-                case "private":
+            binding.featuredHashtagsSuggestions.setText(text);
-                    binding.visibilityPrivate.setChecked(true);
+        });
-                    break;
+        accountsVM.getAccountFeaturedTags(BaseMainActivity.currentInstance, BaseMainActivity.currentToken,  Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.id).observe(this, featuredTags -> {
-                case "direct":
+            if(featuredTags != null && !featuredTags.isEmpty()) {
-                    binding.visibilityDirect.setChecked(true);
+                for (FeaturedTag featuredTag : featuredTags) {
-                    break;
+                    AccountFeaturedHashtagItemBinding featuredHashtagItemBinding = AccountFeaturedHashtagItemBinding.inflate(getLayoutInflater());
+                    featuredHashtagItemBinding.name.setText(featuredTag.name);
+                    featuredHashtagItemBinding.remove.setOnClickListener(v -> {
+                        AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this);
+                        deleteConfirm.setTitle(getString(R.string.delete_featured_hashtag));
+                        deleteConfirm.setMessage(getString(R.string.delete_featured_hashtag_confirm));
+                        deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+                        deleteConfirm.setPositiveButton(R.string.delete, (dialog, which) -> {
+                            ((ViewGroup)featuredHashtagItemBinding.getRoot().getParent()).removeView(featuredHashtagItemBinding.getRoot());
+                            if (binding.featuredHashtagsContainer.getChildCount() >= MAX_FEATURED_HASHTAGS) {
+                                binding.addFeaturedHashtags.setVisibility(View.GONE);
+                            } else {
+                                binding.addFeaturedHashtags.setVisibility(View.VISIBLE);
+                            }
+                            dialog.dismiss();
+                        });
+                        deleteConfirm.create().show();
+                    });
+                    binding.featuredHashtagsContainer.addView(featuredHashtagItemBinding.getRoot());
+                }
+            }
+            binding.addFeaturedHashtags.setOnClickListener(view -> {
+                AccountFeaturedHashtagItemBinding featuredHashtagItemBinding = AccountFeaturedHashtagItemBinding.inflate(getLayoutInflater());
+                featuredHashtagItemBinding.remove.setOnClickListener(v -> {
+                    AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this);
+                    deleteConfirm.setTitle(getString(R.string.delete_featured_hashtag));
+                    deleteConfirm.setMessage(getString(R.string.delete_featured_hashtag_confirm));
+                    deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+                    deleteConfirm.setPositiveButton(R.string.delete, (dialog, which) -> {
+                        ((ViewGroup)featuredHashtagItemBinding.getRoot().getParent()).removeView(featuredHashtagItemBinding.getRoot());
+                        if (binding.featuredHashtagsContainer.getChildCount() >= MAX_FEATURED_HASHTAGS) {
+                            binding.addFeaturedHashtags.setVisibility(View.GONE);
+                        } else {
+                            binding.addFeaturedHashtags.setVisibility(View.VISIBLE);
+                        }
+                        dialog.dismiss();
+                    });
+                    deleteConfirm.create().show();
+                });
+                binding.featuredHashtagsContainer.addView(featuredHashtagItemBinding.getRoot());
+
+                if (binding.featuredHashtagsContainer.getChildCount() >= MAX_FEATURED_HASHTAGS) {
+                    binding.addFeaturedHashtags.setVisibility(View.GONE);
+                } else {
+                    binding.addFeaturedHashtags.setVisibility(View.VISIBLE);
+                }
+            });
+        });
+        if (Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.source != null) {
+            binding.sensitive.setChecked(Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.source.sensitive);
+            switch (Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.source.privacy) {
+                case "public" -> binding.visibilityPublic.setChecked(true);
+                case "unlisted" -> binding.visibilityUnlisted.setChecked(true);
+                case "private" -> binding.visibilityPrivate.setChecked(true);
+                case "direct" -> binding.visibilityDirect.setChecked(true);
             }
         } else {
             binding.sensitive.setVisibility(View.GONE);
             binding.visibilityGroup.setVisibility(View.GONE);
         }
 
-        binding.bot.setChecked(currentAccount.mastodon_account.bot);
+        binding.bot.setChecked(Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.bot);
-        binding.discoverable.setChecked(currentAccount.mastodon_account.discoverable);
+        binding.discoverable.setChecked(Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.discoverable);
 
-        if (currentAccount.mastodon_account.locked) {
+        if (Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.locked) {
             binding.locked.setChecked(true);
         } else {
             binding.unlocked.setChecked(true);
         }
-        List<Field> fields = currentAccount.mastodon_account.fields;
+        List<Field> fields = Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.fields;
-        if (fields != null && fields.size() > 0) {
+        if (fields != null && !fields.isEmpty()) {
             for (Field field : fields) {
                 AccountFieldItemBinding fieldItemBinding = AccountFieldItemBinding.inflate(getLayoutInflater());
                 fieldItemBinding.name.setText(field.name);
@@ -136,16 +217,16 @@ public class EditProfileActivity extends BaseBarActivity {
                     value = Html.fromHtml(field.value).toString();
                 fieldItemBinding.value.setText(value);
                 fieldItemBinding.remove.setOnClickListener(v -> {
-                    AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this, Helper.dialogStyle());
+                    AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this);
                     deleteConfirm.setTitle(getString(R.string.delete_field));
                     deleteConfirm.setMessage(getString(R.string.delete_field_confirm));
                     deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
                     deleteConfirm.setPositiveButton(R.string.delete, (dialog, which) -> {
-                        binding.fieldsContainer.removeView(fieldItemBinding.getRoot());
+                        ((ViewGroup)fieldItemBinding.getRoot().getParent()).removeView(fieldItemBinding.getRoot());
-                        if (binding.fieldsContainer.getChildCount() < 4) {
+                        if (binding.fieldsContainer.getChildCount() >= MAX_FIELDS) {
-                            binding.fieldsContainer.setVisibility(View.VISIBLE);
+                            binding.addField.setVisibility(View.GONE);
                         } else {
-                            binding.fieldsContainer.setVisibility(View.GONE);
+                            binding.addField.setVisibility(View.VISIBLE);
                         }
                         dialog.dismiss();
                     });
@@ -153,35 +234,38 @@ public class EditProfileActivity extends BaseBarActivity {
                 });
                 binding.fieldsContainer.addView(fieldItemBinding.getRoot());
             }
-
+            if (binding.fieldsContainer.getChildCount() >= MAX_FIELDS) {
+                binding.addField.setVisibility(View.GONE);
+            } else {
+                binding.addField.setVisibility(View.VISIBLE);
+            }
         }
         binding.addField.setOnClickListener(view -> {
             AccountFieldItemBinding fieldItemBinding = AccountFieldItemBinding.inflate(getLayoutInflater());
             fieldItemBinding.remove.setOnClickListener(v -> {
-                AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this, Helper.dialogStyle());
+                AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this);
                 deleteConfirm.setTitle(getString(R.string.delete_field));
                 deleteConfirm.setMessage(getString(R.string.delete_field_confirm));
                 deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
                 deleteConfirm.setPositiveButton(R.string.delete, (dialog, which) -> {
-                    binding.fieldsContainer.removeView(fieldItemBinding.getRoot());
+                    ((ViewGroup)fieldItemBinding.getRoot().getParent()).removeView(fieldItemBinding.getRoot());
-                    if (binding.fieldsContainer.getChildCount() < 4) {
+                    if (binding.fieldsContainer.getChildCount() >= MAX_FIELDS) {
-                        binding.fieldsContainer.setVisibility(View.VISIBLE);
+                        binding.addField.setVisibility(View.GONE);
                     } else {
-                        binding.fieldsContainer.setVisibility(View.GONE);
+                        binding.addField.setVisibility(View.VISIBLE);
                     }
                     dialog.dismiss();
                 });
                 deleteConfirm.create().show();
             });
             binding.fieldsContainer.addView(fieldItemBinding.getRoot());
-            if (binding.fieldsContainer.getChildCount() >= 4) {
+
+            if (binding.fieldsContainer.getChildCount() >= MAX_FIELDS) {
                 binding.addField.setVisibility(View.GONE);
+            } else {
+                binding.addField.setVisibility(View.VISIBLE);
             }
         });
-
-
-        //Actions with the activity
-        accountsVM = new ViewModelProvider(EditProfileActivity.this).get(AccountsVM.class);
         binding.headerSelect.setOnClickListener(view -> startActivityForResult(prepareIntent(), EditProfileActivity.PICK_MEDIA_HEADER));
 
         binding.avatarSelect.setOnClickListener(view -> startActivityForResult(prepareIntent(), EditProfileActivity.PICK_MEDIA_AVATAR));
@@ -204,11 +288,11 @@ public class EditProfileActivity extends BaseBarActivity {
                             if (account != null) {
                                 sendBroadCast(account);
                                 binding.avatarProgress.setVisibility(View.GONE);
-                                currentAccount.mastodon_account = account;
+                                Helper.setCurrentAccountMastodonAccount(EditProfileActivity.this, account);
                                 Helper.recreateMainActivity(EditProfileActivity.this);
                                 new Thread(() -> {
                                     try {
-                                        new app.fedilab.android.mastodon.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount);
+                                        new app.fedilab.android.mastodon.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(Helper.getCurrentAccount(EditProfileActivity.this));
                                     } catch (DBException e) {
                                         e.printStackTrace();
                                     }
@@ -232,10 +316,10 @@ public class EditProfileActivity extends BaseBarActivity {
                         if (account != null) {
                             sendBroadCast(account);
                             binding.headerProgress.setVisibility(View.GONE);
-                            currentAccount.mastodon_account = account;
+                            Helper.setCurrentAccountMastodonAccount(EditProfileActivity.this, account);
                             new Thread(() -> {
                                 try {
-                                    new app.fedilab.android.mastodon.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount);
+                                    new app.fedilab.android.mastodon.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(Helper.getCurrentAccount(EditProfileActivity.this));
                                 } catch (DBException e) {
                                     e.printStackTrace();
                                 }
@@ -249,12 +333,18 @@ public class EditProfileActivity extends BaseBarActivity {
     }
 
     private void sendBroadCast(Account account) {
-        Bundle b = new Bundle();
+        Bundle args = new Bundle();
-        b.putBoolean(Helper.RECEIVE_REDRAW_PROFILE, true);
+        args.putBoolean(Helper.RECEIVE_REDRAW_PROFILE, true);
-        b.putSerializable(Helper.ARG_ACCOUNT, account);
+        args.putSerializable(Helper.ARG_ACCOUNT, account);
-        Intent intentBD = new Intent(Helper.BROADCAST_DATA);
+        new CachedBundle(EditProfileActivity.this).insertBundle(args, Helper.getCurrentAccount(EditProfileActivity.this), bundleId -> {
-        intentBD.putExtras(b);
+            Bundle bundle = new Bundle();
-        LocalBroadcastManager.getInstance(EditProfileActivity.this).sendBroadcast(intentBD);
+            bundle.putLong(Helper.ARG_INTENT_ID, bundleId);
+            Intent intentBD = new Intent(Helper.BROADCAST_DATA);
+            intentBD.putExtras(bundle);
+            intentBD.setPackage(BuildConfig.APPLICATION_ID);
+            sendBroadcast(intentBD);
+        });
+
     }
 
     private Intent prepareIntent() {
@@ -264,7 +354,7 @@ public class EditProfileActivity extends BaseBarActivity {
         intent.setType("*/*");
         String[] mimetypes;
         long max_size = -1;
-        if (instanceInfo.getMimeTypeImage().size() > 0) {
+        if (!instanceInfo.getMimeTypeImage().isEmpty()) {
             mimetypes = instanceInfo.getMimeTypeImage().toArray(new String[0]);
             max_size = instanceInfo.configuration.media_attachments.image_size_limit;
         } else {
@@ -300,13 +390,23 @@ public class EditProfileActivity extends BaseBarActivity {
         LinkedHashMap<Integer, Field.FieldParams> fields = new LinkedHashMap<>();
         for (int i = 0; i < binding.fieldsContainer.getChildCount(); i++) {
             Field.FieldParams field = new Field.FieldParams();
-            field.name = ((TextInputEditText) binding.fieldsContainer.getChildAt(i).findViewById(R.id.name)).getText().toString().trim();
+            field.name = Objects.requireNonNull(((TextInputEditText) binding.fieldsContainer.getChildAt(i).findViewById(R.id.name)).getText()).toString().trim();
-            field.value = ((TextInputEditText) binding.fieldsContainer.getChildAt(i).findViewById(R.id.value)).getText().toString().trim();
+            field.value = Objects.requireNonNull(((TextInputEditText) binding.fieldsContainer.getChildAt(i).findViewById(R.id.value)).getText()).toString().trim();
             fields.put(i, field);
         }
         return fields;
     }
 
+
+    List<String> getFeaturedHashtags() {
+        List<String> featuredHashtags = new ArrayList<>();
+        for (int i = 0; i < binding.featuredHashtagsContainer.getChildCount(); i++) {
+            String name = Objects.requireNonNull(((TextInputEditText) binding.featuredHashtagsContainer.getChildAt(i).findViewById(R.id.name)).getText()).toString().trim();
+            featuredHashtags.add(name);
+        }
+        return featuredHashtags;
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
@@ -316,20 +416,21 @@ public class EditProfileActivity extends BaseBarActivity {
             accountsVM.updateCredentials(BaseMainActivity.currentInstance, BaseMainActivity.currentToken,
                             binding.discoverable.isChecked(),
                             binding.bot.isChecked(),
-                            binding.displayName.getText().toString().trim(),
+                            Objects.requireNonNull(binding.displayName.getText()).toString().trim(),
-                            binding.bio.getText().toString(),
+                            Objects.requireNonNull(binding.bio.getText()).toString(),
                             binding.locked.isChecked(),
                             getPrivacy(),
                             binding.sensitive.isChecked(),
                             null,
-                            getFields()
+                            getFields(),
+                            getFeaturedHashtags()
                     )
                     .observe(EditProfileActivity.this, account -> {
                         if (account != null) {
-                            currentAccount.mastodon_account = account;
+                            Helper.setCurrentAccountMastodonAccount(EditProfileActivity.this, account);
                             new Thread(() -> {
                                 try {
-                                    new app.fedilab.android.mastodon.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount);
+                                    new app.fedilab.android.mastodon.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(Helper.getCurrentAccount(EditProfileActivity.this));
                                     sendBroadCast(account);
                                 } catch (DBException e) {
                                     e.printStackTrace();

app/src/main/java/app/fedilab/android/mastodon/activities/FilterActivity.java

@@ -44,7 +44,6 @@ import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.databinding.ActivityFiltersBinding;
 import app.fedilab.android.databinding.PopupAddFilterBinding;
 import app.fedilab.android.mastodon.client.entities.api.Filter;
-import app.fedilab.android.mastodon.helper.Helper;
 import app.fedilab.android.mastodon.ui.drawer.FilterAdapter;
 import app.fedilab.android.mastodon.ui.drawer.KeywordAdapter;
 import app.fedilab.android.mastodon.viewmodel.mastodon.FiltersVM;
@@ -63,7 +62,7 @@ public class FilterActivity extends BaseBarActivity implements FilterAdapter.Del
      * @param listener - {@link FilterAdapter.FilterAction}
      */
     public static void addEditFilter(Context context, Filter filter, FilterAdapter.FilterAction listener) {
-        AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
+        AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(context);
         PopupAddFilterBinding popupAddFilterBinding = PopupAddFilterBinding.inflate(LayoutInflater.from(context));
         FiltersVM filtersVM = new ViewModelProvider((ViewModelStoreOwner) context).get(FiltersVM.class);
         dialogBuilder.setView(popupAddFilterBinding.getRoot());
@@ -76,27 +75,13 @@ public class FilterActivity extends BaseBarActivity implements FilterAdapter.Del
             @Override
             public void onItemSelected(AdapterView<?> parent1, View view, int position1, long id) {
                 switch (position1) {
-                    case 0:
+                    case 0 -> expire[0] = -1;
-                        expire[0] = -1;
+                    case 1 -> expire[0] = 1800;
-                        break;
+                    case 2 -> expire[0] = 3600;
-                    case 1:
+                    case 3 -> expire[0] = 21600;
-                        expire[0] = 1800;
+                    case 4 -> expire[0] = 43200;
-                        break;
+                    case 5 -> expire[0] = 86400;
-                    case 2:
+                    case 6 -> expire[0] = 604800;
-                        expire[0] = 3600;
-                        break;
-                    case 3:
-                        expire[0] = 21600;
-                        break;
-                    case 4:
-                        expire[0] = 43200;
-                        break;
-                    case 5:
-                        expire[0] = 86400;
-                        break;
-                    case 6:
-                        expire[0] = 604800;
-                        break;
                 }
             }
 
@@ -129,21 +114,12 @@ public class FilterActivity extends BaseBarActivity implements FilterAdapter.Del
             if (filter.context != null) {
                 for (String val : filter.context) {
                     switch (val) {
-                        case "home":
+                        case "home" -> popupAddFilterBinding.contextHome.setChecked(true);
-                            popupAddFilterBinding.contextHome.setChecked(true);
+                        case "public" -> popupAddFilterBinding.contextPublic.setChecked(true);
-                            break;
+                        case "notifications" ->
-                        case "public":
+                                popupAddFilterBinding.contextNotification.setChecked(true);
-                            popupAddFilterBinding.contextPublic.setChecked(true);
+                        case "thread" -> popupAddFilterBinding.contextConversation.setChecked(true);
-                            break;
+                        case "account" -> popupAddFilterBinding.contextProfiles.setChecked(true);
-                        case "notifications":
-                            popupAddFilterBinding.contextNotification.setChecked(true);
-                            break;
-                        case "thread":
-                            popupAddFilterBinding.contextConversation.setChecked(true);
-                            break;
-                        case "account":
-                            popupAddFilterBinding.contextProfiles.setChecked(true);
-                            break;
                     }
                 }
             }
@@ -194,7 +170,7 @@ public class FilterActivity extends BaseBarActivity implements FilterAdapter.Del
                         canBeSent = false;
                     }
                 }
-                if (popupAddFilterBinding.addTitle.getText().toString().trim().isEmpty()) {
+                if (Objects.requireNonNull(popupAddFilterBinding.addTitle.getText()).toString().trim().isEmpty()) {
                     popupAddFilterBinding.addTitle.setError(context.getString(R.string.cannot_be_empty));
                     canBeSent = false;
                 }

app/src/main/java/app/fedilab/android/mastodon/activities/FollowRequestActivity.java

@@ -94,11 +94,8 @@ public class FollowRequestActivity extends BaseActivity {
 
         binding.loadingNextAccounts.setVisibility(View.GONE);
         if (accountList != null && accounts != null && accounts.accounts != null && accounts.accounts.size() > 0) {
-            int startId = 0;
             //There are some statuses present in the timeline
-            if (accountList.size() > 0) {
+            int startId = accountList.size();
-                startId = accountList.size();
-            }
             flagLoading = accounts.pagination.max_id == null;
             accountList.addAll(accounts.accounts);
             max_id = accounts.pagination.max_id;

app/src/main/java/app/fedilab/android/mastodon/activities/FollowedTagActivity.java

@@ -21,6 +21,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentManager;
@@ -31,6 +32,9 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
 
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
@@ -73,6 +77,7 @@ public class FollowedTagActivity extends BaseBarActivity implements FollowedTagA
                 .observe(FollowedTagActivity.this, tags -> {
                     if (tags != null && tags.tags != null && tags.tags.size() > 0) {
                         tagList = new ArrayList<>(tags.tags);
+                        sortAsc(tagList);
                         followedTagAdapter = new FollowedTagAdapter(tagList);
                         followedTagAdapter.actionOnTag = this;
                         binding.notContent.setVisibility(View.GONE);
@@ -82,15 +87,32 @@ public class FollowedTagActivity extends BaseBarActivity implements FollowedTagA
                         binding.notContent.setVisibility(View.VISIBLE);
                     }
                 });
+        getOnBackPressedDispatcher().addCallback(new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                if (canGoBack) {
+                    canGoBack = false;
+                    ThemeHelper.slideViewsToRight(binding.fragmentContainer, binding.recyclerView, () -> {
+                        if (fragmentMastodonTimeline != null) {
+                            fragmentMastodonTimeline.onDestroyView();
+                        }
+                    });
+                    setTitle(R.string.followed_tags);
+                    invalidateOptionsMenu();
+                } else {
+                    finish();
+                }
+            }
+        });
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
-            onBackPressed();
+            getOnBackPressedDispatcher().onBackPressed();
             return true;
         } else if (item.getItemId() == R.id.action_unfollow && tag != null) {
-            AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(FollowedTagActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(FollowedTagActivity.this);
             alt_bld.setTitle(R.string.action_unfollow_tag);
             alt_bld.setMessage(R.string.action_unfollow_tag_confirm);
             alt_bld.setPositiveButton(R.string.unfollow, (dialog, id) -> {
@@ -122,11 +144,16 @@ public class FollowedTagActivity extends BaseBarActivity implements FollowedTagA
             AlertDialog alert = alt_bld.create();
             alert.show();
         } else if (item.getItemId() == R.id.action_follow_tag) {
-            AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(FollowedTagActivity.this, Helper.dialogStyle());
+            AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(FollowedTagActivity.this);
             PopupAddFollowedTagtBinding popupAddFollowedTagtBinding = PopupAddFollowedTagtBinding.inflate(getLayoutInflater());
             dialogBuilder.setView(popupAddFollowedTagtBinding.getRoot());
             popupAddFollowedTagtBinding.addTag.setFilters(new InputFilter[]{new InputFilter.LengthFilter(255)});
             dialogBuilder.setPositiveButton(R.string.validate, (dialog, id) -> {
+                String name = Objects.requireNonNull(popupAddFollowedTagtBinding.addTag.getText()).toString().trim();
+                if (tagList != null && tagList.contains(new Tag(name))) {
+                    Toasty.error(FollowedTagActivity.this, getString(R.string.tag_already_followed), Toasty.LENGTH_LONG).show();
+                    return;
+                }
                 if (popupAddFollowedTagtBinding.addTag.getText() != null && popupAddFollowedTagtBinding.addTag.getText().toString().trim().length() > 0) {
                     tagVM.follow(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, popupAddFollowedTagtBinding.addTag.getText().toString().trim())
                             .observe(FollowedTagActivity.this, newTag -> {
@@ -143,8 +170,10 @@ public class FollowedTagActivity extends BaseBarActivity implements FollowedTagA
                                 if (newTag != null) {
                                     tagList.add(0, newTag);
                                     followedTagAdapter.notifyItemInserted(0);
+                                    sortAsc(tagList);
+                                    followedTagAdapter.notifyItemRangeChanged(0, tagList.size());
                                 } else {
-                                    Toasty.error(FollowedTagActivity.this, getString(R.string.toast_feature_not_supported), Toasty.LENGTH_LONG).show();
+                                    Toasty.error(FollowedTagActivity.this, getString(R.string.not_valid_tag_name), Toasty.LENGTH_LONG).show();
                                 }
                             });
                     dialog.dismiss();
@@ -159,6 +188,9 @@ public class FollowedTagActivity extends BaseBarActivity implements FollowedTagA
         return super.onOptionsItemSelected(item);
     }
 
+    private void sortAsc(List<Tag> tagList) {
+        Collections.sort(tagList, (obj1, obj2) -> obj1.name.compareToIgnoreCase(obj2.name));
+    }
 
     @Override
     public boolean onCreateOptionsMenu(@NonNull Menu menu) {
@@ -170,39 +202,25 @@ public class FollowedTagActivity extends BaseBarActivity implements FollowedTagA
         return true;
     }
 
-    @Override
-    public void onBackPressed() {
-        if (canGoBack) {
-            canGoBack = false;
-            ThemeHelper.slideViewsToRight(binding.fragmentContainer, binding.recyclerView, () -> {
-                if (fragmentMastodonTimeline != null) {
-                    fragmentMastodonTimeline.onDestroyView();
-                }
-            });
-            setTitle(R.string.followed_tags);
-            invalidateOptionsMenu();
-        } else {
-            super.onBackPressed();
-        }
-    }
 
     @Override
     public void click(Tag tag) {
         this.tag = tag;
         canGoBack = true;
+        fragmentMastodonTimeline = new FragmentMastodonTimeline();
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(Helper.ARG_SEARCH_KEYWORD, tag.name);
+        bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.TAG);
+        setTitle(tag.name);
+        fragmentMastodonTimeline.setArguments(bundle);
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        FragmentTransaction fragmentTransaction =
+                fragmentManager.beginTransaction();
+        fragmentTransaction.replace(R.id.fragment_container, fragmentMastodonTimeline);
+        fragmentTransaction.commit();
+        invalidateOptionsMenu();
         ThemeHelper.slideViewsToLeft(binding.recyclerView, binding.fragmentContainer, () -> {
-            fragmentMastodonTimeline = new FragmentMastodonTimeline();
+
-            Bundle bundle = new Bundle();
-            bundle.putSerializable(Helper.ARG_SEARCH_KEYWORD, tag.name);
-            bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.TAG);
-            setTitle(tag.name);
-            fragmentMastodonTimeline.setArguments(bundle);
-            FragmentManager fragmentManager = getSupportFragmentManager();
-            FragmentTransaction fragmentTransaction =
-                    fragmentManager.beginTransaction();
-            fragmentTransaction.replace(R.id.fragment_container, fragmentMastodonTimeline);
-            fragmentTransaction.commit();
-            invalidateOptionsMenu();
         });
     }
 }

app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java

@@ -15,8 +15,6 @@ package app.fedilab.android.mastodon.activities;
  * see <http://www.gnu.org/licenses>. */
 
 
-import static app.fedilab.android.BaseMainActivity.currentAccount;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
@@ -28,7 +26,6 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
@@ -36,11 +33,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import app.fedilab.android.BaseMainActivity;
+import app.fedilab.android.BuildConfig;
 import app.fedilab.android.R;
 import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.databinding.ActivityHashtagBinding;
 import app.fedilab.android.mastodon.client.entities.api.Filter;
 import app.fedilab.android.mastodon.client.entities.api.Status;
+import app.fedilab.android.mastodon.client.entities.app.CachedBundle;
 import app.fedilab.android.mastodon.client.entities.app.Pinned;
 import app.fedilab.android.mastodon.client.entities.app.PinnedTimeline;
 import app.fedilab.android.mastodon.client.entities.app.StatusDraft;
@@ -69,20 +68,31 @@ public class HashTagActivity extends BaseActivity {
     private Filter.KeywordsAttributes keyword;
     private PinnedTimeline pinnedTimeline;
     private Pinned pinned;
+    private ActivityHashtagBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        ActivityHashtagBinding binding = ActivityHashtagBinding.inflate(getLayoutInflater());
+        binding = ActivityHashtagBinding.inflate(getLayoutInflater());
-
         setContentView(binding.getRoot());
-        Bundle b = getIntent().getExtras();
+        Bundle args = getIntent().getExtras();
-        if (b != null) {
+        if (args != null) {
-            tag = b.getString(Helper.ARG_SEARCH_KEYWORD, null);
+            long bundleId = args.getLong(Helper.ARG_INTENT_ID, -1);
+            new CachedBundle(HashTagActivity.this).getBundle(bundleId, Helper.getCurrentAccount(HashTagActivity.this), this::initializeAfterBundle);
+        } else {
+            initializeAfterBundle(null);
         }
-        if (tag == null)
+    }
+
+    private void initializeAfterBundle(Bundle bundle) {
+        if (bundle != null) {
+            tag = bundle.getString(Helper.ARG_SEARCH_KEYWORD, null);
+        }
+        if (tag == null) {
             finish();
+            return;
+        }
         pinnedTag = null;
         followedTag = null;
         mutedTag = null;
@@ -146,10 +156,10 @@ public class HashTagActivity extends BaseActivity {
             invalidateOptionsMenu();
         }
 
-        Bundle bundle = new Bundle();
+        Bundle bundleFragment = new Bundle();
-        bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.TAG);
+        bundleFragment.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.TAG);
-        bundle.putString(Helper.ARG_SEARCH_KEYWORD, tag);
+        bundleFragment.putString(Helper.ARG_SEARCH_KEYWORD, tag);
-        Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_tags, new FragmentMastodonTimeline(), bundle, null, null);
+        Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_tags, new FragmentMastodonTimeline(), bundleFragment, null, null);
         binding.compose.setOnClickListener(v -> {
             Intent intentToot = new Intent(HashTagActivity.this, ComposeActivity.class);
             StatusDraft statusDraft = new StatusDraft();
@@ -158,10 +168,14 @@ public class HashTagActivity extends BaseActivity {
             List<Status> statuses = new ArrayList<>();
             statuses.add(status);
             statusDraft.statusDraftList = statuses;
-            Bundle _b = new Bundle();
+            Bundle args = new Bundle();
-            _b.putSerializable(Helper.ARG_STATUS_DRAFT, statusDraft);
+            args.putSerializable(Helper.ARG_STATUS_DRAFT, statusDraft);
-            intentToot.putExtras(_b);
+            new CachedBundle(HashTagActivity.this).insertBundle(args, Helper.getCurrentAccount(HashTagActivity.this), bundleId -> {
-            startActivity(intentToot);
+                Bundle bundleCached = new Bundle();
+                bundleCached.putLong(Helper.ARG_INTENT_ID, bundleId);
+                intentToot.putExtras(bundleCached);
+                startActivity(intentToot);
+            });
         });
     }
 
@@ -173,7 +187,7 @@ public class HashTagActivity extends BaseActivity {
         } else if (item.getItemId() == R.id.action_add_timeline) {
 
             if (pinnedTag) {
-                AlertDialog.Builder unpinConfirm = new MaterialAlertDialogBuilder(HashTagActivity.this, Helper.dialogStyle());
+                AlertDialog.Builder unpinConfirm = new MaterialAlertDialogBuilder(HashTagActivity.this);
                 unpinConfirm.setMessage(getString(R.string.unpin_timeline_description));
                 unpinConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
                 unpinConfirm.setPositiveButton(R.string.yes, (dialog, which) -> {
@@ -188,18 +202,24 @@ public class HashTagActivity extends BaseActivity {
                     }
                     pinnedTag = false;
                     invalidateOptionsMenu();
-                    Bundle b = new Bundle();
+                    Bundle args = new Bundle();
-                    b.putBoolean(Helper.RECEIVE_REDRAW_TOPBAR, true);
+                    args.putBoolean(Helper.RECEIVE_REDRAW_TOPBAR, true);
                     Intent intentBD = new Intent(Helper.BROADCAST_DATA);
-                    intentBD.putExtras(b);
+                    new CachedBundle(HashTagActivity.this).insertBundle(args, Helper.getCurrentAccount(HashTagActivity.this), bundleId -> {
-                    LocalBroadcastManager.getInstance(HashTagActivity.this).sendBroadcast(intentBD);
+                        Bundle bundle = new Bundle();
-                    dialog.dismiss();
+                        bundle.putLong(Helper.ARG_INTENT_ID, bundleId);
+                        intentBD.putExtras(bundle);
+                        intentBD.setPackage(BuildConfig.APPLICATION_ID);
+                        sendBroadcast(intentBD);
+                        dialog.dismiss();
+                    });
+
                 });
                 unpinConfirm.show();
             } else {
                 new Thread(() -> {
                     try {
-                        Pinned pinned = new Pinned(HashTagActivity.this).getPinned(currentAccount);
+                        Pinned pinned = new Pinned(HashTagActivity.this).getPinned(Helper.getCurrentAccount(HashTagActivity.this));
                         boolean canBeAdded = true;
                         boolean update = true;
                         if (pinned == null) {
@@ -233,16 +253,25 @@ public class HashTagActivity extends BaseActivity {
                         tagTimeline.any.add(stripTag.trim());
                         pinnedTimeline.tagTimeline = tagTimeline;
                         pinned.pinnedTimelines.add(pinnedTimeline);
+                        if (pinned.instance == null || pinned.user_id == null) {
+                            pinned.instance = MainActivity.currentInstance;
+                            pinned.user_id = MainActivity.currentUserID;
+                        }
                         if (update) {
                             new Pinned(HashTagActivity.this).updatePinned(pinned);
                         } else {
                             new Pinned(HashTagActivity.this).insertPinned(pinned);
                         }
-                        Bundle b = new Bundle();
+                        Bundle args = new Bundle();
-                        b.putBoolean(Helper.RECEIVE_REDRAW_TOPBAR, true);
+                        args.putBoolean(Helper.RECEIVE_REDRAW_TOPBAR, true);
                         Intent intentBD = new Intent(Helper.BROADCAST_DATA);
-                        intentBD.putExtras(b);
+                        new CachedBundle(HashTagActivity.this).insertBundle(args, Helper.getCurrentAccount(HashTagActivity.this), bundleId -> {
-                        LocalBroadcastManager.getInstance(HashTagActivity.this).sendBroadcast(intentBD);
+                            Bundle bundle = new Bundle();
+                            bundle.putLong(Helper.ARG_INTENT_ID, bundleId);
+                            intentBD.putExtras(bundle);
+                            intentBD.setPackage(BuildConfig.APPLICATION_ID);
+                            sendBroadcast(intentBD);
+                        });
                         pinnedTag = true;
                         invalidateOptionsMenu();
                     } catch (DBException e) {
@@ -351,7 +380,7 @@ public class HashTagActivity extends BaseActivity {
                 pin.setIcon(R.drawable.tag_pin_off);
                 pin.setTitle(getString(R.string.unpin_tag));
             } else {
-                pin.setTitle(getString(R.string.unpin_tag));
+                pin.setTitle(getString(R.string.pin_tag));
                 pin.setIcon(R.drawable.tag_pin);
             }
         } else {

app/src/main/java/app/fedilab/android/mastodon/activities/InstanceActivity.java

@@ -37,6 +37,8 @@ import androidx.preference.PreferenceManager;
 import com.bumptech.glide.Glide;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
+import java.util.Objects;
+
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
 import app.fedilab.android.activities.MainActivity;
@@ -50,7 +52,6 @@ import app.fedilab.android.mastodon.viewmodel.mastodon.InstancesVM;
 public class InstanceActivity extends DialogFragment {
 
     ActivityInstanceBinding binding;
-    private boolean applyMaxChar = false;
 
     @NonNull
     @Override
@@ -78,19 +79,23 @@ public class InstanceActivity extends DialogFragment {
 
         binding.about.setOnClickListener(v -> Helper.openBrowser(requireActivity(), "https://" + MainActivity.currentInstance + "/about"));
         binding.privacy.setOnClickListener(v -> Helper.openBrowser(requireActivity(), "https://" + MainActivity.currentInstance + "/privacy-policy"));
+        int maxCharCustom = sharedpreferences.getInt(getString(R.string.SET_MAX_INSTANCE_CHAR) + MainActivity.currentInstance, -1);
+        if (maxCharCustom != -1) {
+            binding.maxChar.setText(String.valueOf(maxCharCustom));
+        }
         binding.close.setOnClickListener(view -> {
-            if (applyMaxChar) {
+                    String max_char = Objects.requireNonNull(binding.maxChar.getText()).toString();
-                String max_char = binding.maxChar.getText().toString();
+                    SharedPreferences.Editor editor = sharedpreferences.edit();
-
+                    if (!max_char.isEmpty()) {
-                SharedPreferences.Editor editor = sharedpreferences.edit();
+                        try {
-                if (!max_char.isEmpty()) {
+                            editor.putInt(getString(R.string.SET_MAX_INSTANCE_CHAR) + MainActivity.currentInstance, Integer.parseInt(max_char));
-                    try {
+                            editor.apply();
-                        editor.putInt(getString(R.string.SET_MAX_INSTANCE_CHAR) + MainActivity.currentInstance, Integer.parseInt(max_char));
+                        } catch (Exception ignored) {
+                        }
+                    } else {
+                        editor.putInt(getString(R.string.SET_MAX_INSTANCE_CHAR) + MainActivity.currentInstance, -1);
                         editor.apply();
-                    } catch (Exception ignored) {
                     }
-                }
-            }
                     requireDialog().dismiss();
                 }
 
@@ -107,8 +112,6 @@ public class InstanceActivity extends DialogFragment {
                 if (val != -1) {
                     binding.maxChar.setText(String.valueOf(val));
                 }
-                applyMaxChar = true;
-
             } else {
                 Instance instance = instanceInfo.info;