Correctly remove the service notification when starting app for the first time since device boot

app/src/main/java/org/linphone/activities/LinphoneLauncherActivity.java

@@ -97,10 +97,6 @@ public class LinphoneLauncherActivity extends Activity {
                         intent.setAction(getIntent().getAction());
                         intent.setType(getIntent().getType());
                         startActivity(intent);
-
-                        LinphoneService.instance()
-                                .getNotificationManager()
-                                .removeForegroundServiceNotificationIfPossible();
                     }
                 },
                 100);

app/src/main/java/org/linphone/activities/MainActivity.java

@@ -301,6 +301,10 @@ public abstract class MainActivity extends LinphoneGenericActivity
     protected void onResume() {
         super.onResume();
 
+        LinphoneService.instance()
+                .getNotificationManager()
+                .removeForegroundServiceNotificationIfPossible();
+
         hideTopBar();
         if (!mAlwaysHideTabBar
                 && (getFragmentManager().getBackStackEntryCount() == 0

app/src/main/java/org/linphone/notifications/NotificationsManager.java

@@ -236,8 +236,8 @@ public class NotificationsManager {
     }
 
     public void removeForegroundServiceNotificationIfPossible() {
-        if (!isServiceNotificationDisplayed()
+        if (mCurrentForegroundServiceNotification == SERVICE_NOTIF_ID
-                && mCurrentForegroundServiceNotification == SERVICE_NOTIF_ID) {
+                && !isServiceNotificationDisplayed()) {
             stopForeground();
         }
     }