Fix non updated counter with cache

5 files changed, 13 insertions, 6 deletions

diff --git a/app/src/main/java/app/fedilab/android/activities/ContextActivity.java b/app/src/main/java/app/fedilab/android/activities/ContextActivity.java
index 0287e4d90..c9eb7ecc7 100644
--- a/app/src/main/java/app/fedilab/android/activities/ContextActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ContextActivity.java
@@ -53,14 +53,12 @@ public class ContextActivity extends BaseActivity {
     public static boolean displayCW;
     public static Resources.Theme theme;
     Fragment currentFragment;
-    private Status focusedStatus;
-    private ActivityConversationBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ThemeHelper.applyTheme(this);
-        binding = ActivityConversationBinding.inflate(getLayoutInflater());
+        app.fedilab.android.databinding.ActivityConversationBinding binding = ActivityConversationBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
         ActionBar actionBar = getSupportActionBar();
@@ -78,7 +76,7 @@ public class ContextActivity extends BaseActivity {
         Bundle b = getIntent().getExtras();
         final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(ContextActivity.this);
         displayCW = sharedpreferences.getBoolean(getString(R.string.SET_EXPAND_CW), false);
-        focusedStatus = null; // or other values
+        Status focusedStatus = null; // or other values
         if (b != null)
             focusedStatus = (Status) b.getSerializable(Helper.ARG_STATUS);
         if (focusedStatus == null || currentAccount == null || currentAccount.mastodon_account == null) {
diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index 1b3e82b53..65e481960 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -1474,11 +1474,11 @@ public class Helper {
         }
         NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(context, channelId)
                 .setSmallIcon(R.drawable.ic_notification).setTicker(message);
-        if (notifType == NotifType.MENTION) {
+      /*  if (notifType == NotifType.MENTION) {
             if (message.length() > 500) {
                 message = message.substring(0, 499) + "…";
             }
-        }
+        }*/
         notificationBuilder.setGroup(account.mastodon_account.acct + "@" + account.instance)
                 .setContentIntent(pIntent)
                 .setContentText(message);
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonContext.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonContext.java
index 1ce3b38d4..a5138f52e 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonContext.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonContext.java
@@ -69,8 +69,11 @@ public class FragmentMastodonContext extends Fragment {
                     int position = getPosition(receivedStatus);
                     if (position >= 0) {
                         statuses.get(position).reblog = receivedStatus.reblog;
+                        statuses.get(position).reblogged = receivedStatus.reblogged;
                         statuses.get(position).favourited = receivedStatus.favourited;
                         statuses.get(position).bookmarked = receivedStatus.bookmarked;
+                        statuses.get(position).reblogs_count = receivedStatus.reblogs_count;
+                        statuses.get(position).favourites_count = receivedStatus.favourites_count;
                         statusAdapter.notifyItemChanged(position);
                     }
                 } else if (delete_statuses_for_user != null && statusAdapter != null) {
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java
index 6d3ce11f6..47d06170c 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java
@@ -76,8 +76,11 @@ public class FragmentMastodonNotification extends Fragment implements Notificati
                     if (position >= 0) {
                         if (notificationList.get(position).status != null) {
                             notificationList.get(position).status.reblog = receivedStatus.reblog;
+                            notificationList.get(position).status.reblogged = receivedStatus.reblogged;
                             notificationList.get(position).status.favourited = receivedStatus.favourited;
                             notificationList.get(position).status.bookmarked = receivedStatus.bookmarked;
+                            notificationList.get(position).status.favourites_count = receivedStatus.favourites_count;
+                            notificationList.get(position).status.reblogs_count = receivedStatus.reblogs_count;
                             notificationAdapter.notifyItemChanged(position);
                         }
                     }
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
index 53fd1aaef..034dbbe33 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
@@ -92,8 +92,11 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
                     int position = getPosition(receivedStatus);
                     if (position >= 0) {
                         statuses.get(position).reblog = receivedStatus.reblog;
+                        statuses.get(position).reblogged = receivedStatus.reblogged;
                         statuses.get(position).favourited = receivedStatus.favourited;
                         statuses.get(position).bookmarked = receivedStatus.bookmarked;
+                        statuses.get(position).reblogs_count = receivedStatus.reblogs_count;
+                        statuses.get(position).favourites_count = receivedStatus.favourites_count;
                         statusAdapter.notifyItemChanged(position);
                     }
                 } else if (delete_statuses_for_user != null && statusAdapter != null) {