From 0e7f95f62634777a6b5ab3e8cba2bd7caefc99a3 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 19 Jun 2020 18:00:48 +0200
Subject: [PATCH] Some changes

---
 .../java/app/fedilab/android/client/APIResponse.java |  1 -
 .../main/java/app/fedilab/android/client/GNUAPI.java | 12 ++++--------
 .../fedilab/android/drawers/CustomEmojiAdapter.java  |  4 +++-
 .../android/drawers/NotificationsListAdapter.java    |  2 +-
 .../fedilab/android/jobs/ScheduledBoostsSyncJob.java |  1 +
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/client/APIResponse.java b/app/src/main/java/app/fedilab/android/client/APIResponse.java
index 9ece26d7c..635eaeed2 100644
--- a/app/src/main/java/app/fedilab/android/client/APIResponse.java
+++ b/app/src/main/java/app/fedilab/android/client/APIResponse.java
@@ -78,7 +78,6 @@ public class APIResponse {
     private Context context = null;
     private List<PixelFedStory> pixelFedStories = null;
     private List<PixelFedStoryItem> pixelFedStoryItems = null;
-    private PixelFedStory pixelFedStory = null;
     private List<Trends> trends = null;
     private List<IdentityProof> identityProofs = null;
 
diff --git a/app/src/main/java/app/fedilab/android/client/GNUAPI.java b/app/src/main/java/app/fedilab/android/client/GNUAPI.java
index 648d23ce8..df987090a 100644
--- a/app/src/main/java/app/fedilab/android/client/GNUAPI.java
+++ b/app/src/main/java/app/fedilab/android/client/GNUAPI.java
@@ -1476,24 +1476,20 @@ public class GNUAPI {
             case FAVOURITE:
                 if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
                     action = "/favorites/create.json";
-                    params = new HashMap<>();
-                    params.put("id", targetedId);
                 } else {
                     action = "/friendica/activity/like.json";
-                    params = new HashMap<>();
-                    params.put("id", targetedId);
                 }
+                params = new HashMap<>();
+                params.put("id", targetedId);
                 break;
             case UNFAVOURITE:
                 if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
                     action = "/favorites/destroy.json";
-                    params = new HashMap<>();
-                    params.put("id", targetedId);
                 } else {
                     action = "/friendica/activity/unlike.json";
-                    params = new HashMap<>();
-                    params.put("id", targetedId);
                 }
+                params = new HashMap<>();
+                params.put("id", targetedId);
                 break;
             case REBLOG:
                 action = String.format("/statuses/retweet/%s.json", targetedId);
diff --git a/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java b/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java
index 18728988f..e2209e0d1 100644
--- a/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java
@@ -88,7 +88,9 @@ public class CustomEmojiAdapter extends BaseAdapter {
                     @Override
                     public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
                         emoji.setDrawable(resource);
-                        imageView.setImageDrawable(emoji.getDrawable());
+                        if( imageView != null && emoji.getDrawable() != null) {
+                            imageView.setImageDrawable(emoji.getDrawable());
+                        }
                     }
 
                     @Override
diff --git a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
index def9880b7..8b3feadc8 100644
--- a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
@@ -262,7 +262,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter<RecyclerView.
                 else
                     typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_mention));
                 imgH = ContextCompat.getDrawable(context, R.drawable.ic_chat_bubble_outline);
-                if (notification.getStatus().getVisibility().equals("direct")) {
+                if (notification.getStatus() != null && notification.getStatus().getVisibility().equals("direct")) {
                     holder.main_container_trans.setVisibility(View.GONE);
                 } else {
                     holder.main_container_trans.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/app/fedilab/android/jobs/ScheduledBoostsSyncJob.java b/app/src/main/java/app/fedilab/android/jobs/ScheduledBoostsSyncJob.java
index a6ac9856a..0fd215127 100644
--- a/app/src/main/java/app/fedilab/android/jobs/ScheduledBoostsSyncJob.java
+++ b/app/src/main/java/app/fedilab/android/jobs/ScheduledBoostsSyncJob.java
@@ -65,6 +65,7 @@ public class ScheduledBoostsSyncJob extends Job {
         return jobId;
     }
 
+    @SuppressWarnings("UnusedReturnValue")
     public static int scheduleUpdate(Context context, int tootStoredId, long timestampScheduling) {
 
         long startMs = (timestampScheduling - new Date().getTime());