fix merge conflict related bug with excluding apps from vpn

1 files changed, 6 insertions, 3 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/fragments/ExcludeAppsFragment.java b/app/src/main/java/se/leap/bitmaskclient/fragments/ExcludeAppsFragment.java
index 066c9636..63b3908d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/fragments/ExcludeAppsFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/fragments/ExcludeAppsFragment.java
@@ -103,16 +103,13 @@ public class ExcludeAppsFragment extends Fragment implements AdapterView.OnItemC
 
         if (isChecked) {
             Log.d("openvpn", "adding to allowed apps" + packageName);
-
             apps.add(packageName);
 
         } else {
             Log.d("openvpn", "removing from allowed apps" + packageName);
-
             apps.remove(packageName);
         }
 
-        PreferenceHelper.setExcludedApps(this.getContext(), apps);
     }
 
 
@@ -260,6 +257,12 @@ public class ExcludeAppsFragment extends Fragment implements AdapterView.OnItemC
     }
 
     @Override
+    public void onDestroy() {
+        PreferenceHelper.setExcludedApps(this.getActivity().getApplicationContext(), apps);
+        super.onDestroy();
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);