From 807bb4fac59b5bfdd0c1365b55b31502db508127 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 6 Jul 2020 15:04:39 +0200
Subject: [PATCH] release notes + soem fixes

---
 app/src/main/assets/changelogs/373.txt         |  1 +
 .../fragments/DisplayMediaFragment.java        | 18 +++++++-----------
 .../fragments/TabLayoutTootsFragment.java      |  3 +++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/assets/changelogs/373.txt b/app/src/main/assets/changelogs/373.txt
index cb7df0348..5fae29c95 100644
--- a/app/src/main/assets/changelogs/373.txt
+++ b/app/src/main/assets/changelogs/373.txt
@@ -10,5 +10,6 @@ Fixed:
 - Some issue with custom emoji
 - Fix issue with "Your toots/notifications"
 - Fix issue with CW and Pixelfed
+- Fix some media not loaded in profiles
 - Scheduling from server have an incorrect date
 - Some crashes
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayMediaFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayMediaFragment.java
index 3895f6564..83b51f519 100644
--- a/app/src/main/java/app/fedilab/android/fragments/DisplayMediaFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/DisplayMediaFragment.java
@@ -15,7 +15,6 @@ package app.fedilab.android.fragments;
  * see <http://www.gnu.org/licenses>. */
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
@@ -31,6 +30,8 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -61,7 +62,6 @@ public class DisplayMediaFragment extends Fragment implements OnRetrieveFeedsInt
     private boolean firstLoad;
     private String targetedId;
     private boolean showMediaOnly, showPinned, showReply;
-    private SharedPreferences sharedpreferences;
     private ArrayList<Status> statuses;
     private ImageAdapter gridAdaper;
     private RecyclerView gridview;
@@ -84,7 +84,6 @@ public class DisplayMediaFragment extends Fragment implements OnRetrieveFeedsInt
         showReply = false;
         firstLoad = true;
         assert context != null;
-        sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
         mainLoader = rootView.findViewById(R.id.loader);
         nextElementLoader = rootView.findViewById(R.id.loading_next_status);
         textviewNoAction = rootView.findViewById(R.id.no_action);
@@ -105,7 +104,7 @@ public class DisplayMediaFragment extends Fragment implements OnRetrieveFeedsInt
 
 
         gridview.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+            public void onScrolled(@NotNull RecyclerView recyclerView, int dx, int dy) {
                 int firstVisibleItem = gvLayout.findFirstVisibleItemPosition();
                 if (dy > 0) {
                     int visibleItemCount = gvLayout.getChildCount();
@@ -129,12 +128,9 @@ public class DisplayMediaFragment extends Fragment implements OnRetrieveFeedsInt
         if (context != null) {
             asyncTask = new RetrieveFeedsAsyncTask(context, RetrieveFeedsAsyncTask.Type.USER, targetedId, max_id, showMediaOnly, showPinned, showReply, DisplayMediaFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         } else {
-            new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if (context != null) {
-                        asyncTask = new RetrieveFeedsAsyncTask(context, RetrieveFeedsAsyncTask.Type.USER, targetedId, max_id, showMediaOnly, showPinned, showReply, DisplayMediaFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-                    }
+            new Handler(Looper.getMainLooper()).postDelayed(() -> {
+                if (context != null) {
+                    asyncTask = new RetrieveFeedsAsyncTask(context, RetrieveFeedsAsyncTask.Type.USER, targetedId, max_id, showMediaOnly, showPinned, showReply, DisplayMediaFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
                 }
             }, 500);
         }
@@ -158,7 +154,7 @@ public class DisplayMediaFragment extends Fragment implements OnRetrieveFeedsInt
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NotNull Context context) {
         super.onAttach(context);
         this.context = context;
     }
diff --git a/app/src/main/java/app/fedilab/android/fragments/TabLayoutTootsFragment.java b/app/src/main/java/app/fedilab/android/fragments/TabLayoutTootsFragment.java
index cd6fe6a77..f036198e2 100644
--- a/app/src/main/java/app/fedilab/android/fragments/TabLayoutTootsFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/TabLayoutTootsFragment.java
@@ -28,6 +28,8 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.google.android.material.tabs.TabLayout;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.Objects;
 
 import app.fedilab.android.R;
@@ -105,6 +107,7 @@ public class TabLayoutTootsFragment extends Fragment {
             this.mNumOfTabs = NumOfTabs;
         }
 
+        @NotNull
         @Override
         public Fragment getItem(int position) {
             switch (position) {