Prototype multicomm

Signed-off-by: Balazs Toldi <balazs@toldi.eu>

README.md

@@ -72,9 +72,9 @@ Don't forget to give the project a star! Thanks again!
 
 ### Translation
 
-You can alos help Eternity by translating it to your native langugage! Translations are done via [Weblate](https://translate.codeberg.org/projects/Eternity/app/)!
+You can alos help Eternity by translating it to your native langugage! Translations are done via [Weblate](https://translate.codeberg.org/projects/infinity-for-lemmy/app/)!
 
-[![Translation](https://translate.codeberg.org/widgets/Eternity/-/app/multi-auto.svg)](https://translate.codeberg.org/engage/Eternity/)
+[![Translation](https://translate.codeberg.org/widgets/infinity-for-lemmy/-/app/multi-auto.svg)](https://translate.codeberg.org/engage/Eternity/)
 
 ### Reporting bugs
 

app/build.gradle

@@ -196,6 +196,7 @@ dependencies {
     def glideVersion = "4.12.0"
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
+    implementation "com.github.bumptech.glide:okhttp-integration:$glideVersion"
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
     implementation 'com.github.santalu:aspect-ratio-imageview:1.0.9'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.23'

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

@@ -113,7 +113,7 @@ import eu.toldi.infinityforlemmy.settings.TranslationFragment;
 import eu.toldi.infinityforlemmy.settings.VideoPreferenceFragment;
 
 @Singleton
-@Component(modules = {AppModule.class, NetworkModule.class})
+@Component(modules = {AppModule.class, NetworkModule.class, PostEnricherModule.class})
 public interface AppComponent {
     void inject(MainActivity mainActivity);
 

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

@@ -1,7 +1,5 @@
 package eu.toldi.infinityforlemmy;
 
-import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Handler;
 
 import org.json.JSONException;
@@ -12,9 +10,7 @@ import java.util.concurrent.Executor;
 
 import eu.toldi.infinityforlemmy.apis.GfycatAPI;
 import eu.toldi.infinityforlemmy.apis.RedgifsAPI;
-import eu.toldi.infinityforlemmy.utils.APIUtils;
 import eu.toldi.infinityforlemmy.utils.JSONUtils;
-import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import retrofit2.Call;
 import retrofit2.Response;
 import retrofit2.Retrofit;
@@ -44,14 +40,12 @@ public class FetchGfycatOrRedgifsVideoLinks {
         });
     }
 
-    public static void fetchRedgifsVideoLinks(Context context, Executor executor, Handler handler, Retrofit redgifsRetrofit,
-                                              SharedPreferences currentAccountSharedPreferences,
+    public static void fetchRedgifsVideoLinks(Executor executor, Handler handler, Retrofit redgifsRetrofit,
                                               String gfycatId,
                                               FetchGfycatOrRedgifsVideoLinksListener fetchGfycatOrRedgifsVideoLinksListener) {
         executor.execute(() -> {
             try {
-                Response<String> response = redgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(APIUtils.getRedgifsOAuthHeader(currentAccountSharedPreferences.getString(SharedPreferencesUtils.REDGIFS_ACCESS_TOKEN, "")),
-                         gfycatId, APIUtils.USER_AGENT).execute();
+                Response<String> response = redgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(gfycatId).execute();
                 if (response.isSuccessful()) {
                     parseRedgifsVideoLinks(handler, response.body(), fetchGfycatOrRedgifsVideoLinksListener);
                 } else {

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

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

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

@@ -9,6 +9,7 @@ import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
+import eu.toldi.infinityforlemmy.apis.RedgifsAPI;
 import eu.toldi.infinityforlemmy.apis.StreamableAPI;
 import eu.toldi.infinityforlemmy.comment.LemmyCommentAPI;
 import eu.toldi.infinityforlemmy.post.LemmyPostAPI;
@@ -37,7 +38,8 @@ abstract class NetworkModule {
     @Provides
     @Named("glide")
     @Singleton
-    static OkHttpClient provideGlideOkHttp(@Named("base") OkHttpClient baseOkHttp) {
+    static OkHttpClient provideGlideOkHttp(@Named("base") OkHttpClient baseOkHttp,
+                                           @Named("RedgifsAccessTokenAuthenticator") Interceptor redGifsAuthenticator) {
         return baseOkHttp.newBuilder()
                 .addInterceptor(chain -> chain.proceed(
                         chain.request()
@@ -45,6 +47,7 @@ abstract class NetworkModule {
                                 .header("User-Agent", APIUtils.USER_AGENT)
                                 .build()
                 ))
+                .addInterceptor(redGifsAuthenticator)
                 .build();
     }
 
@@ -178,6 +181,12 @@ abstract class NetworkModule {
                 .build();
     }
 
+    @Provides
+    @Singleton
+    static RedgifsAPI provideRedgifsAPI(@Named("redgifs") Retrofit redgifsRetrofit) {
+        return redgifsRetrofit.create(RedgifsAPI.class);
+    }
+
     @Provides
     @Named("imgur")
     @Singleton

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

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

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

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

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

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

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

@@ -69,15 +69,15 @@ public class SortType {
     }
 
     public enum Time {
-        HOUR("TopHour", "Top Hour"),
-        SIX_HOURS("TopSixHour", "Top Six Hours"),
-        TWELVE_HOURS("TopTwelveHour", "Top Twelve Hours"),
+        HOUR("hour", "Hour"),
+        SIX_HOURS("SixHour", "Six Hours"),
+        TWELVE_HOURS("TwelveHour", "Twelve Hours"),
         DAY("day", "Day"),
         WEEK("week", "Week"),
         MONTH("month", "Month"),
-        THREE_MONTHS("TopThreeMonth", "Top Three Months"),
-        SIX_MONTHS("TopSixMonth", "Top Six Months"),
-        NINE_MONTHS("TopNineMonth", "Top Nine Months"),
+        THREE_MONTHS("ThreeMonths", "Three Months"),
+        SIX_MONTHS("SixMonths", "Six Months"),
+        NINE_MONTHS("NineMonths", "Nine Months"),
         YEAR("year", "Year"),
         ALL("all", "All Time");
 
@@ -88,5 +88,14 @@ public class SortType {
             this.value = value;
             this.fullName = fullName;
         }
+
+        public static Time fromValue(String value) {
+            for (Time time : values()) {
+                if (time.value.equalsIgnoreCase(value)) {
+                    return time;
+                }
+            }
+            return null;
+        }
     }
 }

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

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

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

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

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

@@ -40,7 +40,6 @@ import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
 import eu.toldi.infinityforlemmy.multireddit.EditMultiReddit;
 import eu.toldi.infinityforlemmy.multireddit.FetchMultiRedditInfo;
 import eu.toldi.infinityforlemmy.multireddit.MultiReddit;
-import eu.toldi.infinityforlemmy.multireddit.MultiRedditJSONModel;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
 import retrofit2.Retrofit;
@@ -191,7 +190,7 @@ public class EditMultiRedditActivity extends BaseActivity {
         selectSubredditTextView.setOnClickListener(view -> {
             Intent intent = new Intent(EditMultiRedditActivity.this, SelectedSubredditsAndUsersActivity.class);
             if (multiReddit.getSubreddits() != null) {
-                intent.putStringArrayListExtra(SelectedSubredditsAndUsersActivity.EXTRA_SELECTED_SUBREDDITS, multiReddit.getSubreddits());
+                intent.putParcelableArrayListExtra(SelectedSubredditsAndUsersActivity.EXTRA_SELECTED_SUBREDDITS, multiReddit.getSubreddits());
             }
             startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE);
         });
@@ -234,7 +233,7 @@ public class EditMultiRedditActivity extends BaseActivity {
                             }
                         });
             } else {
-                String jsonModel = new MultiRedditJSONModel(nameEditText.getText().toString(), descriptionEditText.getText().toString(),
+                /*String jsonModel = new MultiRedditJSONModel(nameEditText.getText().toString(), descriptionEditText.getText().toString(),
                         visibilitySwitch.isChecked(), multiReddit.getSubreddits()).createJSONModel();
                 EditMultiReddit.editMultiReddit(mRetrofit, mAccessToken, multiReddit.getPath(),
                         jsonModel, new EditMultiReddit.EditMultiRedditListener() {
@@ -247,7 +246,7 @@ public class EditMultiRedditActivity extends BaseActivity {
                             public void failed() {
                                 Snackbar.make(coordinatorLayout, R.string.edit_multi_reddit_failed, Snackbar.LENGTH_SHORT).show();
                             }
-                        });
+                        });*/
             }
             return true;
         }
@@ -259,7 +258,7 @@ public class EditMultiRedditActivity extends BaseActivity {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == SUBREDDIT_SELECTION_REQUEST_CODE && resultCode == RESULT_OK) {
             if (data != null) {
-                multiReddit.setSubreddits(data.getStringArrayListExtra(
+                multiReddit.setSubreddits(data.getParcelableArrayListExtra(
                         SelectedSubredditsAndUsersActivity.EXTRA_RETURN_SELECTED_SUBREDDITS));
             }
         }

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

@@ -36,6 +36,7 @@ import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.post.FetchPost;
 import eu.toldi.infinityforlemmy.post.ObjectResolver;
 import eu.toldi.infinityforlemmy.post.Post;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.utils.LemmyUtils;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 
@@ -83,6 +84,9 @@ public class LinkResolverActivity extends AppCompatActivity {
     @Inject
     Executor mExecutor;
 
+    @Inject
+    PostEnricher postEnricher;
+
     private String mAccessToken;
 
     private Uri getRedditUriByPath(String path) {
@@ -102,6 +106,9 @@ public class LinkResolverActivity extends AppCompatActivity {
         if (mAccessToken != null) {
             String instance = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_INSTANCE, null);
             mRetrofit.setBaseURL(instance);
+            if (mCurrentAccountSharedPreferences.getBoolean(SharedPreferencesUtils.BEARER_TOKEN_AUTH, true)) {
+                mRetrofit.setAccessToken(mAccessToken);
+            }
         }
 
         Uri uri = getIntent().getData();
@@ -214,7 +221,7 @@ public class LinkResolverActivity extends AppCompatActivity {
                                     URL baseURL = new URL(mRetrofit.getBaseURL());
                                     if (baseURL.getHost().equalsIgnoreCase(uri.getHost())) {
                                         local = true;
-                                        FetchPost.fetchPost(mExecutor, new Handler(), mRetrofit.getRetrofit(), segments.get(segments.size() - 1), mAccessToken, new FetchPost.FetchPostListener() {
+                                        FetchPost.fetchPost(mExecutor, new Handler(), mRetrofit.getRetrofit(), segments.get(segments.size() - 1), mAccessToken, postEnricher, new FetchPost.FetchPostListener() {
                                             @Override
                                             public void fetchPostSuccess(Post post) {
 

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

@@ -8,7 +8,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.text.Editable;
 import android.util.Log;
-import android.util.Patterns;
 import android.view.InflateException;
 import android.view.MenuItem;
 import android.widget.Button;
@@ -180,6 +179,7 @@ public class LoginActivity extends BaseActivity {
                         try {
                             JSONObject responseJSON = new JSONObject(accountResponse);
                             String accessToken = responseJSON.getString("jwt");
+                            mRetrofit.setAccessToken(null);
 
                             FetchMyInfo.fetchAccountInfo(mRetrofit.getRetrofit(), mRedditDataRoomDatabase, username,
                                     accessToken, new FetchMyInfo.FetchMyInfoListener() {
@@ -189,13 +189,23 @@ public class LoginActivity extends BaseActivity {
                                                 @Override
                                                 public void onFetchSiteInfoSuccess(SiteInfo siteInfo) {
                                                     boolean canDownvote = siteInfo.isEnable_downvotes();
-                                                    ParseAndInsertNewAccount.parseAndInsertNewAccount(mExecutor, new Handler(), name,display_name, accessToken,  profileImageUrl, bannerImageUrl, authCode, finalInstance,canDownvote, mRedditDataRoomDatabase.accountDao(),
+                                                    ParseAndInsertNewAccount.parseAndInsertNewAccount(mExecutor, new Handler(), name, display_name, accessToken, profileImageUrl, bannerImageUrl, authCode, finalInstance, canDownvote, mRedditDataRoomDatabase.accountDao(),
                                                             () -> {
                                                                 Intent resultIntent = new Intent();
                                                                 setResult(Activity.RESULT_OK, resultIntent);
                                                                 finish();
                                                             });
                                                     mCurrentAccountSharedPreferences.edit().putBoolean(SharedPreferencesUtils.CAN_DOWNVOTE, canDownvote).apply();
+                                                    String[] version = siteInfo.getVersion().split("\\.");
+                                                    if (version.length > 0) {
+                                                        Log.d("SwitchAccount", "Lemmy Version: " + version[0] + "." + version[1]);
+                                                        int majorVersion = Integer.parseInt(version[0]);
+                                                        int minorVersion = Integer.parseInt(version[1]);
+                                                        if (majorVersion > 0 || (majorVersion == 0 && minorVersion >= 19)) {
+                                                            mRetrofit.setAccessToken(accessToken);
+                                                            mCurrentAccountSharedPreferences.edit().putBoolean(SharedPreferencesUtils.BEARER_TOKEN_AUTH, true).apply();
+                                                        }
+                                                    }
                                                 }
 
                                                 @Override

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

@@ -336,11 +336,14 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
         fragmentManager = getSupportFragmentManager();
 
         mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
+        if (mCurrentAccountSharedPreferences.getBoolean(SharedPreferencesUtils.BEARER_TOKEN_AUTH, true)) {
+            mRetrofit.setAccessToken(mAccessToken);
+        }
 
         mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
         mAccountQualifiedName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, null);
         String instance = (mAccessToken == null) ? mSharedPreferences.getString(SharedPreferencesUtils.ANONYMOUS_ACCOUNT_INSTANCE, APIUtils.API_BASE_URI) : mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_INSTANCE, null);
-        if(instance != null) {
+        if (instance != null) {
             mRetrofit.setBaseURL(instance);
         }
 
@@ -1511,7 +1514,12 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
             if (i == EditorInfo.IME_ACTION_DONE) {
                 Utils.hideKeyboard(this);
                 Intent subredditIntent = new Intent(this, ViewSubredditDetailActivity.class);
-                subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, thingEditText.getText().toString());
+                String communityName = thingEditText.getText().toString();
+                if (communityName.startsWith("!")) {
+                    communityName = communityName.substring(1);
+                }
+                subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, communityName);
+
                 startActivity(subredditIntent);
                 return true;
             }
@@ -1569,7 +1577,11 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                         -> {
                     Utils.hideKeyboard(this);
                     Intent subredditIntent = new Intent(this, ViewSubredditDetailActivity.class);
-                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, thingEditText.getText().toString());
+                    String communityName = thingEditText.getText().toString();
+                    if (communityName.startsWith("!")) {
+                        communityName = communityName.substring(1);
+                    }
+                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, communityName);
                     startActivity(subredditIntent);
                 })
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) -> {
@@ -1590,7 +1602,11 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
             if (i == EditorInfo.IME_ACTION_DONE) {
                 Utils.hideKeyboard(this);
                 Intent userIntent = new Intent(this, ViewUserDetailActivity.class);
-                userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, thingEditText.getText().toString());
+                String qualifiedName = thingEditText.getText().toString();
+                if (qualifiedName.startsWith("@")) {
+                    qualifiedName = qualifiedName.substring(1);
+                }
+                userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, qualifiedName);
                 startActivity(userIntent);
                 return true;
             }
@@ -1603,7 +1619,11 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                         -> {
                     Utils.hideKeyboard(this);
                     Intent userIntent = new Intent(this, ViewUserDetailActivity.class);
-                    userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, thingEditText.getText().toString());
+                    String qualifiedName = thingEditText.getText().toString();
+                    if (qualifiedName.startsWith("@")) {
+                        qualifiedName = qualifiedName.substring(1);
+                    }
+                    userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, qualifiedName);
                     startActivity(userIntent);
                 })
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) -> {

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

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

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

@@ -52,8 +52,10 @@ import eu.toldi.infinityforlemmy.recentsearchquery.RecentSearchQuery;
 import eu.toldi.infinityforlemmy.recentsearchquery.RecentSearchQueryViewModel;
 import eu.toldi.infinityforlemmy.subreddit.ParseSubredditData;
 import eu.toldi.infinityforlemmy.subreddit.SubredditData;
+import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 import eu.toldi.infinityforlemmy.subscribedsubreddit.SubscribedSubredditData;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
+import eu.toldi.infinityforlemmy.utils.LemmyUtils;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import eu.toldi.infinityforlemmy.utils.Utils;
 import retrofit2.Call;
@@ -182,9 +184,9 @@ public class SearchActivity extends BaseActivity {
             if (searchOnlySubreddits) {
                 Intent returnIntent = new Intent();
                 if (getIntent().getBooleanExtra(EXTRA_IS_MULTI_SELECTION, false)) {
-                    ArrayList<String> subredditNameList = new ArrayList<>();
-                    subredditNameList.add(subredditData.getName());
-                    returnIntent.putStringArrayListExtra(RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES, subredditNameList);
+                    ArrayList<SubredditWithSelection> subredditNameList = new ArrayList<>();
+                    subredditNameList.add(new SubredditWithSelection(subredditData.getName(), subredditData.getIconUrl(), LemmyUtils.actorID2FullName(subredditData.getActorId())));
+                    returnIntent.putParcelableArrayListExtra(RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES, subredditNameList);
                 } else {
                     returnIntent.putExtra(EXTRA_RETURN_SUBREDDIT_NAME, new SubscribedSubredditData(subredditData));
                     returnIntent.putExtra(EXTRA_RETURN_SUBREDDIT_ICON_URL, subredditData.getIconUrl());

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

@@ -18,7 +18,6 @@ import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.util.ArrayList;
-import java.util.Collections;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -33,6 +32,7 @@ import eu.toldi.infinityforlemmy.bottomsheetfragments.SelectSubredditsOrUsersOpt
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.customviews.LinearLayoutManagerBugFixed;
 import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
+import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 
 public class SelectedSubredditsAndUsersActivity extends BaseActivity implements ActivityToolbarInterface {
@@ -62,7 +62,7 @@ public class SelectedSubredditsAndUsersActivity extends BaseActivity implements
     CustomThemeWrapper mCustomThemeWrapper;
     private LinearLayoutManagerBugFixed linearLayoutManager;
     private SelectedSubredditsRecyclerViewAdapter adapter;
-    private ArrayList<String> subreddits;
+    private ArrayList<SubredditWithSelection> subreddits;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -86,12 +86,11 @@ public class SelectedSubredditsAndUsersActivity extends BaseActivity implements
         setToolbarGoToTop(toolbar);
 
         if (savedInstanceState != null) {
-            subreddits = savedInstanceState.getStringArrayList(SELECTED_SUBREDDITS_STATE);
+            subreddits = savedInstanceState.getParcelableArrayList(SELECTED_SUBREDDITS_STATE);
         } else {
-            subreddits = getIntent().getStringArrayListExtra(EXTRA_SELECTED_SUBREDDITS);
+            subreddits = getIntent().getParcelableArrayListExtra(EXTRA_SELECTED_SUBREDDITS);
         }
 
-        Collections.sort(subreddits);
 
         adapter = new SelectedSubredditsRecyclerViewAdapter(this, mCustomThemeWrapper, subreddits);
         linearLayoutManager = new LinearLayoutManagerBugFixed(this);
@@ -158,7 +157,7 @@ public class SelectedSubredditsAndUsersActivity extends BaseActivity implements
                     if (subreddits == null) {
                         subreddits = new ArrayList<>();
                     }
-                    subreddits = data.getStringArrayListExtra(SubredditMultiselectionActivity.EXTRA_RETURN_SELECTED_SUBREDDITS);
+                    subreddits = data.getParcelableArrayListExtra(SubredditMultiselectionActivity.EXTRA_RETURN_SELECTED_SUBREDDITS);
                     adapter.addSubreddits(subreddits);
                 }
             } else if (requestCode == USER_SELECTION_REQUEST_CODE) {
@@ -176,7 +175,7 @@ public class SelectedSubredditsAndUsersActivity extends BaseActivity implements
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
         if (adapter != null) {
-            outState.putStringArrayList(SELECTED_SUBREDDITS_STATE, adapter.getSubreddits());
+            outState.putParcelableArrayList(SELECTED_SUBREDDITS_STATE, adapter.getSubreddits());
         }
     }
 

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

@@ -37,13 +37,14 @@ import eu.toldi.infinityforlemmy.ActivityToolbarInterface;
 import eu.toldi.infinityforlemmy.Infinity;
 import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
+import eu.toldi.infinityforlemmy.RetrofitHolder;
 import eu.toldi.infinityforlemmy.adapters.SubredditMultiselectionRecyclerViewAdapter;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.customviews.LinearLayoutManagerBugFixed;
 import eu.toldi.infinityforlemmy.customviews.slidr.Slidr;
+import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 import eu.toldi.infinityforlemmy.subscribedsubreddit.SubscribedSubredditViewModel;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
-import retrofit2.Retrofit;
 
 public class SubredditMultiselectionActivity extends BaseActivity implements ActivityToolbarInterface {
 
@@ -70,8 +71,8 @@ public class SubredditMultiselectionActivity extends BaseActivity implements Act
     @BindView(R.id.error_text_view_subscribed_subreddits_multiselection_activity)
     TextView mErrorTextView;
     @Inject
-    @Named("oauth")
-    Retrofit mOauthRetrofit;
+    @Named("no_oauth")
+    RetrofitHolder mRetrofit;
     @Inject
     RedditDataRoomDatabase mRedditDataRoomDatabase;
     @Inject
@@ -131,7 +132,7 @@ public class SubredditMultiselectionActivity extends BaseActivity implements Act
 
         mSwipeRefreshLayout.setEnabled(false);
 
-        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, "-");
+        mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, "-");
 
         bindView();
     }
@@ -177,7 +178,7 @@ public class SubredditMultiselectionActivity extends BaseActivity implements Act
         } else if (itemId == R.id.action_save_subreddit_multiselection_activity) {
             if (mAdapter != null) {
                 Intent returnIntent = new Intent();
-                returnIntent.putStringArrayListExtra(EXTRA_RETURN_SELECTED_SUBREDDITS,
+                returnIntent.putExtra(EXTRA_RETURN_SELECTED_SUBREDDITS,
                         mAdapter.getAllSelectedSubreddits());
                 setResult(RESULT_OK, returnIntent);
             }
@@ -198,12 +199,12 @@ public class SubredditMultiselectionActivity extends BaseActivity implements Act
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == SUBREDDIT_SEARCH_REQUEST_CODE && resultCode == RESULT_OK && data != null && mAdapter != null) {
             Intent returnIntent = new Intent();
-            ArrayList<String> selectedSubreddits = mAdapter.getAllSelectedSubreddits();
-            ArrayList<String> searchedSubreddits = data.getStringArrayListExtra(SearchActivity.RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES);
+            ArrayList<SubredditWithSelection> selectedSubreddits = mAdapter.getAllSelectedSubreddits();
+            ArrayList<SubredditWithSelection> searchedSubreddits = data.getParcelableArrayListExtra(SearchActivity.RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES);
             if (searchedSubreddits != null) {
                 selectedSubreddits.addAll(searchedSubreddits);
             }
-            returnIntent.putStringArrayListExtra(EXTRA_RETURN_SELECTED_SUBREDDITS, selectedSubreddits);
+            returnIntent.putParcelableArrayListExtra(EXTRA_RETURN_SELECTED_SUBREDDITS, selectedSubreddits);
             setResult(RESULT_OK, returnIntent);
             finish();
         }

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

@@ -233,7 +233,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
         sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
         viewPager.setAdapter(sectionsPagerAdapter);
         viewPager.setOffscreenPageLimit(1);
-        if (viewPager.getCurrentItem() != 2) {
+        if (viewPager.getCurrentItem() != 1) {
             fab.hide();
         }
         viewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
@@ -244,7 +244,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
                     fab.hide();
                 } else {
                     lockSwipeRightToGoBack();
-                    if (position != 2) {
+                    if (position != 1) {
                         fab.hide();
                     } else {
                         fab.show();
@@ -476,7 +476,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
         @Override
         public Fragment getItem(int position) {
             switch (position) {
-                default:
+
                 case 0: {
                     SubscribedSubredditsListingFragment fragment = new SubscribedSubredditsListingFragment();
                     Bundle bundle = new Bundle();
@@ -487,12 +487,20 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
                     fragment.setArguments(bundle);
                     return fragment;
                 }
+                default: {
+                    MultiRedditListingFragment fragment = new MultiRedditListingFragment();
+                    Bundle bundle = new Bundle();
+                    bundle.putString(MultiRedditListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken);
+                    bundle.putString(MultiRedditListingFragment.EXTRA_ACCOUNT_NAME, mAccountName == null ? "-" : mAccountQualifiedName);
+                    fragment.setArguments(bundle);
+                    return fragment;
+                }
             }
         }
 
         @Override
         public int getCount() {
-            return 1;
+            return 2;
         }
 
         @Override
@@ -501,8 +509,6 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
                 case 0:
                     return Utils.getTabTextWithCustomFont(typeface, getString(R.string.communities));
                 case 1:
-                    return Utils.getTabTextWithCustomFont(typeface, getString(R.string.users));
-                case 2:
                     return Utils.getTabTextWithCustomFont(typeface, getString(R.string.multi_reddits));
             }
 
@@ -515,8 +521,6 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
             Fragment fragment = (Fragment) super.instantiateItem(container, position);
             if (position == 0) {
                 subscribedSubredditsListingFragment = (SubscribedSubredditsListingFragment) fragment;
-            } else if (position == 1) {
-                followedUsersListingFragment = (FollowedUsersListingFragment) fragment;
             } else {
                 multiRedditListingFragment = (MultiRedditListingFragment) fragment;
             }

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

@@ -67,6 +67,7 @@ import eu.toldi.infinityforlemmy.SaveComment;
 import eu.toldi.infinityforlemmy.SaveThing;
 import eu.toldi.infinityforlemmy.SortType;
 import eu.toldi.infinityforlemmy.SortTypeSelectionCallback;
+import eu.toldi.infinityforlemmy.apis.LemmyAPI;
 import eu.toldi.infinityforlemmy.apis.RedditAPI;
 import eu.toldi.infinityforlemmy.asynctasks.SwitchAccount;
 import eu.toldi.infinityforlemmy.comment.Comment;
@@ -81,6 +82,7 @@ import eu.toldi.infinityforlemmy.post.HistoryPostPagingSource;
 import eu.toldi.infinityforlemmy.post.ParsePost;
 import eu.toldi.infinityforlemmy.post.Post;
 import eu.toldi.infinityforlemmy.post.PostPagingSource;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.postfilter.PostFilter;
 import eu.toldi.infinityforlemmy.readpost.ReadPost;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
@@ -151,6 +153,8 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
     @Inject
     @Named("glide")
     OkHttpClient okHttpClient;
+    @Inject
+    PostEnricher postEnricher;
     @State
     ArrayList<Post> posts;
     @State
@@ -530,69 +534,38 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
         Handler handler = new Handler(Looper.getMainLooper());
 
         if (postType != HistoryPostPagingSource.TYPE_READ_POSTS) {
+            int nextPage = posts.size() / 25 + 1;
+
             mExecutor.execute(() -> {
-                RedditAPI api = (mAccessToken == null ? mRetrofit.getRetrofit() : mOauthRetrofit).create(RedditAPI.class);
+                LemmyAPI api = mRetrofit.getRetrofit().create(LemmyAPI.class);
                 Call<String> call;
-                String afterKey = posts.isEmpty() ? null : posts.get(posts.size() - 1).getFullName();
+
                 switch (postType) {
                     case PostPagingSource.TYPE_SUBREDDIT:
-                        if (mAccessToken == null) {
-                            call = api.getSubredditBestPosts(subredditName, sortType, sortTime, afterKey);
-                        } else {
-                            call = api.getSubredditBestPostsOauth(subredditName, sortType,
-                                   sortTime, afterKey, APIUtils.getOAuthHeader(mAccessToken));
-                        }
+                        call = api.getPosts(null, sortType.value, nextPage, 25, null, post.getSubredditNamePrefixed(), false, mAccessToken);
                         break;
                     case PostPagingSource.TYPE_USER:
-                        if (mAccessToken == null) {
-                            call = api.getUserPosts(username, afterKey, sortType, sortTime);
-                        } else {
-                            call = api.getUserPostsOauth(username, userWhere, afterKey, sortType,
-                                    sortTime, APIUtils.getOAuthHeader(mAccessToken));
-                        }
+                        call = api.getUserPosts(username, sortType.value, nextPage, 25, false, mAccessToken);
                         break;
                     case PostPagingSource.TYPE_SEARCH:
-                        if (subredditName == null) {
-                            if (mAccessToken == null) {
-                                call = api.searchPosts(query, afterKey, sortType, sortTime,
-                                        trendingSource);
-                            } else {
-                                call = api.searchPostsOauth(query, afterKey, sortType,
-                                        sortTime, trendingSource, APIUtils.getOAuthHeader(mAccessToken));
-                            }
-                        } else {
-                            if (mAccessToken == null) {
-                                call = api.searchPostsInSpecificSubreddit(subredditName, query,
-                                        sortType, sortTime, afterKey);
-                            } else {
-                                call = api.searchPostsInSpecificSubredditOauth(subredditName, query,
-                                        sortType, sortTime, afterKey,
-                                        APIUtils.getOAuthHeader(mAccessToken));
-                            }
-                        }
+                        call = api.search(query, null, subredditName, null, "Post", sortType.value, "All", nextPage, 25, mAccessToken);
                         break;
                     case PostPagingSource.TYPE_MULTI_REDDIT:
-                        if (mAccessToken == null) {
-                            call = api.getMultiRedditPosts(multiPath, afterKey, sortTime);
-                        } else {
-                            call = api.getMultiRedditPostsOauth(multiPath, afterKey,
-                                    sortTime, APIUtils.getOAuthHeader(mAccessToken));
-                        }
-                        break;
+                        // TODO: Implement multi community
+
                     case PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE:
-                        //case PostPagingSource.TYPE_ANONYMOUS_MULTIREDDIT
-                        call = api.getSubredditBestPosts(subredditName, sortType, sortTime, afterKey);
-                        break;
+                        // TODO: Implement anonymous front page
+
                     default:
-                        call = api.getBestPosts(sortType, sortTime, afterKey,
-                                APIUtils.getOAuthHeader(mAccessToken));
+                        String type = (subredditName.equals("all")) ? "All" : (subredditName.equals("local")) ? "Local" : "Subscribed";
+                        call = api.getPosts(type, sortType.value, nextPage, 25, null, null, false, mAccessToken);
                 }
 
                 try {
                     Response<String> response = call.execute();
                     if (response.isSuccessful()) {
                         String responseString = response.body();
-                        LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, readPostList);
+                        LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, readPostList, postEnricher);
                         if (newPosts == null) {
                             handler.post(() -> {
                                 loadingMorePostsStatus = LoadingMorePostsStatus.NO_MORE_POSTS;
@@ -674,7 +647,7 @@ public class ViewPostDetailActivity extends BaseActivity implements SortTypeSele
                     Response<String> response = historyPosts.execute();
                     if (response.isSuccessful()) {
                         String responseString = response.body();
-                        LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, null);
+                        LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, null, postEnricher);
                         if (newPosts == null || newPosts.isEmpty()) {
                             handler.post(() -> {
                                 loadingMorePostsStatus = LoadingMorePostsStatus.NO_MORE_POSTS;

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

@@ -1518,7 +1518,11 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
             if (i == EditorInfo.IME_ACTION_DONE) {
                 Utils.hideKeyboard(this);
                 Intent subredditIntent = new Intent(this, ViewSubredditDetailActivity.class);
-                subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, thingEditText.getText().toString());
+                String communityName = thingEditText.getText().toString();
+                if (communityName.startsWith("!")) {
+                    communityName = communityName.substring(1);
+                }
+                subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, communityName);
                 startActivity(subredditIntent);
                 return true;
             }
@@ -1576,7 +1580,11 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                         -> {
                     Utils.hideKeyboard(this);
                     Intent subredditIntent = new Intent(this, ViewSubredditDetailActivity.class);
-                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, thingEditText.getText().toString());
+                    String communityName = thingEditText.getText().toString();
+                    if (communityName.startsWith("!")) {
+                        communityName = communityName.substring(1);
+                    }
+                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, communityName);
                     startActivity(subredditIntent);
                 })
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) -> {
@@ -1597,7 +1605,11 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
             if (i == EditorInfo.IME_ACTION_DONE) {
                 Utils.hideKeyboard(this);
                 Intent userIntent = new Intent(this, ViewUserDetailActivity.class);
-                userIntent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, thingEditText.getText().toString());
+                String qualifiedName = thingEditText.getText().toString();
+                if (qualifiedName.startsWith("@")) {
+                    qualifiedName = qualifiedName.substring(1);
+                }
+                userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, qualifiedName);
                 startActivity(userIntent);
                 return true;
             }
@@ -1610,7 +1622,11 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
                         -> {
                     Utils.hideKeyboard(this);
                     Intent userIntent = new Intent(this, ViewUserDetailActivity.class);
-                    userIntent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, thingEditText.getText().toString());
+                    String qualifiedName = thingEditText.getText().toString();
+                    if (qualifiedName.startsWith("@")) {
+                        qualifiedName = qualifiedName.substring(1);
+                    }
+                    userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, qualifiedName);
                     startActivity(userIntent);
                 })
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) -> {

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

@@ -1514,7 +1514,11 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
             if (i == EditorInfo.IME_ACTION_DONE) {
                 Utils.hideKeyboard(this);
                 Intent subredditIntent = new Intent(this, ViewSubredditDetailActivity.class);
-                subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, thingEditText.getText().toString());
+                String communityName = thingEditText.getText().toString();
+                if (communityName.startsWith("!")) {
+                    communityName = communityName.substring(1);
+                }
+                subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, communityName);
                 startActivity(subredditIntent);
                 return true;
             }
@@ -1572,7 +1576,11 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
                         -> {
                     Utils.hideKeyboard(this);
                     Intent subredditIntent = new Intent(this, ViewSubredditDetailActivity.class);
-                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, thingEditText.getText().toString());
+                    String communityName = thingEditText.getText().toString();
+                    if (communityName.startsWith("!")) {
+                        communityName = communityName.substring(1);
+                    }
+                    subredditIntent.putExtra(ViewSubredditDetailActivity.EXTRA_COMMUNITY_FULL_NAME_KEY, communityName);
                     startActivity(subredditIntent);
                 })
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) -> {
@@ -1593,7 +1601,11 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
             if (i == EditorInfo.IME_ACTION_DONE) {
                 Utils.hideKeyboard(this);
                 Intent userIntent = new Intent(this, ViewUserDetailActivity.class);
-                userIntent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, thingEditText.getText().toString());
+                String userName = thingEditText.getText().toString();
+                if (userName.startsWith("@")) {
+                    userName = userName.substring(1);
+                }
+                userIntent.putExtra(ViewUserDetailActivity.EXTRA_QUALIFIED_USER_NAME_KEY, userName);
                 startActivity(userIntent);
                 return true;
             }
@@ -1606,7 +1618,11 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
                         -> {
                     Utils.hideKeyboard(this);
                     Intent userIntent = new Intent(this, ViewUserDetailActivity.class);
-                    userIntent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, thingEditText.getText().toString());
+                    String userName = thingEditText.getText().toString();
+                    if (userName.startsWith("@")) {
+                        userName = userName.substring(1);
+                    }
+                    userIntent.putExtra(ViewUserDetailActivity.EXTRA_USER_NAME_KEY, userName);
                     startActivity(userIntent);
                 })
                 .setNegativeButton(R.string.cancel, (dialogInterface, i) -> {

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

@@ -108,6 +108,7 @@ import eu.toldi.infinityforlemmy.font.TitleFontFamily;
 import eu.toldi.infinityforlemmy.font.TitleFontStyle;
 import eu.toldi.infinityforlemmy.post.FetchPost;
 import eu.toldi.infinityforlemmy.post.Post;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.services.DownloadMediaService;
 import eu.toldi.infinityforlemmy.services.DownloadRedditVideoService;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
@@ -222,10 +223,6 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
     @Named("default")
     SharedPreferences mSharedPreferences;
 
-    @Inject
-    @Named("current_account")
-    SharedPreferences mCurrentAccountSharedPreferences;
-
     @Inject
     CustomThemeWrapper mCustomThemeWrapper;
 
@@ -235,6 +232,9 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
     @Inject
     SimpleCache mSimpleCache;
 
+    @Inject
+    PostEnricher postEnricher;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -756,8 +756,8 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
                         }
                     });
         } else {
-            FetchGfycatOrRedgifsVideoLinks.fetchRedgifsVideoLinks(this, mExecutor, new Handler(), redgifsRetrofit,
-                    mCurrentAccountSharedPreferences, gfycatId, new FetchGfycatOrRedgifsVideoLinks.FetchGfycatOrRedgifsVideoLinksListener() {
+            FetchGfycatOrRedgifsVideoLinks.fetchRedgifsVideoLinks(mExecutor, new Handler(), redgifsRetrofit,
+                    gfycatId, new FetchGfycatOrRedgifsVideoLinks.FetchGfycatOrRedgifsVideoLinksListener() {
                         @Override
                         public void success(String webm, String mp4) {
                             progressBar.setVisibility(View.GONE);
@@ -791,7 +791,7 @@ public class ViewVideoActivity extends AppCompatActivity implements CustomFontRe
                     int commentsIndex = segments.lastIndexOf("comments");
                     String postId = segments.get(commentsIndex + 1);
                     FetchPost.fetchPost(mExecutor, new Handler(), retrofit.getRetrofit(), postId, null,
-                            new FetchPost.FetchPostListener() {
+                            postEnricher, new FetchPost.FetchPostListener() {
                                 @Override
                                 public void fetchPostSuccess(Post post) {
                                     if (post.isGfycat()) {

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

@@ -139,7 +139,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy
     private BaseActivity mActivity;
     private HistoryPostFragment mFragment;
     private SharedPreferences mSharedPreferences;
-    private SharedPreferences mCurrentAccountSharedPreferences;
     private Executor mExecutor;
     private Retrofit retrofit;
     private Retrofit mGfycatRetrofit;
@@ -227,7 +226,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy
                                           Retrofit gfycatRetrofit, Retrofit redgifsRetrofit, Provider<StreamableAPI> streambleApiProvider,
                                           CustomThemeWrapper customThemeWrapper, Locale locale,
                                           String accessToken, String accountName, int postType, int postLayout, boolean displaySubredditName,
-                                          SharedPreferences sharedPreferences, SharedPreferences currentAccountSharedPreferences,
+                                          SharedPreferences sharedPreferences,
                                           SharedPreferences nsfwAndSpoilerSharedPreferences,
                                           ExoCreator exoCreator, Callback callback) {
         super(DIFF_CALLBACK);
@@ -235,7 +234,6 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy
             mActivity = activity;
             mFragment = fragment;
             mSharedPreferences = sharedPreferences;
-            mCurrentAccountSharedPreferences = currentAccountSharedPreferences;
             mExecutor = executor;
             retrofit = oauthRetrofit;
             mGfycatRetrofit = gfycatRetrofit;
@@ -698,7 +696,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy
                     if ((post.isGfycat() || post.isRedgifs()) && !post.isLoadGfycatOrStreamableVideoSuccess()) {
                         ((PostVideoAutoplayViewHolder) holder).fetchGfycatOrStreamableVideoCall =
                                 post.isGfycat() ? mGfycatRetrofit.create(GfycatAPI.class).getGfycatData(post.getGfycatId()) :
-                                        mRedgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(APIUtils.getRedgifsOAuthHeader(mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.REDGIFS_ACCESS_TOKEN, "")), post.getGfycatId(), APIUtils.USER_AGENT);
+                                        mRedgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(post.getGfycatId());
                         FetchGfycatOrRedgifsVideoLinks.fetchGfycatOrRedgifsVideoLinksInRecyclerViewAdapter(mExecutor, new Handler(),
                                 ((PostVideoAutoplayViewHolder) holder).fetchGfycatOrStreamableVideoCall,
                                 post.isGfycat(), mAutomaticallyTryRedgifs,
@@ -875,7 +873,7 @@ public class HistoryPostRecyclerViewAdapter extends PagingDataAdapter<Post, Recy
                     if ((post.isGfycat() || post.isRedgifs()) && !post.isLoadGfycatOrStreamableVideoSuccess()) {
                         ((PostCard2VideoAutoplayViewHolder) holder).fetchGfycatOrStreamableVideoCall =
                                 post.isGfycat() ? mGfycatRetrofit.create(GfycatAPI.class).getGfycatData(post.getGfycatId()) :
-                                        mRedgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(APIUtils.getRedgifsOAuthHeader(mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.REDGIFS_ACCESS_TOKEN, "")), post.getGfycatId(), APIUtils.USER_AGENT);
+                                        mRedgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(post.getGfycatId());
                         FetchGfycatOrRedgifsVideoLinks.fetchGfycatOrRedgifsVideoLinksInRecyclerViewAdapter(mExecutor, new Handler(),
                                 ((PostCard2VideoAutoplayViewHolder) holder).fetchGfycatOrStreamableVideoCall,
                                 post.isGfycat(), mAutomaticallyTryRedgifs,

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

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

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

@@ -698,7 +698,7 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
                 if (mPost.isGfycat() || mPost.isRedgifs() && !mPost.isLoadGfycatOrStreamableVideoSuccess()) {
                     ((PostDetailVideoAutoplayViewHolder) holder).fetchGfycatOrStreamableVideoCall =
                             mPost.isGfycat() ? mGfycatRetrofit.create(GfycatAPI.class).getGfycatData(mPost.getGfycatId()) :
-                                    mRedgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(APIUtils.getRedgifsOAuthHeader(mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.REDGIFS_ACCESS_TOKEN, "")), mPost.getGfycatId(), APIUtils.USER_AGENT);
+                                    mRedgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(mPost.getGfycatId());
                     FetchGfycatOrRedgifsVideoLinks.fetchGfycatOrRedgifsVideoLinksInRecyclerViewAdapter(mExecutor, new Handler(),
                             ((PostDetailVideoAutoplayViewHolder) holder).fetchGfycatOrStreamableVideoCall,
                             mPost.isGfycat(), mAutomaticallyTryRedgifs,

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

@@ -787,7 +787,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
                     if ((post.isGfycat() || post.isRedgifs()) && !post.isLoadGfycatOrStreamableVideoSuccess()) {
                         ((PostVideoAutoplayViewHolder) holder).fetchGfycatOrStreamableVideoCall =
                                 post.isGfycat() ? mGfycatRetrofit.create(GfycatAPI.class).getGfycatData(post.getGfycatId()) :
-                                        mRedgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(APIUtils.getRedgifsOAuthHeader(mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.REDGIFS_ACCESS_TOKEN, "")), post.getGfycatId(), APIUtils.USER_AGENT);
+                                        mRedgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(post.getGfycatId());
                         FetchGfycatOrRedgifsVideoLinks.fetchGfycatOrRedgifsVideoLinksInRecyclerViewAdapter(mExecutor, new Handler(),
                                 ((PostVideoAutoplayViewHolder) holder).fetchGfycatOrStreamableVideoCall,
                                 post.isGfycat(), mAutomaticallyTryRedgifs,
@@ -979,7 +979,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
                     if ((post.isGfycat() || post.isRedgifs()) && !post.isLoadGfycatOrStreamableVideoSuccess()) {
                         ((PostCard2VideoAutoplayViewHolder) holder).fetchGfycatOrStreamableVideoCall =
                                 post.isGfycat() ? mGfycatRetrofit.create(GfycatAPI.class).getGfycatData(post.getGfycatId()) :
-                                        mRedgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(APIUtils.getRedgifsOAuthHeader(mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.REDGIFS_ACCESS_TOKEN, "")), post.getGfycatId(), APIUtils.USER_AGENT);
+                                        mRedgifsRetrofit.create(RedgifsAPI.class).getRedgifsData(post.getGfycatId());
                         FetchGfycatOrRedgifsVideoLinks.fetchGfycatOrRedgifsVideoLinksInRecyclerViewAdapter(mExecutor, new Handler(),
                                 ((PostCard2VideoAutoplayViewHolder) holder).fetchGfycatOrStreamableVideoCall,
                                 post.isGfycat(), mAutomaticallyTryRedgifs,

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

@@ -16,13 +16,14 @@ import butterknife.ButterKnife;
 import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.activities.BaseActivity;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
+import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 
 public class SelectedSubredditsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private BaseActivity activity;
     private CustomThemeWrapper customThemeWrapper;
-    private ArrayList<String> subreddits;
+    private ArrayList<SubredditWithSelection> subreddits;
 
-    public SelectedSubredditsRecyclerViewAdapter(BaseActivity activity, CustomThemeWrapper customThemeWrapper, ArrayList<String> subreddits) {
+    public SelectedSubredditsRecyclerViewAdapter(BaseActivity activity, CustomThemeWrapper customThemeWrapper, ArrayList<SubredditWithSelection> subreddits) {
         this.activity = activity;
         this.customThemeWrapper = customThemeWrapper;
         if (subreddits == null) {
@@ -42,7 +43,7 @@ public class SelectedSubredditsRecyclerViewAdapter extends RecyclerView.Adapter<
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
         if (holder instanceof SubredditViewHolder) {
-            ((SubredditViewHolder) holder).subredditNameTextView.setText(subreddits.get(holder.getBindingAdapterPosition()));
+            ((SubredditViewHolder) holder).subredditNameTextView.setText(subreddits.get(holder.getBindingAdapterPosition()).getName());
             ((SubredditViewHolder) holder).deleteButton.setOnClickListener(view -> {
                 subreddits.remove(holder.getBindingAdapterPosition());
                 notifyItemRemoved(holder.getBindingAdapterPosition());
@@ -55,18 +56,18 @@ public class SelectedSubredditsRecyclerViewAdapter extends RecyclerView.Adapter<
         return subreddits.size();
     }
 
-    public void addSubreddits(ArrayList<String> newSubreddits) {
+    public void addSubreddits(ArrayList<SubredditWithSelection> newSubreddits) {
         int oldSize = subreddits.size();
         subreddits.addAll(newSubreddits);
         notifyItemRangeInserted(oldSize, newSubreddits.size());
     }
 
     public void addUserInSubredditType(String username) {
-        subreddits.add(username);
-        notifyItemInserted(subreddits.size());
+        /*subreddits.add(username);
+        notifyItemInserted(subreddits.size());*/
     }
 
-    public ArrayList<String> getSubreddits() {
+    public ArrayList<SubredditWithSelection> getSubreddits() {
         return subreddits;
     }
 

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

@@ -19,12 +19,12 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
 import eu.toldi.infinityforlemmy.R;
 import eu.toldi.infinityforlemmy.activities.BaseActivity;
 import eu.toldi.infinityforlemmy.customtheme.CustomThemeWrapper;
 import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 import eu.toldi.infinityforlemmy.subscribedsubreddit.SubscribedSubredditData;
+import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
 import pl.droidsonroids.gif.GifImageView;
 
 public class SubredditMultiselectionRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@@ -91,11 +91,11 @@ public class SubredditMultiselectionRecyclerViewAdapter extends RecyclerView.Ada
         notifyDataSetChanged();
     }
 
-    public ArrayList<String> getAllSelectedSubreddits() {
-        ArrayList<String> selectedSubreddits = new ArrayList<>();
+    public ArrayList<SubredditWithSelection> getAllSelectedSubreddits() {
+        ArrayList<SubredditWithSelection> selectedSubreddits = new ArrayList<>();
         for (SubredditWithSelection s : subscribedSubreddits) {
             if (s.isSelected()) {
-                selectedSubreddits.add(s.getName());
+                selectedSubreddits.add(s);
             }
         }
         return selectedSubreddits;

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

@@ -158,7 +158,7 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
                                 mFavoriteSubscribedSubredditData.size() + 3 : 1;
                     } else {
                         offset = (mFavoriteSubscribedSubredditData != null && mFavoriteSubscribedSubredditData.size() > 0) ?
-                                mFavoriteSubscribedSubredditData.size() + 2 : 1;
+                                mFavoriteSubscribedSubredditData.size() + 2 : 0;
                     }
                 } else {
                     offset = (mFavoriteSubscribedSubredditData != null && mFavoriteSubscribedSubredditData.size() > 0) ?
@@ -301,7 +301,7 @@ public class SubscribedSubredditsRecyclerViewAdapter extends RecyclerView.Adapte
             }
 
             if (itemClickListener != null) {
-                return mSubscribedSubredditData.size() > 0 ? mSubscribedSubredditData.size() + 1 : 0;
+                return (hasClearSelectionRow) ? mSubscribedSubredditData.size() + 1 : mSubscribedSubredditData.size();
             }
 
             return mSubscribedSubredditData.size();

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

@@ -101,7 +101,16 @@ public interface LemmyAPI {
     Call<String> postDelete(@Body DeletePostDTO params);
 
     @GET("api/v3/user")
-    ListenableFuture<Response<String>> getUserPosts(
+    ListenableFuture<Response<String>> getUserPostsListenableFuture(
+            @Query("username") String username,
+            @Query("sort") String sort,
+            @Query("page") Integer page,
+            @Query("limit") Integer limit,
+            @Query("saved_only") Boolean saved_only,
+            @Query("auth") String access_token);
+
+    @GET("api/v3/user")
+    Call<String> getUserPosts(
             @Query("username") String username,
             @Query("sort") String sort,
             @Query("page") Integer page,
@@ -129,7 +138,19 @@ public interface LemmyAPI {
     );
 
     @GET("api/v3/post/list")
-    ListenableFuture<Response<String>> getPosts(
+    ListenableFuture<Response<String>> getPostsListenableFuture(
+            @Query("type_") String type_,
+            @Query("sort") String sort,
+            @Query("page") Integer page,
+            @Query("limit") Integer limit,
+            @Query("community_id") Integer community_id,
+            @Query("community_name") String community_name,
+            @Query("saved_only") Boolean saved_only,
+            @Query("auth") String auth
+    );
+
+    @GET("api/v3/post/list")
+    Call<String> getPosts(
             @Query("type_") String type_,
             @Query("sort") String sort,
             @Query("page") Integer page,

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

@@ -6,14 +6,16 @@ import retrofit2.Call;
 import retrofit2.http.FieldMap;
 import retrofit2.http.FormUrlEncoded;
 import retrofit2.http.GET;
-import retrofit2.http.HeaderMap;
 import retrofit2.http.POST;
 import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 public interface RedgifsAPI {
     @GET("/v2/gifs/{id}")
-    Call<String> getRedgifsData(@HeaderMap Map<String, String> headers, @Path("id") String id, @Query("user-agent") String userAgent);
+    Call<String> getRedgifsData(@Path("id") String id);
+
+    @GET("/v2/gifs")
+    Call<String> getRedgifsMultipleData(@Query("ids") String ids);
 
     @FormUrlEncoded
     @POST("/v2/oauth/client")

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

@@ -2,6 +2,7 @@ package eu.toldi.infinityforlemmy.asynctasks;
 
 import android.content.SharedPreferences;
 import android.os.Handler;
+import android.util.Log;
 
 import java.util.concurrent.Executor;
 
@@ -25,18 +26,31 @@ public class SwitchAccount {
                     .putString(SharedPreferencesUtils.ACCESS_TOKEN, account.getAccessToken())
                     .putString(SharedPreferencesUtils.ACCOUNT_NAME, account.getDisplay_name())
                     .putString(SharedPreferencesUtils.ACCOUNT_QUALIFIED_NAME, account.getAccountName())
-                    .putString(SharedPreferencesUtils.ACCOUNT_INSTANCE,account.getInstance_url())
+                    .putString(SharedPreferencesUtils.ACCOUNT_INSTANCE, account.getInstance_url())
+                    .putBoolean(SharedPreferencesUtils.BEARER_TOKEN_AUTH, false)
                     .putString(SharedPreferencesUtils.ACCOUNT_IMAGE_URL, account.getProfileImageUrl()).apply();
             retrofitHolder.setBaseURL(account.getInstance_url());
+            retrofitHolder.setAccessToken(null);
             FetchSiteInfo.fetchSiteInfo(retrofitHolder.getRetrofit(), account.getAccessToken(), new FetchSiteInfo.FetchSiteInfoListener() {
                 @Override
                 public void onFetchSiteInfoSuccess(SiteInfo siteInfo) {
                     boolean canDownvote = siteInfo.isEnable_downvotes();
                     currentAccountSharedPreferences.edit().putBoolean(SharedPreferencesUtils.CAN_DOWNVOTE, canDownvote).apply();
+                    String[] version = siteInfo.getVersion().split("\\.");
+                    if (version.length > 0) {
+                        Log.d("SwitchAccount", "Lemmy Version: " + version[0] + "." + version[1]);
+                        int majorVersion = Integer.parseInt(version[0]);
+                        int minorVersion = Integer.parseInt(version[1]);
+                        if (majorVersion > 0 || (majorVersion == 0 && minorVersion >= 19)) {
+                            retrofitHolder.setAccessToken(account.getAccessToken());
+                            currentAccountSharedPreferences.edit().putBoolean(SharedPreferencesUtils.BEARER_TOKEN_AUTH, true).apply();
+                        }
+                    }
                 }
 
                 @Override
                 public void onFetchSiteInfoFailed() {
+                    Log.e("SwitchAccount", "Failed to fetch site info");
                     currentAccountSharedPreferences.edit().putBoolean(SharedPreferencesUtils.CAN_DOWNVOTE, true).apply();
                 }
             });

app/src/main/java/eu/toldi/infinityforlemmy/fragments/HistoryPostFragment.java

@@ -124,6 +124,7 @@ import eu.toldi.infinityforlemmy.events.ShowThumbnailOnTheRightInCompactLayoutEv
 import eu.toldi.infinityforlemmy.post.HistoryPostPagingSource;
 import eu.toldi.infinityforlemmy.post.HistoryPostViewModel;
 import eu.toldi.infinityforlemmy.post.Post;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.postfilter.PostFilter;
 import eu.toldi.infinityforlemmy.postfilter.PostFilterUsage;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
@@ -178,9 +179,6 @@ public class HistoryPostFragment extends Fragment implements FragmentCommunicato
     @Named("default")
     SharedPreferences mSharedPreferences;
     @Inject
-    @Named("current_account")
-    SharedPreferences mCurrentAccountSharedPreferences;
-    @Inject
     @Named("post_layout")
     SharedPreferences mPostLayoutSharedPreferences;
     @Inject
@@ -198,6 +196,8 @@ public class HistoryPostFragment extends Fragment implements FragmentCommunicato
     ExoCreator mExoCreator;
     @Inject
     Executor mExecutor;
+    @Inject
+    PostEnricher postEnricher;
     private RequestManager mGlide;
     private BaseActivity activity;
     private LinearLayoutManagerBugFixed mLinearLayoutManager;
@@ -383,7 +383,7 @@ public class HistoryPostFragment extends Fragment implements FragmentCommunicato
             mAdapter = new HistoryPostRecyclerViewAdapter(activity, this, mExecutor, mRetrofit.getRetrofit(), mGfycatRetrofit,
                     mRedgifsRetrofit, mStreamableApiProvider, mCustomThemeWrapper, locale,
                     accessToken, accountName, postType, postLayout, true,
-                    mSharedPreferences, mCurrentAccountSharedPreferences, mNsfwAndSpoilerSharedPreferences,
+                    mSharedPreferences, mNsfwAndSpoilerSharedPreferences,
                     mExoCreator, new HistoryPostRecyclerViewAdapter.Callback() {
                 @Override
                 public void typeChipClicked(int filter) {
@@ -654,15 +654,10 @@ public class HistoryPostFragment extends Fragment implements FragmentCommunicato
     }
 
     private void initializeAndBindPostViewModel(String accessToken) {
-        if (postType == HistoryPostPagingSource.TYPE_READ_POSTS) {
-            mHistoryPostViewModel = new ViewModelProvider(HistoryPostFragment.this, new HistoryPostViewModel.Factory(mExecutor,
-                    accessToken == null ? mRetrofit.getRetrofit() : mOauthRetrofit, mRedditDataRoomDatabase, accessToken,
-                    accountName, mSharedPreferences, HistoryPostPagingSource.TYPE_READ_POSTS, postFilter)).get(HistoryPostViewModel.class);
-        } else {
-            mHistoryPostViewModel = new ViewModelProvider(HistoryPostFragment.this, new HistoryPostViewModel.Factory(mExecutor,
-                    accessToken == null ? mRetrofit.getRetrofit() : mOauthRetrofit, mRedditDataRoomDatabase, accessToken,
-                    accountName, mSharedPreferences, HistoryPostPagingSource.TYPE_READ_POSTS, postFilter)).get(HistoryPostViewModel.class);
-        }
+        mHistoryPostViewModel = new ViewModelProvider(HistoryPostFragment.this, new HistoryPostViewModel.Factory(mExecutor,
+                accessToken == null ? mRetrofit.getRetrofit() : mOauthRetrofit, mRedditDataRoomDatabase, accessToken,
+                accountName, mSharedPreferences, HistoryPostPagingSource.TYPE_READ_POSTS, postFilter, postEnricher))
+                .get(HistoryPostViewModel.class);
 
         bindPostViewModel();
     }
@@ -1447,4 +1442,4 @@ public class HistoryPostFragment extends Fragment implements FragmentCommunicato
     public interface LoadIconListener {
         void loadIconSuccess(String subredditOrUserName, String iconUrl);
     }
-}
+}

app/src/main/java/eu/toldi/infinityforlemmy/fragments/MultiRedditListingFragment.java

@@ -29,7 +29,6 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import me.zhanghai.android.fastscroll.FastScrollerBuilder;
 import eu.toldi.infinityforlemmy.FragmentCommunicator;
 import eu.toldi.infinityforlemmy.Infinity;
 import eu.toldi.infinityforlemmy.R;
@@ -45,6 +44,7 @@ import eu.toldi.infinityforlemmy.customviews.LinearLayoutManagerBugFixed;
 import eu.toldi.infinityforlemmy.multireddit.MultiReddit;
 import eu.toldi.infinityforlemmy.multireddit.MultiRedditViewModel;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
+import me.zhanghai.android.fastscroll.FastScrollerBuilder;
 import retrofit2.Retrofit;
 
 public class MultiRedditListingFragment extends Fragment implements FragmentCommunicator {
@@ -111,9 +111,9 @@ public class MultiRedditListingFragment extends Fragment implements FragmentComm
         String accessToken = getArguments().getString(EXTRA_ACCESS_TOKEN);
         boolean isGettingMultiredditInfo = getArguments().getBoolean(EXTRA_IS_GETTING_MULTIREDDIT_INFO, false);
 
-        if (accessToken == null) {
-            mSwipeRefreshLayout.setEnabled(false);
-        }
+
+        mSwipeRefreshLayout.setEnabled(false);
+
 
         mGlide = Glide.with(this);
 
@@ -122,7 +122,7 @@ public class MultiRedditListingFragment extends Fragment implements FragmentComm
         MultiRedditListingRecyclerViewAdapter adapter = new MultiRedditListingRecyclerViewAdapter(mActivity,
                 mExecutor, mOauthRetrofit, mRedditDataRoomDatabase, mCustomThemeWrapper, accessToken,
                 new MultiRedditListingRecyclerViewAdapter.OnItemClickListener() {
-            @Override
+                    @Override
             public void onClick(MultiReddit multiReddit) {
                 if (mActivity instanceof MultiredditSelectionActivity) {
                     ((MultiredditSelectionActivity) mActivity).getSelectedMultireddit(multiReddit);

app/src/main/java/eu/toldi/infinityforlemmy/fragments/PostFragment.java

@@ -135,6 +135,7 @@ import eu.toldi.infinityforlemmy.events.ShowThumbnailOnTheRightInCompactLayoutEv
 import eu.toldi.infinityforlemmy.post.Post;
 import eu.toldi.infinityforlemmy.post.PostPagingSource;
 import eu.toldi.infinityforlemmy.post.PostViewModel;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.postfilter.PostFilter;
 import eu.toldi.infinityforlemmy.postfilter.PostFilterUsage;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
@@ -222,6 +223,8 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
     ExoCreator mExoCreator;
     @Inject
     Executor mExecutor;
+    @Inject
+    PostEnricher postEnricher;
     private RequestManager mGlide;
     private BaseActivity activity;
     private LinearLayoutManagerBugFixed mLinearLayoutManager;
@@ -533,17 +536,12 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
                 sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_SUBREDDIT_POST_BASE + subredditName,
                         mSharedPreferences.getString(SharedPreferencesUtils.SUBREDDIT_DEFAULT_SORT_TIME, SortType.Time.ALL.name()));
             }
+
+            sortType = newSortType(sort, sortTime);
+
             boolean displaySubredditName = subredditName != null && (subredditName.equals("local") || subredditName.equals("all"));
             postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_SUBREDDIT_POST_BASE + subredditName, defaultPostLayout);
-            SortType.Type st = SortType.Type.fromValue(sort);
-            st = st == null ? SortType.Type.HOT : st;
-            if (sortTime != null) {
-                st = SortType.Type.fromValue(sortTime);
-                st = st == null ? SortType.Type.TOP_ALL : st;
-                sortType = new SortType(st);
-            } else {
-                sortType = new SortType(st);
-            }
+
 
             mAdapter = new PostRecyclerViewAdapter(activity, this, mExecutor, mRetrofit, mGfycatRetrofit,
                     mRedgifsRetrofit, mStreamableApiProvider, mCustomThemeWrapper, locale,
@@ -607,16 +605,12 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
                 sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_MULTI_REDDIT_POST_BASE + multiRedditPath,
                         SortType.Time.ALL.name());
             }
+
+            sortType = newSortType(sort, sortTime);
+
             postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_MULTI_REDDIT_POST_BASE + multiRedditPath,
                     defaultPostLayout);
 
-            SortType.Type st = SortType.Type.fromValue(sort);
-            st = st == null ? SortType.Type.HOT : st;
-            if (sortTime != null) {
-                sortType = new SortType(st, SortType.Time.valueOf(sortTime));
-            } else {
-                sortType = new SortType(st);
-            }
 
             mAdapter = new PostRecyclerViewAdapter(activity, this, mExecutor, mRetrofit, mGfycatRetrofit,
                     mRedgifsRetrofit, mStreamableApiProvider, mCustomThemeWrapper, locale,
@@ -674,17 +668,14 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
 
             String sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_USER_POST_BASE + username,
                     mSharedPreferences.getString(SharedPreferencesUtils.USER_DEFAULT_SORT_TYPE, SortType.Type.NEW.name()));
-            SortType.Type st = SortType.Type.fromValue(sort);
-            st = st == null ? SortType.Type.NEW : st;
+            String sortTime = null;
             if (sort.equalsIgnoreCase(SortType.Type.TOP.value)) {
-                String sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_USER_POST_BASE + username,
+                sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_USER_POST_BASE + username,
                         mSharedPreferences.getString(SharedPreferencesUtils.USER_DEFAULT_SORT_TIME, SortType.Time.ALL.name()));
-                st = SortType.Type.fromValue(sortTime);
-                st = st == null ? SortType.Type.NEW : st;
-                sortType = new SortType(st);
-            } else {
-                sortType = new SortType(st);
             }
+
+            sortType = newSortType(sort, sortTime);
+
             postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_USER_POST_BASE + username, defaultPostLayout);
 
             mAdapter = new PostRecyclerViewAdapter(activity, this, mExecutor, mRetrofit, mGfycatRetrofit,
@@ -741,14 +732,11 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
             subredditName = getArguments().getString(EXTRA_NAME);
 
             String sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_SUBREDDIT_POST_BASE + "-", SortType.Type.HOT.name());
-            SortType.Type st = SortType.Type.fromValue(sort);
-            st = st == null ? SortType.Type.NEW : st;
+            String sortTime = null;
             if (sort.equals(SortType.Type.TOP.name())) {
-                String sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_SUBREDDIT_POST_BASE + "-", SortType.Time.ALL.name());
-                sortType = new SortType(st, SortType.Time.valueOf(sortTime));
-            } else {
-                sortType = new SortType(st);
+                sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_SUBREDDIT_POST_BASE + "-", SortType.Time.ALL.name());
             }
+            sortType = newSortType(sort, sortTime);
 
             postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_FRONT_PAGE_POST, defaultPostLayout);
 
@@ -803,14 +791,11 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
             nameOfUsage = multiRedditPath;
 
             String sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_MULTI_REDDIT_POST_BASE + multiRedditPath, SortType.Type.HOT.name());
-            SortType.Type st = SortType.Type.fromValue(sort);
-            st = st == null ? SortType.Type.NEW : st;
+            String sortTime = null;
             if (sort.equals(SortType.Type.TOP.name())) {
-                String sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_MULTI_REDDIT_POST_BASE + multiRedditPath, SortType.Time.ALL.name());
-                sortType = new SortType(st, SortType.Time.valueOf(sortTime));
-            } else {
-                sortType = new SortType(st);
+                sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_MULTI_REDDIT_POST_BASE + multiRedditPath, SortType.Time.ALL.name());
             }
+            sortType = newSortType(sort, sortTime);
 
             postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_MULTI_REDDIT_POST_BASE + multiRedditPath, defaultPostLayout);
 
@@ -863,14 +848,11 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
             nameOfUsage = PostFilterUsage.NO_USAGE;
             subredditName = getArguments().getString(EXTRA_NAME);
             String sort = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TYPE_BEST_POST, SortType.Type.ACTIVE.name());
-            SortType.Type st = SortType.Type.fromValue(sort);
-            st = st == null ? SortType.Type.NEW : st;
+            String sortTime = null;
             if (sort.equals(SortType.Type.TOP.name())) {
-                String sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_BEST_POST, SortType.Time.ALL.name());
-                sortType = new SortType(st, SortType.Time.valueOf(sortTime));
-            } else {
-                sortType = new SortType(st);
+                sortTime = mSortTypeSharedPreferences.getString(SharedPreferencesUtils.SORT_TIME_BEST_POST, SortType.Time.ALL.name());
             }
+            sortType = newSortType(sort, sortTime);
             postLayout = mPostLayoutSharedPreferences.getInt(SharedPreferencesUtils.POST_LAYOUT_FRONT_PAGE_POST, defaultPostLayout);
 
             mAdapter = new PostRecyclerViewAdapter(activity, this, mExecutor, mRetrofit, mGfycatRetrofit,
@@ -988,7 +970,8 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
                                         this.postFilter = postFilter;
                                         postFilter.allowNSFW = !mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_NSFW_FOREVER, false) && mNsfwAndSpoilerSharedPreferences.getBoolean(SharedPreferencesUtils.NSFW_BASE, false);
                                         this.concatenatedSubredditNames = concatenatedSubredditNames;
-                                        showErrorView(R.string.anonymous_homepage_not_implemented);
+                                        //showErrorView(R.string.anonymous_homepage_not_implemented);
+                                        initializeAndBindPostViewModelForAnonymous(concatenatedSubredditNames);
                                     }
                                 });
                     } else {
@@ -1030,7 +1013,8 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
                                     if (activity != null && !activity.isFinishing() && !activity.isDestroyed() && !isDetached()) {
                                         postFilter.allowNSFW = !mSharedPreferences.getBoolean(SharedPreferencesUtils.DISABLE_NSFW_FOREVER, false) && mNsfwAndSpoilerSharedPreferences.getBoolean(SharedPreferencesUtils.NSFW_BASE, false);
                                         this.concatenatedSubredditNames = concatenatedSubredditNames;
-                                        showErrorView(R.string.anonymous_homepage_not_implemented);
+                                        //showErrorView(R.string.anonymous_homepage_not_implemented);
+                                        initializeAndBindPostViewModelForAnonymous(concatenatedSubredditNames);
                                     }
                                 });
                     } else {
@@ -1221,30 +1205,36 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
                     mRetrofit, accessToken,
                     accountName, mSharedPreferences,
                     mPostFeedScrolledPositionSharedPreferences, mPostHistorySharedPreferences, subredditName,
-                    query, trendingSource, postType, sortType, postFilter, readPosts)).get(PostViewModel.class);
+                    query, trendingSource, postType, sortType, postFilter, readPosts, postEnricher))
+                    .get(PostViewModel.class);
         } else if (postType == PostPagingSource.TYPE_SUBREDDIT) {
             mPostViewModel = new ViewModelProvider(PostFragment.this, new PostViewModel.Factory(mExecutor,
                     mRetrofit, accessToken,
                     accountName, mSharedPreferences, mPostFeedScrolledPositionSharedPreferences,
-                    mPostHistorySharedPreferences, subredditName, postType, sortType, postFilter, readPosts))
+                    mPostHistorySharedPreferences, subredditName, postType, sortType, postFilter, readPosts,
+                    postEnricher))
                     .get(PostViewModel.class);
         } else if (postType == PostPagingSource.TYPE_MULTI_REDDIT) {
             mPostViewModel = new ViewModelProvider(PostFragment.this, new PostViewModel.Factory(mExecutor,
                     mRetrofit, accessToken,
                     accountName, mSharedPreferences, mPostFeedScrolledPositionSharedPreferences,
-                    mPostHistorySharedPreferences, multiRedditPath, postType, sortType, postFilter, readPosts))
+                    mPostHistorySharedPreferences, multiRedditPath, postType, sortType, postFilter, readPosts,
+                    postEnricher))
                     .get(PostViewModel.class);
         } else if (postType == PostPagingSource.TYPE_USER) {
             mPostViewModel = new ViewModelProvider(PostFragment.this, new PostViewModel.Factory(mExecutor,
                     mRetrofit, accessToken,
                     accountName, mSharedPreferences, mPostFeedScrolledPositionSharedPreferences,
-                    mPostHistorySharedPreferences, username, postType, sortType, postFilter, where, readPosts))
+                    mPostHistorySharedPreferences, username, postType, sortType, postFilter, where, readPosts,
+                    postEnricher))
                     .get(PostViewModel.class);
         } else {
             mPostViewModel = new ViewModelProvider(PostFragment.this, new PostViewModel.Factory(mExecutor,
                     mRetrofit, accessToken,
                     accountName, mSharedPreferences, mPostFeedScrolledPositionSharedPreferences,
-                    mPostHistorySharedPreferences, postType, sortType, postFilter, readPosts, subredditName)).get(PostViewModel.class);
+                    mPostHistorySharedPreferences, postType, sortType, postFilter, readPosts, subredditName,
+                    postEnricher))
+                    .get(PostViewModel.class);
         }
 
         bindPostViewModel();
@@ -1256,26 +1246,27 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
             mPostViewModel = new ViewModelProvider(PostFragment.this, new PostViewModel.Factory(mExecutor,
                     mRetrofit, null, accountName, mSharedPreferences,
                     mPostFeedScrolledPositionSharedPreferences, null, subredditName, query, trendingSource,
-                    postType, sortType, postFilter, readPosts)).get(PostViewModel.class);
+                    postType, sortType, postFilter, readPosts, postEnricher)).get(PostViewModel.class);
         } else if (postType == PostPagingSource.TYPE_SUBREDDIT) {
             mPostViewModel = new ViewModelProvider(this, new PostViewModel.Factory(mExecutor,
                     mRetrofit, null, accountName, mSharedPreferences,
                     mPostFeedScrolledPositionSharedPreferences, null, subredditName, postType, sortType,
-                    postFilter, readPosts)).get(PostViewModel.class);
+                    postFilter, readPosts, postEnricher)).get(PostViewModel.class);
         } else if (postType == PostPagingSource.TYPE_MULTI_REDDIT) {
             mPostViewModel = new ViewModelProvider(PostFragment.this, new PostViewModel.Factory(mExecutor,
                     mRetrofit, null, accountName, mSharedPreferences,
                     mPostFeedScrolledPositionSharedPreferences, null, multiRedditPath,
-                    postType, sortType, postFilter, readPosts)).get(PostViewModel.class);
+                    postType, sortType, postFilter, readPosts, postEnricher)).get(PostViewModel.class);
         } else if (postType == PostPagingSource.TYPE_USER) {
             mPostViewModel = new ViewModelProvider(PostFragment.this, new PostViewModel.Factory(mExecutor,
                     mRetrofit, null, accountName, mSharedPreferences,
                     mPostFeedScrolledPositionSharedPreferences, null, username, postType, sortType, postFilter,
-                    where, readPosts)).get(PostViewModel.class);
+                    where, readPosts, postEnricher)).get(PostViewModel.class);
         } else {
             //Anonymous Front Page
             mPostViewModel = new ViewModelProvider(PostFragment.this, new PostViewModel.Factory(mExecutor,
-                    mRetrofit, mSharedPreferences, concatenatedSubredditNames, postType, sortType, postFilter, subredditName))
+                    mRetrofit, mSharedPreferences, concatenatedSubredditNames, postType, sortType, postFilter, subredditName,
+                    postEnricher))
                     .get(PostViewModel.class);
         }
 
@@ -1379,25 +1370,25 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
             if (mSharedPreferences.getBoolean(SharedPreferencesUtils.SAVE_SORT_TYPE, true)) {
                 switch (postType) {
                     case PostPagingSource.TYPE_FRONT_PAGE:
-                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_BEST_POST, sortType.getType().name()).apply();
+                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_BEST_POST, sortType.getType().value).apply();
                         if (sortType.getTime() != null) {
                             mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_BEST_POST, sortType.getTime().name()).apply();
                         }
                         break;
                     case PostPagingSource.TYPE_SUBREDDIT:
-                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SUBREDDIT_POST_BASE + subredditName, sortType.getType().name()).apply();
+                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SUBREDDIT_POST_BASE + subredditName, sortType.getType().value).apply();
                         if (sortType.getTime() != null) {
                             mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_SUBREDDIT_POST_BASE + subredditName, sortType.getTime().name()).apply();
                         }
                         break;
                     case PostPagingSource.TYPE_USER:
-                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_USER_POST_BASE + username, sortType.getType().name()).apply();
+                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_USER_POST_BASE + username, sortType.getType().value).apply();
                         if (sortType.getTime() != null) {
                             mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_USER_POST_BASE + username, sortType.getTime().name()).apply();
                         }
                         break;
                     case PostPagingSource.TYPE_SEARCH:
-                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SEARCH_POST, sortType.getType().name()).apply();
+                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SEARCH_POST, sortType.getType().value).apply();
                         if (sortType.getTime() != null) {
                             mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_SEARCH_POST, sortType.getTime().name()).apply();
                         }else {
@@ -1407,14 +1398,14 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
                     case PostPagingSource.TYPE_MULTI_REDDIT:
                     case PostPagingSource.TYPE_ANONYMOUS_MULTIREDDIT:
                         mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_MULTI_REDDIT_POST_BASE + multiRedditPath,
-                                sortType.getType().name()).apply();
+                                sortType.getType().value).apply();
                         if (sortType.getTime() != null) {
                             mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_MULTI_REDDIT_POST_BASE + multiRedditPath,
                                     sortType.getTime().name()).apply();
                         }
                         break;
                     case PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE:
-                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SUBREDDIT_POST_BASE + "-", sortType.getType().name()).apply();
+                        mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TYPE_SUBREDDIT_POST_BASE + "-", sortType.getType().value).apply();
                         if (sortType.getTime() != null) {
                             mSortTypeSharedPreferences.edit().putString(SharedPreferencesUtils.SORT_TIME_SUBREDDIT_POST_BASE + "-", sortType.getTime().name()).apply();
                         }
@@ -2253,6 +2244,24 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
         return false;
     }
 
+    public SortType newSortType(String sortTypeText, String sortTimeText) {
+        SortType.Type st = SortType.Type.fromValue(sortTypeText);
+        st = st == null ? SortType.Type.NEW : st;
+        SortType result;
+        if (sortTypeText.startsWith("Top")) {
+            sortTimeText = st.value.substring(3);
+            result = new SortType(st, SortType.Time.fromValue(sortTimeText));
+        } else if (sortTimeText != null) {
+            SortType.Time sortTime = SortType.Time.fromValue(sortTimeText);
+            SortType.Type sortType = SortType.Type.fromValue("Top" + sortTimeText);
+            result = new SortType(sortType != null ? sortType : st, sortTime);
+        } else {
+            result = new SortType(st);
+        }
+
+        return result;
+    }
+
     private static abstract class LazyModeRunnable implements Runnable {
         private int currentPosition = -1;
 

app/src/main/java/eu/toldi/infinityforlemmy/fragments/ViewPostDetailFragment.java

@@ -112,6 +112,7 @@ import eu.toldi.infinityforlemmy.post.HidePost;
 import eu.toldi.infinityforlemmy.post.LemmyPostAPI;
 import eu.toldi.infinityforlemmy.post.MarkPostAsRead;
 import eu.toldi.infinityforlemmy.post.Post;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.readpost.InsertReadPost;
 import eu.toldi.infinityforlemmy.subreddit.FetchSubredditData;
 import eu.toldi.infinityforlemmy.subreddit.SubredditData;
@@ -200,6 +201,8 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
     MarkPostAsRead markPostAsRead;
     @Inject
     LemmyPostAPI mLemmyPostAPI;
+    @Inject
+    PostEnricher postEnricher;
     @State
     Post mPost;
     @State
@@ -324,7 +327,7 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
         mLockFab = mSharedPreferences.getBoolean(SharedPreferencesUtils.LOCK_JUMP_TO_NEXT_TOP_LEVEL_COMMENT_BUTTON, false);
         mSwipeUpToHideFab = mSharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_UP_TO_HIDE_JUMP_TO_NEXT_TOP_LEVEL_COMMENT_BUTTON, false);
         mExpandChildren = !mSharedPreferences.getBoolean(SharedPreferencesUtils.SHOW_TOP_LEVEL_COMMENTS_FIRST, false);
-        mMarkPostsAsRead = mPostHistorySharedPreferences.getBoolean(mAccountQualifiedName + SharedPreferencesUtils.MARK_POSTS_AS_READ_BASE, false);
+        mMarkPostsAsRead = mPostHistorySharedPreferences.getBoolean(mAccountName + SharedPreferencesUtils.MARK_POSTS_AS_READ_BASE, false);
         if (savedInstanceState == null) {
             mRespectSubredditRecommendedSortType = mSharedPreferences.getBoolean(SharedPreferencesUtils.RESPECT_SUBREDDIT_RECOMMENDED_COMMENT_SORT_TYPE, false);
             viewPostDetailFragmentId = System.currentTimeMillis();
@@ -1329,7 +1332,7 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
         mSwipeRefreshLayout.setRefreshing(true);
         mGlide.clear(mFetchPostInfoImageView);
         FetchPost.fetchPost(mExecutor, new Handler(), mRetrofit.getRetrofit(), String.valueOf(subredditId), mAccessToken,
-                new FetchPost.FetchPostListener() {
+                postEnricher, new FetchPost.FetchPostListener() {
                     @Override
                     public void fetchPostSuccess(Post post) {
                         if (!isAdded()) {
@@ -1588,7 +1591,7 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
                 Retrofit retrofit = mRetrofit.getRetrofit();
 
                 FetchPost.fetchPost(mExecutor, new Handler(), retrofit, String.valueOf(mPost.getId()), mAccessToken,
-                        new FetchPost.FetchPostListener() {
+                        postEnricher, new FetchPost.FetchPostListener() {
                             @Override
                             public void fetchPostSuccess(Post post) {
                                 if (isAdded()) {

app/src/main/java/eu/toldi/infinityforlemmy/multireddit/CreateMultiReddit.java

@@ -13,6 +13,7 @@ import java.util.concurrent.Executor;
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
 import eu.toldi.infinityforlemmy.account.Account;
 import eu.toldi.infinityforlemmy.apis.RedditAPI;
+import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -62,18 +63,19 @@ public class CreateMultiReddit {
 
     public static void anonymousCreateMultiReddit(Executor executor, Handler handler,
                                                   RedditDataRoomDatabase redditDataRoomDatabase,
+                                                  String accountName,
                                                   String multipath, String name, String description,
-                                                  List<String> subreddits,
+                                                  List<SubredditWithSelection> subreddits,
                                                   CreateMultiRedditListener createMultiRedditListener) {
         executor.execute(() -> {
             if (!redditDataRoomDatabase.accountDao().isAnonymousAccountInserted()) {
                 redditDataRoomDatabase.accountDao().insert(Account.getAnonymousAccount());
             }
             redditDataRoomDatabase.multiRedditDao().insert(new MultiReddit(multipath, name, name, description,
-                    null, null, "private", "-", 0, System.currentTimeMillis(), true, false, false));
+                    null, null, "private", accountName, 0, System.currentTimeMillis(), true, false, false));
             List<AnonymousMultiredditSubreddit> anonymousMultiredditSubreddits = new ArrayList<>();
-            for (String s : subreddits) {
-                anonymousMultiredditSubreddits.add(new AnonymousMultiredditSubreddit(multipath, s));
+            for (SubredditWithSelection s : subreddits) {
+                anonymousMultiredditSubreddits.add(new AnonymousMultiredditSubreddit(multipath, s.getQualifiedName()));
             }
             redditDataRoomDatabase.anonymousMultiredditSubredditDao().insertAll(anonymousMultiredditSubreddits);
 

app/src/main/java/eu/toldi/infinityforlemmy/multireddit/EditMultiReddit.java

@@ -11,6 +11,7 @@ import java.util.concurrent.Executor;
 
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
 import eu.toldi.infinityforlemmy.apis.RedditAPI;
+import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -52,10 +53,10 @@ public class EditMultiReddit {
                                                 EditMultiRedditListener editMultiRedditListener) {
         executor.execute(() -> {
             ArrayList<AnonymousMultiredditSubreddit> anonymousMultiredditSubreddits = new ArrayList<>();
-            ArrayList<String> subreddits = multiReddit.getSubreddits();
+            ArrayList<SubredditWithSelection> subreddits = multiReddit.getSubreddits();
             redditDataRoomDatabase.multiRedditDao().insert(multiReddit);
-            for (String s : subreddits) {
-                anonymousMultiredditSubreddits.add(new AnonymousMultiredditSubreddit(multiReddit.getPath(), s));
+            for (SubredditWithSelection s : subreddits) {
+                anonymousMultiredditSubreddits.add(new AnonymousMultiredditSubreddit(multiReddit.getPath(), s.getQualifiedName()));
             }
             redditDataRoomDatabase.anonymousMultiredditSubredditDao().insertAll(anonymousMultiredditSubreddits);
             handler.post(editMultiRedditListener::success);

app/src/main/java/eu/toldi/infinityforlemmy/multireddit/FetchMultiRedditInfo.java

@@ -14,8 +14,9 @@ import java.util.concurrent.Executor;
 
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
 import eu.toldi.infinityforlemmy.apis.RedditAPI;
-import eu.toldi.infinityforlemmy.utils.JSONUtils;
+import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
+import eu.toldi.infinityforlemmy.utils.JSONUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -55,10 +56,8 @@ public class FetchMultiRedditInfo {
             MultiReddit multiReddit = redditDataRoomDatabase.multiRedditDao().getMultiReddit(multipath, "-");
             ArrayList<AnonymousMultiredditSubreddit> anonymousMultiredditSubreddits =
                     (ArrayList<AnonymousMultiredditSubreddit>) redditDataRoomDatabase.anonymousMultiredditSubredditDao().getAllAnonymousMultiRedditSubreddits(multipath);
-            ArrayList<String> subredditNames = new ArrayList<>();
-            for (AnonymousMultiredditSubreddit a : anonymousMultiredditSubreddits) {
-                subredditNames.add(a.getSubredditName());
-            }
+            ArrayList<SubredditWithSelection> subredditNames = new ArrayList<>();
+
             multiReddit.setSubreddits(subredditNames);
             handler.post(() -> fetchMultiRedditInfoListener.success(multiReddit));
         });
@@ -93,11 +92,9 @@ public class FetchMultiRedditInfo {
                 boolean over18 = object.getBoolean(JSONUtils.OVER_18_KEY);
                 boolean isSubscriber = object.getBoolean(JSONUtils.IS_SUBSCRIBER_KEY);
                 boolean isFavorite = object.getBoolean(JSONUtils.IS_FAVORITED_KEY);
-                ArrayList<String> subreddits = new ArrayList<>();
+                ArrayList<SubredditWithSelection> subreddits = new ArrayList<>();
                 JSONArray subredditsArray = object.getJSONArray(JSONUtils.SUBREDDITS_KEY);
-                for (int i = 0; i < subredditsArray.length(); i++) {
-                    subreddits.add(subredditsArray.getJSONObject(i).getString(JSONUtils.NAME_KEY));
-                }
+
 
                 multiReddit = new MultiReddit(path, displayName, name, description, copiedFrom, iconUrl,
                         visibility, owner, nSubscribers, createdUTC, over18, isSubscriber, isFavorite,

app/src/main/java/eu/toldi/infinityforlemmy/multireddit/MultiReddit.java

@@ -12,6 +12,7 @@ import androidx.room.Ignore;
 import java.util.ArrayList;
 
 import eu.toldi.infinityforlemmy.account.Account;
+import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 
 @Entity(tableName = "multi_reddits", primaryKeys = {"path", "username"},
         foreignKeys = @ForeignKey(entity = Account.class, parentColumns = "username",
@@ -48,7 +49,7 @@ public class MultiReddit implements Parcelable {
     @ColumnInfo(name = "is_favorite")
     private boolean isFavorite;
     @Ignore
-    private ArrayList<String> subreddits;
+    private ArrayList<SubredditWithSelection> subreddits;
 
     public MultiReddit(@NonNull String path, @NonNull String displayName, @NonNull String name,
                        String description, String copiedFrom, String iconUrl, String visibility,
@@ -72,7 +73,7 @@ public class MultiReddit implements Parcelable {
     public MultiReddit(@NonNull String path, @NonNull String displayName, @NonNull String name,
                        String description, String copiedFrom, String iconUrl, String visibility,
                        @NonNull String owner, int nSubscribers, long createdUTC, boolean over18,
-                       boolean isSubscriber, boolean isFavorite, ArrayList<String> subreddits) {
+                       boolean isSubscriber, boolean isFavorite, ArrayList<SubredditWithSelection> subreddits) {
         this.displayName = displayName;
         this.name = name;
         this.description = description;
@@ -104,7 +105,7 @@ public class MultiReddit implements Parcelable {
         isSubscriber = in.readByte() != 0;
         isFavorite = in.readByte() != 0;
         subreddits = new ArrayList<>();
-        in.readStringList(subreddits);
+        in.readList(subreddits, SubredditWithSelection.class.getClassLoader());
     }
 
     public static final Creator<MultiReddit> CREATOR = new Creator<>() {
@@ -226,11 +227,11 @@ public class MultiReddit implements Parcelable {
         isFavorite = favorite;
     }
 
-    public ArrayList<String> getSubreddits() {
+    public ArrayList<SubredditWithSelection> getSubreddits() {
         return subreddits;
     }
 
-    public void setSubreddits(ArrayList<String> subreddits) {
+    public void setSubreddits(ArrayList<SubredditWithSelection> subreddits) {
         this.subreddits = subreddits;
     }
 
@@ -254,6 +255,6 @@ public class MultiReddit implements Parcelable {
         parcel.writeByte((byte) (over18 ? 1 : 0));
         parcel.writeByte((byte) (isSubscriber ? 1 : 0));
         parcel.writeByte((byte) (isFavorite ? 1 : 0));
-        parcel.writeStringList(subreddits);
+        parcel.writeList(subreddits);
     }
 }

app/src/main/java/eu/toldi/infinityforlemmy/multireddit/ParseMultiReddit.java

@@ -9,6 +9,7 @@ import org.json.JSONObject;
 import java.util.ArrayList;
 
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
+import eu.toldi.infinityforlemmy.subreddit.SubredditWithSelection;
 import eu.toldi.infinityforlemmy.utils.JSONUtils;
 
 public class ParseMultiReddit {
@@ -47,10 +48,8 @@ public class ParseMultiReddit {
         boolean isFavorited = singleMultiRedditJSON.getBoolean(JSONUtils.IS_FAVORITED_KEY);
 
         JSONArray subredditsArray = singleMultiRedditJSON.getJSONArray(JSONUtils.SUBREDDITS_KEY);
-        ArrayList<String> subreddits = new ArrayList<>();
-        for (int j = 0; j < subredditsArray.length(); j++) {
-            subreddits.add(subredditsArray.getJSONObject(j).getString(JSONUtils.NAME_KEY));
-        }
+        ArrayList<SubredditWithSelection> subreddits = new ArrayList<>();
+
 
         return new MultiReddit(path, displayName, name, description, copiedFrom,
                 iconUrl, visibility, owner, nSubscribers, createdUTC, over18, isSubscriber,

app/src/main/java/eu/toldi/infinityforlemmy/post/FetchPost.java

@@ -8,6 +8,7 @@ import java.util.concurrent.Executor;
 
 import eu.toldi.infinityforlemmy.apis.LemmyAPI;
 import eu.toldi.infinityforlemmy.apis.RedditAPI;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -15,7 +16,7 @@ import retrofit2.Retrofit;
 
 public class FetchPost {
     public static void fetchPost(Executor executor, Handler handler, Retrofit retrofit, String id, String accessToken,
-                                 FetchPostListener fetchPostListener) {
+                                 PostEnricher postEnricher, FetchPostListener fetchPostListener) {
         Call<String> postCall;
         // Use LemmyAPI.postInfo() instead of RedditAPI.getPost()
         postCall = retrofit.create(LemmyAPI.class).postInfo(Integer.parseInt(id), null, accessToken);
@@ -24,7 +25,7 @@ public class FetchPost {
             @Override
             public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
                 if (response.isSuccessful()) {
-                    ParsePost.parsePost(executor, handler, response.body(), new ParsePost.ParsePostListener() {
+                    ParsePost.parsePost(executor, handler, postEnricher, response.body(), new ParsePost.ParsePostListener() {
                         @Override
                         public void onParsePostSuccess(Post post) {
                             fetchPostListener.fetchPostSuccess(post);

app/src/main/java/eu/toldi/infinityforlemmy/post/HistoryPostPagingSource.java

@@ -19,6 +19,7 @@ import java.util.concurrent.Executor;
 
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
 import eu.toldi.infinityforlemmy.apis.RedditAPI;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.postfilter.PostFilter;
 import eu.toldi.infinityforlemmy.readpost.ReadPost;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
@@ -39,10 +40,11 @@ public class HistoryPostPagingSource extends ListenableFuturePagingSource<String
     private String username;
     private int postType;
     private PostFilter postFilter;
+    private PostEnricher postEnricher;
 
     public HistoryPostPagingSource(Retrofit retrofit, Executor executor, RedditDataRoomDatabase redditDataRoomDatabase,
                                    String accessToken, String accountName, SharedPreferences sharedPreferences,
-                                   String username, int postType, PostFilter postFilter) {
+                                   String username, int postType, PostFilter postFilter, PostEnricher postEnricher) {
         this.retrofit = retrofit;
         this.executor = executor;
         this.redditDataRoomDatabase = redditDataRoomDatabase;
@@ -52,6 +54,7 @@ public class HistoryPostPagingSource extends ListenableFuturePagingSource<String
         this.username = username;
         this.postType = postType;
         this.postFilter = postFilter;
+        this.postEnricher = postEnricher;
     }
 
     @Nullable
@@ -92,7 +95,7 @@ public class HistoryPostPagingSource extends ListenableFuturePagingSource<String
             Response<String> response = historyPosts.execute();
             if (response.isSuccessful()) {
                 String responseString = response.body();
-                LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, null);
+                LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, null, postEnricher);
                 if (newPosts == null) {
                     return new LoadResult.Error<>(new Exception("Error parsing posts"));
                 } else {

app/src/main/java/eu/toldi/infinityforlemmy/post/HistoryPostViewModel.java

@@ -17,6 +17,7 @@ import androidx.paging.PagingLiveData;
 import java.util.concurrent.Executor;
 
 import eu.toldi.infinityforlemmy.RedditDataRoomDatabase;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.postfilter.PostFilter;
 import retrofit2.Retrofit;
 
@@ -29,6 +30,7 @@ public class HistoryPostViewModel extends ViewModel {
     private SharedPreferences sharedPreferences;
     private int postType;
     private PostFilter postFilter;
+    private PostEnricher postEnricher;
 
     private LiveData<PagingData<Post>> posts;
 
@@ -36,7 +38,7 @@ public class HistoryPostViewModel extends ViewModel {
 
     public HistoryPostViewModel(Executor executor, Retrofit retrofit, RedditDataRoomDatabase redditDataRoomDatabase,
                                 String accessToken, String accountName, SharedPreferences sharedPreferences,
-                                int postType, PostFilter postFilter) {
+                                int postType, PostFilter postFilter, PostEnricher postEnricher) {
         this.executor = executor;
         this.retrofit = retrofit;
         this.redditDataRoomDatabase = redditDataRoomDatabase;
@@ -45,11 +47,12 @@ public class HistoryPostViewModel extends ViewModel {
         this.sharedPreferences = sharedPreferences;
         this.postType = postType;
         this.postFilter = postFilter;
+        this.postEnricher = postEnricher;
 
         postFilterLiveData = new MutableLiveData<>();
         postFilterLiveData.postValue(postFilter);
 
-        Pager<String, Post> pager = new Pager<>(new PagingConfig(25, 25, false), this::returnPagingSoruce);
+        Pager<String, Post> pager = new Pager<>(new PagingConfig(25, 25, false), this::returnPagingSource);
 
         posts = Transformations.switchMap(postFilterLiveData, postFilterValue -> PagingLiveData.cachedIn(PagingLiveData.getLiveData(pager), ViewModelKt.getViewModelScope(this)));
     }
@@ -58,19 +61,9 @@ public class HistoryPostViewModel extends ViewModel {
         return posts;
     }
 
-    public HistoryPostPagingSource returnPagingSoruce() {
-        HistoryPostPagingSource paging3PagingSource;
-        switch (postType) {
-            case HistoryPostPagingSource.TYPE_READ_POSTS:
-                paging3PagingSource = new HistoryPostPagingSource(retrofit, executor, redditDataRoomDatabase, accessToken, accountName,
-                        sharedPreferences, accountName, postType, postFilter);
-                break;
-            default:
-                paging3PagingSource = new HistoryPostPagingSource(retrofit, executor, redditDataRoomDatabase, accessToken, accountName,
-                        sharedPreferences, accountName, postType, postFilter);
-                break;
-        }
-        return paging3PagingSource;
+    public HistoryPostPagingSource returnPagingSource() {
+        return new HistoryPostPagingSource(retrofit, executor, redditDataRoomDatabase, accessToken, accountName,
+                sharedPreferences, accountName, postType, postFilter, postEnricher);
     }
 
     public void changePostFilter(PostFilter postFilter) {
@@ -86,10 +79,11 @@ public class HistoryPostViewModel extends ViewModel {
         private SharedPreferences sharedPreferences;
         private int postType;
         private PostFilter postFilter;
+        private PostEnricher postEnricher;
 
         public Factory(Executor executor, Retrofit retrofit, RedditDataRoomDatabase redditDataRoomDatabase,
                        String accessToken, String accountName, SharedPreferences sharedPreferences, int postType,
-                       PostFilter postFilter) {
+                       PostFilter postFilter, PostEnricher postEnricher) {
             this.executor = executor;
             this.retrofit = retrofit;
             this.redditDataRoomDatabase = redditDataRoomDatabase;
@@ -98,18 +92,14 @@ public class HistoryPostViewModel extends ViewModel {
             this.sharedPreferences = sharedPreferences;
             this.postType = postType;
             this.postFilter = postFilter;
+            this.postEnricher = postEnricher;
         }
 
         @NonNull
         @Override
         public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
-            if (postType == HistoryPostPagingSource.TYPE_READ_POSTS) {
-                return (T) new HistoryPostViewModel(executor, retrofit, redditDataRoomDatabase, accessToken, accountName, sharedPreferences,
-                        postType, postFilter);
-            } else {
-                return (T) new HistoryPostViewModel(executor, retrofit, redditDataRoomDatabase, accessToken, accountName, sharedPreferences,
-                        postType, postFilter);
-            }
+            return (T) new HistoryPostViewModel(executor, retrofit, redditDataRoomDatabase, accessToken, accountName, sharedPreferences,
+                        postType, postFilter, postEnricher);
         }
     }
 }

app/src/main/java/eu/toldi/infinityforlemmy/post/ParsePost.java

@@ -34,6 +34,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import eu.toldi.infinityforlemmy.community.BasicCommunityInfo;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.postfilter.PostFilter;
 import eu.toldi.infinityforlemmy.user.BasicUserInfo;
 import eu.toldi.infinityforlemmy.utils.JSONUtils;
@@ -45,7 +46,8 @@ import eu.toldi.infinityforlemmy.utils.Utils;
  */
 
 public class ParsePost {
-    public static LinkedHashSet<Post> parsePostsSync(String response, int nPosts, PostFilter postFilter, List<String> readPostList) {
+    public static LinkedHashSet<Post> parsePostsSync(String response, int nPosts, PostFilter postFilter,
+                                                     List<String> readPostList, PostEnricher postEnricher) {
         LinkedHashSet<Post> newPosts = new LinkedHashSet<>();
         try {
             JSONObject jsonResponse = new JSONObject(response);
@@ -80,6 +82,8 @@ public class ParsePost {
                 }
             }
 
+            postEnricher.enrich(newPosts);
+
             return newPosts;
         } catch (JSONException e) {
             e.printStackTrace();
@@ -87,21 +91,9 @@ public class ParsePost {
         }
     }
 
-    public static String getLastItem(String response) {
-        try {
-            JSONObject object = new JSONObject(response).getJSONObject(JSONUtils.DATA_KEY);
-            return object.isNull(JSONUtils.AFTER_KEY) ? null : object.getString(JSONUtils.AFTER_KEY);
-        } catch (JSONException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-
-    public static void parsePost(Executor executor, Handler handler, String response, ParsePostListener parsePostListener) {
-        PostFilter postFilter = new PostFilter();
-        postFilter.allowNSFW = true;
 
+    public static void parsePost(Executor executor, Handler handler, PostEnricher postEnricher,
+                                 String response, ParsePostListener parsePostListener) {
         executor.execute(() -> {
             try {
                 JSONObject allData = new JSONObject(response).getJSONObject("post_view");
@@ -111,6 +103,7 @@ public class ParsePost {
                 }
 
                 Post post = parseBasicData(allData);
+                postEnricher.enrich(List.of(post));
                 handler.post(() -> parsePostListener.onParsePostSuccess(post));
             } catch (JSONException e) {
                 e.printStackTrace();
@@ -188,7 +181,7 @@ public class ParsePost {
         boolean nsfw = post.getBoolean("nsfw");
         boolean locked = post.getBoolean("locked");
         boolean saved = data.getBoolean("saved");
-        String distinguished = (creator.getBoolean("admin") ? "admin" : "");
+        String distinguished = creator.optBoolean("admin") ? "admin" : "";
         String suggestedSort = "";
         ArrayList<Post.Preview> previews = new ArrayList<>();
         if (!post.isNull("thumbnail_url")) {

app/src/main/java/eu/toldi/infinityforlemmy/post/PostPagingSource.java

@@ -1,6 +1,7 @@
 package eu.toldi.infinityforlemmy.post;
 
 import android.content.SharedPreferences;
+import android.os.Build;
 
 import androidx.annotation.NonNull;
 import androidx.paging.ListenableFuturePagingSource;
@@ -13,14 +14,17 @@ import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.Executor;
+import java.util.regex.Pattern;
 
 import eu.toldi.infinityforlemmy.RetrofitHolder;
 import eu.toldi.infinityforlemmy.SortType;
 import eu.toldi.infinityforlemmy.apis.LemmyAPI;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.postfilter.PostFilter;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 import retrofit2.HttpException;
@@ -57,6 +61,7 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
     private List<String> readPostList;
     private String userWhere;
     private String multiRedditPath;
+    private final PostEnricher postEnricher;
     private LinkedHashSet<Post> postLinkedHashSet;
 
     private int page = 1;
@@ -64,7 +69,8 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
     PostPagingSource(Executor executor, RetrofitHolder retrofit, String accessToken, String accountName,
                      SharedPreferences sharedPreferences,
                      SharedPreferences postFeedScrolledPositionSharedPreferences, int postType,
-                     SortType sortType, PostFilter postFilter, List<String> readPostList, String option) {
+                     SortType sortType, PostFilter postFilter, List<String> readPostList, String option,
+                     PostEnricher postEnricher) {
         this.executor = executor;
         this.retrofit = retrofit;
         this.accessToken = accessToken;
@@ -76,13 +82,14 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
         this.sortType = sortType == null ? new SortType(SortType.Type.ACTIVE) : sortType;
         this.postFilter = postFilter;
         this.readPostList = readPostList;
+        this.postEnricher = postEnricher;
         postLinkedHashSet = new LinkedHashSet<>();
     }
 
     PostPagingSource(Executor executor, RetrofitHolder retrofit, String accessToken, String accountName,
                      SharedPreferences sharedPreferences, SharedPreferences postFeedScrolledPositionSharedPreferences,
                      String path, int postType, SortType sortType, PostFilter postFilter,
-                     List<String> readPostList) {
+                     List<String> readPostList, PostEnricher postEnricher) {
         this.executor = executor;
         this.retrofit = retrofit;
         this.accessToken = accessToken;
@@ -92,15 +99,7 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
         if (postType == TYPE_SUBREDDIT || postType == TYPE_ANONYMOUS_FRONT_PAGE) {
             this.subredditOrUserName = path;
         } else {
-            if (sortType != null) {
-                if (path.endsWith("/")) {
-                    multiRedditPath = path + sortType.getType().value;
-                } else {
-                    multiRedditPath = path + "/" + sortType.getType().value;
-                }
-            } else {
-                multiRedditPath = path;
-            }
+            multiRedditPath = path;
         }
         this.postType = postType;
         if (sortType == null) {
@@ -114,13 +113,14 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
         }
         this.postFilter = postFilter;
         this.readPostList = readPostList;
+        this.postEnricher = postEnricher;
         postLinkedHashSet = new LinkedHashSet<>();
     }
 
     PostPagingSource(Executor executor, RetrofitHolder retrofit, String accessToken, String accountName,
                      SharedPreferences sharedPreferences, SharedPreferences postFeedScrolledPositionSharedPreferences,
                      String subredditOrUserName, int postType, SortType sortType, PostFilter postFilter,
-                     String where, List<String> readPostList) {
+                     String where, List<String> readPostList, PostEnricher postEnricher) {
         this.executor = executor;
         this.retrofit = retrofit;
         this.accessToken = accessToken;
@@ -133,13 +133,14 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
         this.postFilter = postFilter;
         userWhere = where;
         this.readPostList = readPostList;
+        this.postEnricher = postEnricher;
         postLinkedHashSet = new LinkedHashSet<>();
     }
 
     PostPagingSource(Executor executor, RetrofitHolder retrofit, String accessToken, String accountName,
                      SharedPreferences sharedPreferences, SharedPreferences postFeedScrolledPositionSharedPreferences,
                      String subredditOrUserName, String query, String trendingSource, int postType,
-                     SortType sortType, PostFilter postFilter, List<String> readPostList) {
+                     SortType sortType, PostFilter postFilter, List<String> readPostList, PostEnricher postEnricher) {
         this.executor = executor;
         this.retrofit = retrofit;
         this.accessToken = accessToken;
@@ -152,8 +153,9 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
         this.postType = postType;
         this.sortType = sortType == null ? new SortType(SortType.Type.TOP) : sortType;
         this.postFilter = postFilter;
-        postLinkedHashSet = new LinkedHashSet<>();
         this.readPostList = readPostList;
+        this.postEnricher = postEnricher;
+        postLinkedHashSet = new LinkedHashSet<>();
     }
 
     @Nullable
@@ -176,21 +178,18 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
                 return loadSearchPosts(loadParams, api);
             case TYPE_SUBREDDIT:
                 return loadSubredditPosts(loadParams, api);
-            default:
+            case TYPE_MULTI_REDDIT:
+                return loadMultipleSubredditPosts(loadParams, api, List.of(multiRedditPath.split(Pattern.quote(","))));
             case TYPE_ANONYMOUS_FRONT_PAGE:
-                // Return a dummy result
-                return Futures.immediateFuture(new LoadResult.Page<>(new ArrayList<>(), null, null));
-          /*  case TYPE_MULTI_REDDIT:
-                return loadMultiRedditPosts(loadParams, api);
             default:
-                return loadAnonymousHomePosts(loadParams, api);*/
+                return loadAnonymousHomePosts(loadParams, api);
         }
     }
 
     public LoadResult<Integer, Post> transformData(Response<String> response) {
         if (response.isSuccessful()) {
             String responseString = response.body();
-            LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, readPostList);
+            LinkedHashSet<Post> newPosts = ParsePost.parsePostsSync(responseString, -1, postFilter, readPostList, postEnricher);
 
             if (newPosts == null) {
                 return new LoadResult.Error<>(new Exception("Error parsing posts"));
@@ -236,7 +235,7 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
         }
         String feed_type = Objects.equals(subredditOrUserName, "all") ? "All" : Objects.equals(subredditOrUserName, "local") ? "Local" : "Subscribed";
 
-        bestPost = api.getPosts(feed_type,sortType.getType().value,page,25,null,null,false,accessToken);
+        bestPost = api.getPostsListenableFuture(feed_type, sortType.getType().value, page, 25, null, null, false, accessToken);
 
         ListenableFuture<LoadResult<Integer, Post>> pageFuture = Futures.transform(bestPost, this::transformData, executor);
 
@@ -251,7 +250,7 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
     private ListenableFuture<LoadResult<Integer, Post>> loadSubredditPosts(@NonNull LoadParams<Integer> loadParams, LemmyAPI api) {
         ListenableFuture<Response<String>> subredditPost;
 
-        subredditPost = api.getPosts(null,sortType.getType().value,loadParams.getKey(),25,null,subredditOrUserName,false,accessToken);
+        subredditPost = api.getPostsListenableFuture(null, sortType.getType().value, loadParams.getKey(), 25, null, subredditOrUserName, false, accessToken);
 
 
         ListenableFuture<LoadResult<Integer, Post>> pageFuture = Futures.transform(subredditPost, this::transformData, executor);
@@ -266,7 +265,7 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
 
     private ListenableFuture<LoadResult<Integer, Post>> loadUserPosts(@NonNull LoadParams<Integer> loadParams, LemmyAPI api) {
         ListenableFuture<Response<String>> userPosts;
-        userPosts = api.getUserPosts(subredditOrUserName, sortType.getType().value, loadParams.getKey(), 25, userWhere.equals(USER_WHERE_SAVED), accessToken);
+        userPosts = api.getUserPostsListenableFuture(subredditOrUserName, sortType.getType().value, loadParams.getKey(), 25, userWhere.equals(USER_WHERE_SAVED), accessToken);
 
 
         ListenableFuture<LoadResult<Integer, Post>> pageFuture = Futures.transform(userPosts, this::transformData, executor);
@@ -294,6 +293,48 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
         return Futures.catching(partialLoadResultFuture,
                 IOException.class, LoadResult.Error::new, executor);
     }
+
+    private ListenableFuture<LoadResult<Integer, Post>> loadMultipleSubredditPosts(@NonNull LoadParams<Integer> loadParams, LemmyAPI api, List<String> communities) {
+        List<ListenableFuture<LoadResult<Integer, Post>>> futures = new ArrayList<>();
+
+        for (String community : communities) {
+            ListenableFuture<Response<String>> subredditPost;
+
+            subredditPost = api.getPostsListenableFuture(null, sortType.getType().value, loadParams.getKey(), 25, null, community, false, accessToken);
+
+            ListenableFuture<LoadResult<Integer, Post>> communityFuture = Futures.transform(subredditPost,
+                    this::transformData, executor);
+
+            ListenableFuture<LoadResult<Integer, Post>> partialLoadResultFuture =
+                    Futures.catching(communityFuture, HttpException.class,
+                            LoadResult.Error::new, executor);
+
+            futures.add(Futures.catching(partialLoadResultFuture,
+                    IOException.class, LoadResult.Error::new, executor));
+        }
+
+        return Futures.transform(Futures.successfulAsList(futures),
+                results -> {
+                    List<Post> combinedPosts = new ArrayList<>();
+                    for (LoadResult<Integer, Post> result : results) {
+                        if (result instanceof LoadResult.Page) {
+                            combinedPosts.addAll(((LoadResult.Page<Integer, Post>) result).getData());
+                        } else if (result instanceof LoadResult.Error) {
+                            // Handle or propagate the error if needed
+                            return result;
+                        }
+                    }
+
+                    if (sortType.getType().equals(SortType.Type.NEW)) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            combinedPosts.sort((o1, o2) -> Long.compare(o2.getPostTimeMillis(), o1.getPostTimeMillis()));
+                        }
+                    }
+                    return new LoadResult.Page<>(combinedPosts, null, null);
+                }, executor);
+    }
+
+
 /*
     private ListenableFuture<LoadResult<String, Post>> loadMultiRedditPosts(@NonNull LoadParams<String> loadParams, LemmyAPI api) {
         ListenableFuture<Response<String>> multiRedditPosts;
@@ -306,20 +347,6 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
 
         ListenableFuture<LoadResult<String, Post>> pageFuture = Futures.transform(multiRedditPosts, this::transformData, executor);
 
-        ListenableFuture<LoadResult<String, Post>> partialLoadResultFuture =
-                Futures.catching(pageFuture, HttpException.class,
-                        LoadResult.Error::new, executor);
-
-        return Futures.catching(partialLoadResultFuture,
-                IOException.class, LoadResult.Error::new, executor);
-    }
-
-    private ListenableFuture<LoadResult<String, Post>> loadAnonymousHomePosts(@NonNull LoadParams<String> loadParams, LemmyAPI api) {
-        ListenableFuture<Response<String>> anonymousHomePosts;
-        anonymousHomePosts = api.getSubredditBestPostsListenableFuture(subredditOrUserName, sortType.getType(), sortType.getTime(), loadParams.getKey());
-
-        ListenableFuture<LoadResult<String, Post>> pageFuture = Futures.transform(anonymousHomePosts, this::transformData, executor);
-
         ListenableFuture<LoadResult<String, Post>> partialLoadResultFuture =
                 Futures.catching(pageFuture, HttpException.class,
                         LoadResult.Error::new, executor);
@@ -328,6 +355,14 @@ public class PostPagingSource extends ListenableFuturePagingSource<Integer, Post
                 IOException.class, LoadResult.Error::new, executor);
     }*/
 
+    private ListenableFuture<LoadResult<Integer, Post>> loadAnonymousHomePosts(@NonNull LoadParams<Integer> loadParams, LemmyAPI api) {
+        if (subredditOrUserName == null) {
+            // Return empty list
+            return Futures.immediateFuture(new LoadResult.Page<>(new ArrayList<>(), null, null));
+        }
+        return loadMultipleSubredditPosts(loadParams, api, Arrays.asList(subredditOrUserName.split(Pattern.quote(","))));
+    }
+
     @Override
     public boolean getKeyReuseSupported() {
         //TODO: Figure out why this is needed

app/src/main/java/eu/toldi/infinityforlemmy/post/PostViewModel.java

@@ -23,6 +23,7 @@ import java.util.concurrent.Executor;
 
 import eu.toldi.infinityforlemmy.RetrofitHolder;
 import eu.toldi.infinityforlemmy.SortType;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.postfilter.PostFilter;
 import eu.toldi.infinityforlemmy.utils.SharedPreferencesUtils;
 
@@ -41,6 +42,7 @@ public class PostViewModel extends ViewModel {
     private PostFilter postFilter;
     private String userWhere;
     private List<String> readPostList;
+    private PostEnricher postEnricher;
     private MutableLiveData<Boolean> currentlyReadPostIdsLiveData = new MutableLiveData<>();
 
     private LiveData<PagingData<Post>> posts;
@@ -53,7 +55,7 @@ public class PostViewModel extends ViewModel {
     public PostViewModel(Executor executor, RetrofitHolder retrofit, String accessToken, String accountName,
                          SharedPreferences sharedPreferences, SharedPreferences postFeedScrolledPositionSharedPreferences,
                          @Nullable SharedPreferences postHistorySharedPreferences, int postType,
-                         SortType sortType, PostFilter postFilter, List<String> readPostList, String option) {
+                         SortType sortType, PostFilter postFilter, List<String> readPostList, String option, PostEnricher postEnricher) {
         this.executor = executor;
         this.retrofit = retrofit;
         this.accessToken = accessToken;
@@ -65,6 +67,7 @@ public class PostViewModel extends ViewModel {
         this.postFilter = postFilter;
         this.readPostList = readPostList;
         this.name = option;
+        this.postEnricher = postEnricher;
 
         sortTypeLiveData = new MutableLiveData<>();
         sortTypeLiveData.postValue(sortType);
@@ -95,7 +98,7 @@ public class PostViewModel extends ViewModel {
     public PostViewModel(Executor executor, RetrofitHolder retrofit, String accessToken, String accountName,
                          SharedPreferences sharedPreferences, SharedPreferences postFeedScrolledPositionSharedPreferences,
                          @Nullable SharedPreferences postHistorySharedPreferences, String subredditName, int postType,
-                         SortType sortType, PostFilter postFilter, List<String> readPostList) {
+                         SortType sortType, PostFilter postFilter, List<String> readPostList, PostEnricher postEnricher) {
         this.executor = executor;
         this.retrofit = retrofit;
         this.accessToken = accessToken;
@@ -107,6 +110,7 @@ public class PostViewModel extends ViewModel {
         this.postFilter = postFilter;
         this.readPostList = readPostList;
         this.name = subredditName;
+        this.postEnricher = postEnricher;
 
         sortTypeLiveData = new MutableLiveData<>();
         sortTypeLiveData.postValue(sortType);
@@ -139,7 +143,7 @@ public class PostViewModel extends ViewModel {
                          SharedPreferences postFeedScrolledPositionSharedPreferences,
                          @Nullable SharedPreferences postHistorySharedPreferences, String username,
                          int postType, SortType sortType, PostFilter postFilter, String userWhere,
-                         List<String> readPostList) {
+                         List<String> readPostList, PostEnricher postEnricher) {
         this.executor = executor;
         this.retrofit = retrofit;
         this.accessToken = accessToken;
@@ -152,6 +156,7 @@ public class PostViewModel extends ViewModel {
         this.readPostList = readPostList;
         this.name = username;
         this.userWhere = userWhere;
+        this.postEnricher = postEnricher;
 
         sortTypeLiveData = new MutableLiveData<>();
         sortTypeLiveData.postValue(sortType);
@@ -183,7 +188,7 @@ public class PostViewModel extends ViewModel {
                          SharedPreferences sharedPreferences, SharedPreferences postFeedScrolledPositionSharedPreferences,
                          @Nullable SharedPreferences postHistorySharedPreferences, String subredditName, String query,
                          String trendingSource, int postType, SortType sortType, PostFilter postFilter,
-                         List<String> readPostList) {
+                         List<String> readPostList, PostEnricher postEnricher) {
         this.executor = executor;
         this.retrofit = retrofit;
         this.accessToken = accessToken;
@@ -197,6 +202,7 @@ public class PostViewModel extends ViewModel {
         this.name = subredditName;
         this.query = query;
         this.trendingSource = trendingSource;
+        this.postEnricher = postEnricher;
 
         sortTypeLiveData = new MutableLiveData<>();
         sortTypeLiveData.postValue(sortType);
@@ -238,25 +244,25 @@ public class PostViewModel extends ViewModel {
             case PostPagingSource.TYPE_FRONT_PAGE:
                 paging3PagingSource = new PostPagingSource(executor, retrofit, accessToken, accountName,
                         sharedPreferences, postFeedScrolledPositionSharedPreferences, postType, sortType,
-                        postFilter, readPostList,name);
+                        postFilter, readPostList, name, postEnricher);
                 break;
             case PostPagingSource.TYPE_SUBREDDIT:
             case PostPagingSource.TYPE_MULTI_REDDIT:
             case PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE:
                 paging3PagingSource = new PostPagingSource(executor, retrofit, accessToken, accountName,
                         sharedPreferences, postFeedScrolledPositionSharedPreferences, name, postType,
-                        sortType, postFilter, readPostList);
+                        sortType, postFilter, readPostList, postEnricher);
                 break;
             case PostPagingSource.TYPE_SEARCH:
                 paging3PagingSource = new PostPagingSource(executor, retrofit, accessToken, accountName,
                         sharedPreferences, postFeedScrolledPositionSharedPreferences, name, query, trendingSource,
-                        postType, sortType, postFilter, readPostList);
+                        postType, sortType, postFilter, readPostList, postEnricher);
                 break;
             default:
                 //User
                 paging3PagingSource = new PostPagingSource(executor, retrofit, accessToken, accountName,
                         sharedPreferences, postFeedScrolledPositionSharedPreferences, name, postType,
-                        sortType, postFilter, userWhere, readPostList);
+                        sortType, postFilter, userWhere, readPostList, postEnricher);
                 break;
         }
         return paging3PagingSource;
@@ -291,11 +297,12 @@ public class PostViewModel extends ViewModel {
         private PostFilter postFilter;
         private String userWhere;
         private List<String> readPostList;
+        private PostEnricher postEnricher;
 
         public Factory(Executor executor, RetrofitHolder retrofit, String accessToken, String accountName,
                        SharedPreferences sharedPreferences, SharedPreferences postFeedScrolledPositionSharedPreferences,
                        SharedPreferences postHistorySharedPreferences, int postType, SortType sortType,
-                       PostFilter postFilter, List<String> readPostList, String option) {
+                       PostFilter postFilter, List<String> readPostList, String option, PostEnricher postEnricher) {
             this.executor = executor;
             this.retrofit = retrofit;
             this.accessToken = accessToken;
@@ -308,12 +315,13 @@ public class PostViewModel extends ViewModel {
             this.postFilter = postFilter;
             this.readPostList = readPostList;
             this.name = option;
+            this.postEnricher = postEnricher;
         }
 
         public Factory(Executor executor, RetrofitHolder retrofit, String accessToken, String accountName,
                        SharedPreferences sharedPreferences, SharedPreferences postFeedScrolledPositionSharedPreferences,
                        SharedPreferences postHistorySharedPreferences, String name, int postType, SortType sortType,
-                       PostFilter postFilter, List<String> readPostList) {
+                       PostFilter postFilter, List<String> readPostList, PostEnricher postEnricher) {
             this.executor = executor;
             this.retrofit = retrofit;
             this.accessToken = accessToken;
@@ -326,13 +334,15 @@ public class PostViewModel extends ViewModel {
             this.sortType = sortType;
             this.postFilter = postFilter;
             this.readPostList = readPostList;
+            this.postEnricher = postEnricher;
         }
 
         //User posts
         public Factory(Executor executor, RetrofitHolder retrofit, String accessToken, String accountName,
                        SharedPreferences sharedPreferences, SharedPreferences postFeedScrolledPositionSharedPreferences,
                        SharedPreferences postHistorySharedPreferences, String username, int postType,
-                       SortType sortType, PostFilter postFilter, String where, List<String> readPostList) {
+                       SortType sortType, PostFilter postFilter, String where, List<String> readPostList,
+                       PostEnricher postEnricher) {
             this.executor = executor;
             this.retrofit = retrofit;
             this.accessToken = accessToken;
@@ -346,12 +356,14 @@ public class PostViewModel extends ViewModel {
             this.postFilter = postFilter;
             userWhere = where;
             this.readPostList = readPostList;
+            this.postEnricher = postEnricher;
         }
 
         public Factory(Executor executor, RetrofitHolder retrofit, String accessToken, String accountName,
                        SharedPreferences sharedPreferences, SharedPreferences postFeedScrolledPositionSharedPreferences,
                        SharedPreferences postHistorySharedPreferences, String name, String query, String trendingSource,
-                       int postType, SortType sortType, PostFilter postFilter, List<String> readPostList) {
+                       int postType, SortType sortType, PostFilter postFilter, List<String> readPostList,
+                       PostEnricher postEnricher) {
             this.executor = executor;
             this.retrofit = retrofit;
             this.accessToken = accessToken;
@@ -366,19 +378,23 @@ public class PostViewModel extends ViewModel {
             this.sortType = sortType;
             this.postFilter = postFilter;
             this.readPostList = readPostList;
+            this.postEnricher = postEnricher;
         }
 
         //Anonymous Front Page
         public Factory(Executor executor, RetrofitHolder retrofit, SharedPreferences sharedPreferences,
-                       String concatenatedSubredditNames, int postType, SortType sortType, PostFilter postFilter, String opt) {
+                       String concatenatedSubredditNames, int postType, SortType sortType, PostFilter postFilter,
+                       String opt, PostEnricher postEnricher) {
             this.executor = executor;
             this.retrofit = retrofit;
             this.sharedPreferences = sharedPreferences;
+            // TODO is this used? because it is getting overwritten with opt
             this.name = concatenatedSubredditNames;
             this.postType = postType;
             this.sortType = sortType;
             this.postFilter = postFilter;
             this.name = opt;
+            this.postEnricher = postEnricher;
         }
 
         @NonNull
@@ -387,23 +403,23 @@ public class PostViewModel extends ViewModel {
             if (postType == PostPagingSource.TYPE_FRONT_PAGE) {
                 return (T) new PostViewModel(executor, retrofit, accessToken, accountName, sharedPreferences,
                         postFeedScrolledPositionSharedPreferences, postHistorySharedPreferences, postType,
-                        sortType, postFilter, readPostList,name);
+                        sortType, postFilter, readPostList,name, postEnricher);
             } else if (postType == PostPagingSource.TYPE_SEARCH) {
                 return (T) new PostViewModel(executor, retrofit, accessToken, accountName, sharedPreferences,
                         postFeedScrolledPositionSharedPreferences, postHistorySharedPreferences, name, query,
-                        trendingSource, postType, sortType, postFilter, readPostList);
+                        trendingSource, postType, sortType, postFilter, readPostList, postEnricher);
             } else if (postType == PostPagingSource.TYPE_SUBREDDIT || postType == PostPagingSource.TYPE_MULTI_REDDIT) {
                 return (T) new PostViewModel(executor, retrofit, accessToken, accountName, sharedPreferences,
                         postFeedScrolledPositionSharedPreferences, postHistorySharedPreferences, name,
-                        postType, sortType, postFilter, readPostList);
+                        postType, sortType, postFilter, readPostList, postEnricher);
             } else if (postType == PostPagingSource.TYPE_ANONYMOUS_FRONT_PAGE) {
                 return (T) new PostViewModel(executor, retrofit, null, null, sharedPreferences,
                         null, null, name, postType, sortType,
-                        postFilter, null);
+                        postFilter, null, postEnricher);
             } else {
                 return (T) new PostViewModel(executor, retrofit, accessToken, accountName, sharedPreferences,
                         postFeedScrolledPositionSharedPreferences, postHistorySharedPreferences, name,
-                        postType, sortType, postFilter, userWhere, readPostList);
+                        postType, sortType, postFilter, userWhere, readPostList, postEnricher);
             }
         }
     }

app/src/main/java/eu/toldi/infinityforlemmy/post/SubmitPost.java

@@ -15,6 +15,7 @@ import eu.toldi.infinityforlemmy.Flair;
 import eu.toldi.infinityforlemmy.RetrofitHolder;
 import eu.toldi.infinityforlemmy.apis.LemmyAPI;
 import eu.toldi.infinityforlemmy.dto.SubmitPostDTO;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
 import eu.toldi.infinityforlemmy.utils.UploadImageUtils;
 import retrofit2.Call;
@@ -25,22 +26,24 @@ public class SubmitPost {
     public static void submitTextOrLinkPost(Executor executor, Handler handler, Retrofit oauthRetrofit, String accessToken,
                                             int communityId, String title, String body, String url,
                                             Flair flair, boolean isSpoiler, boolean isNSFW,
-                                            boolean receivePostReplyNotifications, String kind,
+                                            boolean receivePostReplyNotifications, String kind, PostEnricher postEnricher,
                                             SubmitPostListener submitPostListener) {
         submitPost(executor, handler, oauthRetrofit, accessToken, communityId, title, body,
-                isNSFW, receivePostReplyNotifications, kind, url, submitPostListener);
+                isNSFW, receivePostReplyNotifications, kind, url, postEnricher, submitPostListener);
     }
 
     public static void submitImagePost(Executor executor, Handler handler, RetrofitHolder mRetrofit,
                                        String accessToken, int communityId, String title, String body, Bitmap image,
                                        Flair flair, boolean isSpoiler, boolean isNSFW,
-                                       boolean receivePostReplyNotifications, SubmitPostListener submitPostListener) {
+                                       boolean receivePostReplyNotifications, PostEnricher postEnricher,
+                                       SubmitPostListener submitPostListener) {
         try {
             String imageUrlOrError = UploadImageUtils.uploadImage(mRetrofit, accessToken, image);
             if (imageUrlOrError != null && !imageUrlOrError.startsWith("Error: ")) {
                 submitPost(executor, handler, mRetrofit.getRetrofit(), accessToken,
                         communityId, title, body, isNSFW,
-                        receivePostReplyNotifications, APIUtils.KIND_IMAGE, imageUrlOrError, submitPostListener);
+                        receivePostReplyNotifications, APIUtils.KIND_IMAGE, imageUrlOrError,
+                        postEnricher, submitPostListener);
             } else {
                 submitPostListener.submitFailed(imageUrlOrError);
             }
@@ -53,17 +56,18 @@ public class SubmitPost {
     public static void submitCrosspost(Executor executor, Handler handler, Retrofit oauthRetrofit, String accessToken,
                                        int communityId, String title, String crosspostFullname,
                                        Flair flair, boolean isSpoiler, boolean isNSFW,
-                                       boolean receivePostReplyNotifications, String kind,
+                                       boolean receivePostReplyNotifications, String kind, PostEnricher postEnricher,
                                        SubmitPostListener submitPostListener) {
         submitPost(executor, handler, oauthRetrofit, accessToken, communityId, title, crosspostFullname,
-                isNSFW, receivePostReplyNotifications, kind, null, submitPostListener);
+                isNSFW, receivePostReplyNotifications, kind, null, postEnricher, submitPostListener);
     }
 
     private static void submitPost(Executor executor, Handler handler, Retrofit oauthRetrofit, String accessToken,
                                    int communityId, String title, String content,
                                    boolean isNSFW,
                                    boolean receivePostReplyNotifications, String kind,
-                                   @Nullable String posterUrl, SubmitPostListener submitPostListener) {
+                                   @Nullable String posterUrl, PostEnricher postEnricher,
+                                   SubmitPostListener submitPostListener) {
         LemmyAPI api = oauthRetrofit.create(LemmyAPI.class);
 
 
@@ -73,7 +77,7 @@ public class SubmitPost {
             Response<String> response = submitPostCall.execute();
             if (response.isSuccessful()) {
                 getSubmittedPost(executor, handler, response.body(), kind, oauthRetrofit, accessToken,
-                        submitPostListener);
+                        postEnricher, submitPostListener);
             } else {
                 submitPostListener.submitFailed(response.message());
             }
@@ -84,10 +88,10 @@ public class SubmitPost {
     }
 
     private static void getSubmittedPost(Executor executor, Handler handler, String response, String kind,
-                                         Retrofit oauthRetrofit, String accessToken,
+                                         Retrofit oauthRetrofit, String accessToken, PostEnricher postEnricher,
                                          SubmitPostListener submitPostListener) throws JSONException, IOException {
 
-        ParsePost.parsePost(executor, handler, response, new ParsePost.ParsePostListener() {
+        ParsePost.parsePost(executor, handler, postEnricher, response, new ParsePost.ParsePostListener() {
             @Override
             public void onParsePostSuccess(Post post) {
                 submitPostListener.submitSuccessful(post);

app/src/main/java/eu/toldi/infinityforlemmy/services/SubmitPostService.java

@@ -54,6 +54,7 @@ import eu.toldi.infinityforlemmy.events.SubmitPollPostEvent;
 import eu.toldi.infinityforlemmy.events.SubmitTextOrLinkPostEvent;
 import eu.toldi.infinityforlemmy.post.Post;
 import eu.toldi.infinityforlemmy.post.SubmitPost;
+import eu.toldi.infinityforlemmy.post.enrich.PostEnricher;
 import eu.toldi.infinityforlemmy.utils.APIUtils;
 import eu.toldi.infinityforlemmy.utils.JSONUtils;
 import eu.toldi.infinityforlemmy.utils.NotificationUtils;
@@ -102,6 +103,8 @@ public class SubmitPostService extends Service {
     CustomThemeWrapper mCustomThemeWrapper;
     @Inject
     Executor mExecutor;
+    @Inject
+    PostEnricher postEnricher;
     private Handler handler;
     private ServiceHandler serviceHandler;
 
@@ -221,7 +224,7 @@ public class SubmitPostService extends Service {
                                       String kind) {
         SubmitPost.submitTextOrLinkPost(mExecutor, handler, newAuthenticatorOauthRetrofit, selectedAccount.getAccessToken(),
                 communityId, title, body, url, flair, isSpoiler,
-                isNSFW, receivePostReplyNotifications, kind, new SubmitPost.SubmitPostListener() {
+                isNSFW, receivePostReplyNotifications, kind, postEnricher, new SubmitPost.SubmitPostListener() {
                     @Override
                     public void submitSuccessful(Post post) {
                         handler.post(() -> EventBus.getDefault().post(new SubmitTextOrLinkPostEvent(true, post, null)));
@@ -243,7 +246,7 @@ public class SubmitPostService extends Service {
                                  String title, String content, Flair flair, boolean isSpoiler, boolean isNSFW,
                                  boolean receivePostReplyNotifications) {
         SubmitPost.submitCrosspost(executor, handler, newAuthenticatorOauthRetrofit, selectedAccount.getAccessToken(), communityId, title,
-                content, flair, isSpoiler, isNSFW, receivePostReplyNotifications, APIUtils.KIND_CROSSPOST,
+                content, flair, isSpoiler, isNSFW, receivePostReplyNotifications, APIUtils.KIND_CROSSPOST, postEnricher,
                 new SubmitPost.SubmitPostListener() {
                     @Override
                     public void submitSuccessful(Post post) {
@@ -266,7 +269,8 @@ public class SubmitPostService extends Service {
         try {
             Bitmap resource = Glide.with(this).asBitmap().load(mediaUri).submit().get();
             SubmitPost.submitImagePost(mExecutor, handler, newAuthenticatorOauthRetrofit,
-                    selectedAccount.getAccessToken(), communityId, title, body, resource, flair, isSpoiler, isNSFW, receivePostReplyNotifications,
+                    selectedAccount.getAccessToken(), communityId, title, body, resource, flair, isSpoiler,
+                    isNSFW, receivePostReplyNotifications, postEnricher,
                     new SubmitPost.SubmitPostListener() {
                         @Override
                         public void submitSuccessful(Post post) {

app/src/main/java/eu/toldi/infinityforlemmy/site/SiteInfo.java

@@ -20,13 +20,16 @@ public class SiteInfo {
     private boolean enable_nsfw;
     private boolean community_creation_admin_only;
 
+    private String version;
+
     private List<BasicUserInfo> admins;
 
     SiteStatistics siteStatistics;
 
-    public SiteInfo(int id, String name, String sidebar, String description, boolean enable_downvotes, boolean enable_nsfw, boolean community_creation_admin_only, List<BasicUserInfo> admins, SiteStatistics siteStatistics) {
+    public SiteInfo(int id, String name, String version, String sidebar, String description, boolean enable_downvotes, boolean enable_nsfw, boolean community_creation_admin_only, List<BasicUserInfo> admins, SiteStatistics siteStatistics) {
         this.id = id;
         this.name = name;
+        this.version = version;
         this.sidebar = sidebar;
         this.description = description;
         this.enable_downvotes = enable_downvotes;
@@ -72,6 +75,10 @@ public class SiteInfo {
         return siteStatistics;
     }
 
+    public String getVersion() {
+        return version;
+    }
+
     public static SiteInfo parseSiteInfo(String siteInfoJson) {
         try {
             JSONObject siteInfo = new JSONObject(siteInfoJson);
@@ -84,6 +91,7 @@ public class SiteInfo {
             String sidebar = null;
             if (site.has("sidebar"))
                 sidebar = site.getString("sidebar");
+            String version = siteInfo.getString("version");
 
             String description = null;
             if (site.has("description"))
@@ -106,7 +114,7 @@ public class SiteInfo {
                 }
             }
 
-            return new SiteInfo(id, name, sidebar, description, enable_downvotes, enable_nsfw, community_creation_admin_only, admins, SiteStatistics.parseSiteStatistics(counts));
+            return new SiteInfo(id, name, version, sidebar, description, enable_downvotes, enable_nsfw, community_creation_admin_only, admins, SiteStatistics.parseSiteStatistics(counts));
         } catch (JSONException e) {
             e.printStackTrace();
             return null;

app/src/main/java/eu/toldi/infinityforlemmy/subreddit/SubredditWithSelection.java

@@ -9,21 +9,26 @@ import java.util.ArrayList;
 import java.util.List;
 
 import eu.toldi.infinityforlemmy.subscribedsubreddit.SubscribedSubredditData;
+import eu.toldi.infinityforlemmy.utils.LemmyUtils;
 
 public class SubredditWithSelection implements Parcelable {
-    private String name;
-    private String iconUrl;
+    private final String name;
+    private final String iconUrl;
+
+    private final String qualifiedName;
     private boolean selected;
 
-    public SubredditWithSelection(String name, String iconUrl) {
+    public SubredditWithSelection(String name, String iconUrl, String qualifiedName) {
         this.name = name;
         this.iconUrl = iconUrl;
+        this.qualifiedName = qualifiedName;
         selected = false;
     }
 
     protected SubredditWithSelection(Parcel in) {
         name = in.readString();
         iconUrl = in.readString();
+        qualifiedName = in.readString();
         selected = in.readByte() != 0;
     }
 
@@ -51,6 +56,10 @@ public class SubredditWithSelection implements Parcelable {
         return selected;
     }
 
+    public String getQualifiedName() {
+        return qualifiedName;
+    }
+
     public void setSelected(boolean selected) {
         this.selected = selected;
     }
@@ -59,14 +68,14 @@ public class SubredditWithSelection implements Parcelable {
             List<SubscribedSubredditData> subscribedSubredditData) {
         ArrayList<SubredditWithSelection> subredditWithSelections = new ArrayList<>();
         for (SubscribedSubredditData s : subscribedSubredditData) {
-            subredditWithSelections.add(new SubredditWithSelection(s.getName(), s.getIconUrl()));
+            subredditWithSelections.add(new SubredditWithSelection(s.getName(), s.getIconUrl(), s.getQualified_name()));
         }
 
         return subredditWithSelections;
     }
 
     public static SubredditWithSelection convertSubreddit(SubredditData subreddit) {
-        return new SubredditWithSelection(subreddit.getName(), subreddit.getIconUrl());
+        return new SubredditWithSelection(subreddit.getName(), subreddit.getIconUrl(), LemmyUtils.actorID2FullName(subreddit.getActorId()));
     }
 
     public int compareName(SubredditWithSelection subredditWithSelection) {
@@ -95,6 +104,7 @@ public class SubredditWithSelection implements Parcelable {
     public void writeToParcel(Parcel parcel, int i) {
         parcel.writeString(name);
         parcel.writeString(iconUrl);
+        parcel.writeString(qualifiedName);
         parcel.writeByte((byte) (selected ? 1 : 0));
     }
 }

app/src/main/java/eu/toldi/infinityforlemmy/user/ParseUserData.java

@@ -48,7 +48,7 @@ public class ParseUserData {
         boolean isBot = personJson.getBoolean("bot_account");
         boolean isBanned = personJson.getBoolean("banned");
         boolean isLocal = personJson.getBoolean("local");
-        boolean isAdmin = personJson.getBoolean("admin");
+        boolean isAdmin = personJson.optBoolean("admin");
         boolean isDeleted = personJson.getBoolean("deleted");
 
         String description = "";

app/src/main/java/eu/toldi/infinityforlemmy/utils/APIUtils.java

@@ -5,7 +5,9 @@ import android.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 
+import okhttp3.Interceptor;
 import okhttp3.MediaType;
+import okhttp3.Request;
 import okhttp3.RequestBody;
 
 /**
@@ -142,12 +144,6 @@ public class APIUtils {
         return params;
     }
 
-    public static Map<String, String> getRedgifsOAuthHeader(String redgifsAccessToken) {
-        Map<String, String> params = new HashMap<>();
-        params.put(APIUtils.AUTHORIZATION_KEY, APIUtils.AUTHORIZATION_BASE + redgifsAccessToken);
-        return params;
-    }
-
     public static RequestBody getRequestBody(String s) {
         return RequestBody.create(s, MediaType.parse("text/plain"));
     }
@@ -159,4 +155,13 @@ public class APIUtils {
         params.put(APIUtils.USER_AGENT_KEY, APIUtils.USER_AGENT);
         return params;
     }
+
+    public static Interceptor getOAuthInterceptor(String accessToken) {
+        return chain -> {
+            Request newRequest = chain.request().newBuilder()
+                    .addHeader("Authorization", "Bearer " + accessToken)
+                    .build();
+            return chain.proceed(newRequest);
+        };
+    }
 }

app/src/main/java/eu/toldi/infinityforlemmy/utils/JSONUtils.java

@@ -126,6 +126,7 @@ public class JSONUtils {
     public static final String Y_KEY = "y";
     public static final String DEST_KEY = "dest";
     public static final String GIF_KEY = "gif";
+    public static final String GIFS_KEY = "gifs";
     public static final String MAX_EMOJIS_KEY = "max_emojis";
     public static final String RICHTEXT_KEY = "richtext";
     public static final String SUGGESTED_COMMENT_SORT_KEY = "suggested_comment_sort";

app/src/main/java/eu/toldi/infinityforlemmy/utils/SharedPreferencesUtils.java

@@ -359,6 +359,8 @@ public class SharedPreferencesUtils {
     public static final String CURRENT_ACCOUNT_SHARED_PREFERENCES_FILE = "eu.toldi.infinityforlemmy.current_account";
     public static final String ACCOUNT_NAME = "account_name";
     public static final String ACCESS_TOKEN = "access_token";
+
+    public static final String BEARER_TOKEN_AUTH = "bearer_token_auth";
     public static final String ACCOUNT_IMAGE_URL = "account_image_url";
     public static final String REDGIFS_ACCESS_TOKEN = "redgifs_access_token";
 

app/src/main/kotlin/eu/toldi/infinityforlemmy/post/enrich/CompositePostEnricher.kt

@@ -0,0 +1,11 @@
+package eu.toldi.infinityforlemmy.post.enrich
+
+import eu.toldi.infinityforlemmy.post.Post
+
+class CompositePostEnricher(private val enrichers: Set<PostEnricher>) : PostEnricher {
+    override fun enrich(posts: Collection<Post>) {
+        for (enricher in enrichers) {
+            enricher.enrich(posts)
+        }
+    }
+}

app/src/main/kotlin/eu/toldi/infinityforlemmy/post/enrich/PostEnricher.kt

@@ -0,0 +1,7 @@
+package eu.toldi.infinityforlemmy.post.enrich
+
+import eu.toldi.infinityforlemmy.post.Post
+
+interface PostEnricher {
+    fun enrich(posts: Collection<Post>)
+}

app/src/main/kotlin/eu/toldi/infinityforlemmy/post/enrich/RedGifsPostEnricher.kt

@@ -0,0 +1,56 @@
+package eu.toldi.infinityforlemmy.post.enrich
+
+import android.util.Log
+import eu.toldi.infinityforlemmy.apis.RedgifsAPI
+import eu.toldi.infinityforlemmy.post.Post
+import eu.toldi.infinityforlemmy.post.Post.Preview
+import eu.toldi.infinityforlemmy.utils.JSONUtils
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.IOException
+
+class RedGifsPostEnricher(private val redgifsAPI: RedgifsAPI) : PostEnricher {
+    override fun enrich(posts: Collection<Post>) {
+        val redGifsPosts = posts.filter { it.isRedgifs && it.previews.isEmpty() }
+            .groupBy { it.gfycatId }
+
+        if (redGifsPosts.isEmpty()) {
+            return
+        }
+
+        try {
+            val response = redgifsAPI.getRedgifsMultipleData(redGifsPosts.keys.joinToString(",")).execute()
+            val body = response.body()
+            if (response.isSuccessful && body != null) {
+                try {
+                    val gifsJson = JSONObject(body).getJSONArray(JSONUtils.GIFS_KEY)
+                    for (i in 0 until gifsJson.length()) {
+                        val gifJson = gifsJson.getJSONObject(i)
+                        val id = gifJson.getString(JSONUtils.ID_KEY)
+                        val width = gifJson.getInt(JSONUtils.WIDTH_KEY)
+                        val height = gifJson.getInt(JSONUtils.HEIGHT_KEY)
+                        val thumbnail = gifJson.getJSONObject(JSONUtils.URLS_KEY)
+                            .getString(JSONUtils.THUMBNAIL_KEY)
+
+                        val previews = ArrayList(listOf(Preview(thumbnail, width, height, null, null)))
+
+                        redGifsPosts[id]?.forEach {
+                            it.previews = previews
+                        }
+                    }
+
+                } catch (e: JSONException) {
+                    Log.w(TAG, "Failed to parse JSON", e)
+                }
+            } else {
+                Log.w(TAG, "Failed fetch data. Status code ${response.code()}")
+            }
+        } catch (e: IOException) {
+            Log.w(TAG, "Failed fetch data", e)
+        }
+    }
+
+    companion object {
+        private const val TAG = "RedGifsPostEnricher"
+    }
+}

app/src/main/res/values/arrays.xml

@@ -543,17 +543,17 @@
     </string-array>
 
     <string-array name="settings_default_sort_time_values">
-        <item>TopHour</item>
-        <item>TopSixHour</item>
-        <item>TopTwelveHour</item>
-        <item>TopDay</item>
-        <item>TopWeek</item>
-        <item>TopMonth</item>
-        <item>TopThreeMonths</item>
-        <item>TopSixMonths</item>
-        <item>TopNineMonths</item>
-        <item>TopYear</item>
-        <item>TopAll</item>
+        <item>hour</item>
+        <item>SixHour</item>
+        <item>TwelveHour</item>
+        <item>day</item>
+        <item>week</item>
+        <item>month</item>
+        <item>ThreeMonths</item>
+        <item>SixMonths</item>
+        <item>NineMonths</item>
+        <item>year</item>
+        <item>all</item>
     </string-array>
 
     <string-array name="settings_default_search_result_tab">