From 7f0fc2d0e3ae3d531e82e71447d72a9c6235db92 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Sat, 11 Nov 2017 18:49:59 +0100
Subject: [PATCH] Last improvements

---
 .../mastodon/activities/BaseMainActivity.java |  5 +++--
 .../mastodon/fragments/SettingsFragment.java  |  5 ++---
 .../mastodon/services/StreamingService.java   | 19 +++++++++++++++++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
index b46ef4494..85f13d0e2 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
@@ -223,7 +223,7 @@ public abstract class BaseMainActivity extends AppCompatActivity
         changeDrawableColor(getApplicationContext(), R.drawable.ic_notifications,R.color.dark_text);
         changeDrawableColor(getApplicationContext(), R.drawable.ic_people,R.color.dark_text);
         changeDrawableColor(getApplicationContext(), R.drawable.ic_public,R.color.dark_text);
-        startSreaming();
+        startSreaming(false);
         tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
         tabLayout.setTabMode(TabLayout.MODE_FIXED);
 
@@ -1461,8 +1461,9 @@ public abstract class BaseMainActivity extends AppCompatActivity
         return activityPaused;
     }
 
-    public void startSreaming(){
+    public void startSreaming(boolean restart){
         streamingIntent = new Intent(this, StreamingService.class);
+        streamingIntent.putExtra("restart",restart);
         startService(streamingIntent);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
index 4ab0377d6..cc6ef2685 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
@@ -47,7 +47,6 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import fr.gouv.etalab.mastodon.activities.BaseMainActivity;
 import fr.gouv.etalab.mastodon.activities.MainActivity;
 import fr.gouv.etalab.mastodon.client.Entities.Account;
 import fr.gouv.etalab.mastodon.helper.Helper;
@@ -229,8 +228,8 @@ public class SettingsFragment extends Fragment {
                 editor.apply();
                 if( set_live_notif.isChecked() ){
                     try {
-                        ((BaseMainActivity) context).startSreaming();
-                    }catch (Exception ignored){}
+                        ((MainActivity) context).startSreaming(true);
+                    }catch (Exception ignored){ignored.printStackTrace();}
                 }
             }
         });
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingService.java b/app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingService.java
index a6c76e8e2..34f5be897 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingService.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingService.java
@@ -78,7 +78,6 @@ import static fr.gouv.etalab.mastodon.helper.Helper.notify_user;
 public class StreamingService extends Service {
 
 
-    private EventStreaming lastEvent;
 
 
     public enum EventStreaming{
@@ -116,6 +115,20 @@ public class StreamingService extends Service {
         }
     }
 
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Bundle extras = intent.getExtras();
+        if(extras != null) {
+            boolean restart = (boolean) extras.get("restart");
+            if( restart) {
+                SystemClock.sleep(1000);
+                sendBroadcast(new Intent("RestartStreamingService"));
+                stopSelf();
+            }
+        }
+        return START_STICKY;
+    }
+
     @Nullable
     @Override
     public IBinder onBind(Intent intent) {
@@ -128,6 +141,7 @@ public class StreamingService extends Service {
         HttpsURLConnection httpsURLConnection = null;
         BufferedReader reader = null;
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        EventStreaming lastEvent = null;
         if( accountStream != null){
             try {
                 URL url = new URL("https://" + accountStream.getInstance() + "/api/v1/streaming/user");
@@ -150,6 +164,7 @@ public class StreamingService extends Service {
                         stopSelf();
                         return;
                     }
+
                     if ((lastEvent == EventStreaming.NONE || lastEvent == null) && !event.startsWith("data: ")) {
                         switch (event.trim()) {
                             case "event: update":
@@ -245,7 +260,7 @@ public class StreamingService extends Service {
                 boolean notif_share = sharedpreferences.getBoolean(Helper.SET_NOTIF_SHARE, true);
                 boolean somethingToPush = (notif_follow || notif_add || notif_mention || notif_share);
                 String title = null;
-                if( somethingToPush){
+                if( somethingToPush && notification != null){
                     switch (notification.getType()){
                         case "mention":
                             if(notif_mention){