Merge pull request #52 from ivpn/GAA-48

[GAA-48] Fix notification issue after log out

Author: AlexKorvin

app/src/main/java/net/ivpn/client/common/session/SessionController.kt

@@ -157,7 +157,6 @@ class SessionController @Inject constructor(
                             }
                             if ((it.status == Responses.SESSION_NOT_FOUND)) {
                                 clearData()
-                                ViewModelCleaner()
                             }
                         }
                         onUpdateError(null, errorResponse)

app/src/main/java/net/ivpn/client/common/utils/ComponentUtil.java

@@ -22,10 +22,10 @@
  along with the IVPN Android app. If not, see <https://www.gnu.org/licenses/>.
 */
 
-import android.content.Context;
 import android.util.Log;
 
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.app.NotificationManagerCompat;
 
 import net.ivpn.client.BuildConfig;
 import net.ivpn.client.IVPNApplication;
@@ -97,11 +97,13 @@ public void performBaseComponentsInit() {
     }
 
     public void resetComponents() {
+        networkController.finishAll();
         preference.removeAll();
         globalBehaviorController.finishAll();
-        networkController.finishAll();
         updatesJobServiceUtil.clearUpdateJob(IVPNApplication.getApplication());
         updateHelper.skipUpdate();
+
+        NotificationManagerCompat.from(IVPNApplication.getApplication()).cancelAll();
     }
 
     private void initProfile() {

app/src/main/java/net/ivpn/client/v2/killswitch/KillSwitchFragment.kt

@@ -90,11 +90,6 @@ class KillSwitchFragment : Fragment(), KillSwitchViewModel.KillSwitchNavigator {
         }
     }
 
-    override fun onPause() {
-        super.onPause()
-        killSwitch.navigator = null
-    }
-
     private fun initToolbar() {
         val navController = findNavController()
         val appBarConfiguration = AppBarConfiguration(navController.graph)

app/src/main/java/net/ivpn/client/v2/network/NetworkViewModel.kt

@@ -218,12 +218,12 @@ class NetworkViewModel @Inject internal constructor(
     }
 
     override fun onNetworkSourceChanged(source: NetworkSource?) {
-        Log.d("NetworkController", "onNetworkSourceChanged: source = $source")
+        LOGGER.info("onNetworkSourceChanged: source = $source")
         if (source == null) {
             return
         }
         if (source == NetworkSource.WIFI) {
-            Log.d("NetworkController", "onNetworkSourceChanged: ssid = " + source.ssid)
+            LOGGER.info("NetworkController", "onNetworkSourceChanged: ssid = " + source.ssid)
         }
         networkSource.set(source)
         networkState.set(source.finalState)

app/src/main/java/net/ivpn/client/vpn/local/KillSwitchService.java

@@ -23,15 +23,15 @@
 */
 
 import android.app.Notification;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.VpnService;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
+
 import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import net.ivpn.client.R;
@@ -51,7 +51,7 @@ public class KillSwitchService extends VpnService implements ServiceConstants {
     public static AtomicBoolean isRunning = new AtomicBoolean(false);
 
     private ParcelFileDescriptor tun;
-    private NotificationManager notificationManager;
+    private NotificationManagerCompat notificationManager;
 
     private int notificationId;
 
@@ -65,7 +65,7 @@ public void onRevoke() {
     public void onCreate() {
         LOGGER.info("onCreate");
         super.onCreate();
-        notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager = NotificationManagerCompat.from(this);
         notificationId = ServiceConstants.KILL_SWITCH_CHANNEL.hashCode();
     }
 
@@ -114,13 +114,12 @@ private int startKillSwitch() {
 
     private int endService() {
         LOGGER.info("endService");
-        notificationManager.cancelAll();
+        notificationManager.cancel(notificationId);
         closeTun();
         stopForeground(true);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             stopSelf(STOP_FOREGROUND_REMOVE);
         } else {
-            notificationManager.cancel(notificationId);
             stopSelf();
         }
         return START_NOT_STICKY;

app/src/main/java/net/ivpn/client/vpn/local/WifiWatcherService.java

@@ -23,7 +23,6 @@
 */
 
 import android.app.Notification;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
@@ -36,6 +35,7 @@
 
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import net.ivpn.client.IVPNApplication;
@@ -57,7 +57,7 @@ public class WifiWatcherService extends Service implements ServiceConstants {
     public static AtomicBoolean isRunning = new AtomicBoolean(false);
 
     private WifiBroadcastReceiver receiver;
-    private NotificationManager notificationManager;
+    private NotificationManagerCompat notificationManager;
 
     private int notificationId;
 
@@ -74,7 +74,7 @@ public IBinder onBind(Intent intent) {
     public void onCreate() {
         LOGGER.info("onCreate");
         super.onCreate();
-        notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager = NotificationManagerCompat.from(this);
         notificationId = ServiceConstants.WIFI_WATCHER_CHANNEL.hashCode();
     }
 
@@ -117,10 +117,10 @@ public void onDestroy() {
     private int endService() {
         LOGGER.info("endService");
         stopForeground(true);
+        notificationManager.cancel(notificationId);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             stopSelf(STOP_FOREGROUND_REMOVE);
         } else {
-            notificationManager.cancel(notificationId);
             stopSelf();
         }
         return START_NOT_STICKY;