From 4edff860bf3655db1ebdaa9f80265ff68dcb3c6a Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 7 Feb 2018 23:41:18 +0100
Subject: #8829 fixes notification handling after ui changes and fixes also
 memory leak #8838

---
 .../java/se/leap/bitmaskclient/MainActivity.java   | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/MainActivity.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
index 7629f0b7..186c2928 100644
--- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
@@ -15,12 +15,11 @@ import se.leap.bitmaskclient.userstatus.SessionDialog;
 
 import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP;
 import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES;
+import static se.leap.bitmaskclient.EipFragment.ASK_TO_CANCEL_VPN;
 
 
 public class MainActivity extends AppCompatActivity {
 
-    private static Provider provider = new Provider();
-    private static FragmentManagerEnhanced fragmentManager;
     private SharedPreferences preferences;
 
     public final static String ACTION_SHOW_VPN_FRAGMENT = "action_show_vpn_fragment";
@@ -40,7 +39,6 @@ public class MainActivity extends AppCompatActivity {
                 getSupportFragmentManager().findFragmentById(R.id.navigation_drawer);
 
         preferences = getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE);
-        fragmentManager = new FragmentManagerEnhanced(getSupportFragmentManager());
         // Set up the drawer.
         navigationDrawerFragment.setUp(
                 R.id.navigation_drawer,
@@ -49,15 +47,6 @@ public class MainActivity extends AppCompatActivity {
         handleIntentAction(getIntent());
     }
 
-    public static void sessionDialog(Bundle resultData) {
-        try {
-            FragmentTransaction transaction = fragmentManager.removePreviousFragment(SessionDialog.TAG);
-            SessionDialog.getInstance(provider, resultData).show(transaction, SessionDialog.TAG);
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-    }
-
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
@@ -71,17 +60,21 @@ public class MainActivity extends AppCompatActivity {
         }
 
         Fragment fragment = null;
-
         switch (intent.getAction()) {
             case ACTION_SHOW_VPN_FRAGMENT:
                 fragment = new EipFragment();
+                if (intent.hasExtra(ASK_TO_CANCEL_VPN)) {
+                    Bundle bundle = new Bundle();
+                    bundle.putBoolean(ASK_TO_CANCEL_VPN, true);
+                    fragment.setArguments(bundle);
+                }
                 break;
             default:
                 break;
         }
 
         if (fragment != null) {
-            fragmentManager.beginTransaction()
+            new FragmentManagerEnhanced(getSupportFragmentManager()).beginTransaction()
                     .replace(R.id.container, fragment)
                     .commit();
         }
@@ -100,5 +93,4 @@ public class MainActivity extends AppCompatActivity {
             }
         }
     }
-
 }
-- 
cgit v1.2.3