From 788d99b62ace71d24df1e44735d988ce475cdd42 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 11 Oct 2019 12:08:42 +0200
Subject: Add a red hint in navigation drawer if apps are currently excluded
 from VPN

---
 .../main/java/se/leap/bitmaskclient/MainActivity.java  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 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 95966b44..b163f1dd 100644
--- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java
@@ -24,10 +24,8 @@ import android.support.annotation.StringRes;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 
 import org.json.JSONException;
@@ -38,6 +36,7 @@ import java.util.Observer;
 
 import se.leap.bitmaskclient.drawer.NavigationDrawerFragment;
 import se.leap.bitmaskclient.eip.EipCommand;
+import se.leap.bitmaskclient.fragments.ExcludeAppsFragment;
 import se.leap.bitmaskclient.fragments.LogFragment;
 import se.leap.bitmaskclient.utils.PreferenceHelper;
 
@@ -60,7 +59,7 @@ import static se.leap.bitmaskclient.R.string.vpn_certificate_user_message;
 import static se.leap.bitmaskclient.utils.PreferenceHelper.storeProviderInPreferences;
 
 
-public class MainActivity extends AppCompatActivity implements EipSetupListener, Observer {
+public class MainActivity extends AppCompatActivity implements EipSetupListener, Observer, ExcludeAppsFragment.ExcludedAppsCallback {
 
     public final static String TAG = MainActivity.class.getSimpleName();
 
@@ -79,7 +78,7 @@ public class MainActivity extends AppCompatActivity implements EipSetupListener,
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.a_main);
-        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
+        setSupportActionBar(findViewById(R.id.toolbar));
 
         navigationDrawerFragment = (NavigationDrawerFragment)
                 getSupportFragmentManager().findFragmentById(R.id.navigation_drawer);
@@ -88,10 +87,7 @@ public class MainActivity extends AppCompatActivity implements EipSetupListener,
         provider = ProviderObservable.getInstance().getCurrentProvider();
 
         // Set up the drawer.
-        navigationDrawerFragment.setUp(
-                R.id.navigation_drawer,
-                (DrawerLayout) findViewById(R.id.drawer_layout));
-
+        navigationDrawerFragment.setUp(R.id.navigation_drawer, findViewById(R.id.drawer_layout));
         handleIntentAction(getIntent());
     }
 
@@ -307,4 +303,10 @@ public class MainActivity extends AppCompatActivity implements EipSetupListener,
         }
         startActivityForResult(intent, REQUEST_CODE_LOG_IN);
     }
+
+
+    @Override
+    public void onAppsExcluded(int number) {
+        navigationDrawerFragment.onAppsExcluded(number);
+    }
 }
-- 
cgit v1.2.3