Some fixes

3 files changed, 9 insertions, 8 deletions

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index cc51b51c7..bdf4a1dc0 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -926,7 +926,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 });
             }
             holder.status_content.setText(status.getContentSpan(), TextView.BufferType.SPANNABLE);
-
             if( truncate_toots_size > 0) {
                 holder.status_content.setMaxLines(truncate_toots_size);
                 if (status.getNumberLines() == -1) {
@@ -954,8 +953,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 } else {
                     holder.status_show_more_content.setVisibility(View.GONE);
                 }
-            }else{
-                holder.status_show_more_content.setVisibility(View.GONE);
             }
             holder.status_show_more_content.setOnClickListener(new View.OnClickListener() {
                 @Override
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
index 17bb3169c..352c81c93 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
@@ -810,10 +810,12 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                         }
                     }else {
                         if( lastReadToot != null && Long.parseLong(statuses.get(i).getId()) > Long.parseLong(lastReadToot)) {
-                            statuses.get(i).setNew(true);
-                            MainActivity.countNewStatus++;
-                            inserted++;
-                            this.statuses.add(0, statuses.get(i));
+                            if( !this.statuses.contains(statuses.get(i)) ) {
+                                statuses.get(i).setNew(true);
+                                MainActivity.countNewStatus++;
+                                inserted++;
+                                this.statuses.add(0, statuses.get(i));
+                            }
                         }
                     }
                 }
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java b/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java
index a9b3f2896..73fb20983 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java
@@ -61,6 +61,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import fr.gouv.etalab.mastodon.R;
 import fr.gouv.etalab.mastodon.activities.MainActivity;
@@ -239,7 +241,7 @@ public class LiveNotificationService extends Service implements NetworkStateRece
                     if (ex != null) {
                         if( !canStartStream.containsKey(account.getAcct()+"@"+account.getInstance()) || canStartStream.get(account.getAcct()+"@"+account.getInstance())) {
                             canStartStream.put(account.getAcct()+"@"+account.getInstance(),false);
-                            new Handler().postDelayed(new Runnable() {
+                            new Timer().schedule(new TimerTask() {
                                 @Override
                                 public void run() {
                                     startStream(account);