little cleanup after merge marathon

2 files changed, 2 insertions, 20 deletions

diff --git a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
index 892bed41..fc712957 100644
--- a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
+++ b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
@@ -86,8 +86,6 @@ public class LaunchVPN extends Activity {
     private boolean mhideLog = false;
 
     private boolean mCmfixed = false;
-    private String mTransientAuthPW;
-    private String mTransientCertOrPCKS12PW;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -143,7 +141,6 @@ public class LaunchVPN extends Activity {
 
             if(!mhideLog && showLogWindow)
                 showLogWindow();
-            //TODO: check line below!
             ProfileManager.updateLRU(this, mSelectedProfile);
             VPNLaunchHelper.startOpenVpn(mSelectedProfile, getBaseContext());
             finish();
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index 542089be..22a0c6d5 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -7,7 +7,6 @@ package de.blinkt.openvpn.core;
 
 import android.Manifest.permission;
 import android.annotation.TargetApi;
-import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -94,7 +93,6 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
     private Handler guiHandler;
     private Toast mlastToast;
     private Runnable mOpenVPNThread;
-    private static Class mNotificationActivityClass;
 
     private static final int PRIORITY_MIN = -2;
     private static final int PRIORITY_DEFAULT = 0;
@@ -210,7 +208,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
             priority = PRIORITY_DEFAULT;
 
         if (mProfile != null)
-            nbuilder.setContentTitle(getString(R.string.notifcation_title, mProfile.mName));
+            nbuilder.setContentTitle(getString(R.string.notifcation_title_bitmask, mProfile.mName));
         else
             nbuilder.setContentTitle(getString(R.string.notifcation_title_notconnect));
 
@@ -354,15 +352,6 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
 
     }
 
-    /**
-     * Sets the activity which should be opened when tapped on the permanent notification tile.
-     *
-     * @param activityClass The activity class to open
-     */
-    public static void setNotificationActivityClass(Class<? extends Activity> activityClass) {
-        mNotificationActivityClass = activityClass;
-    }
-
     PendingIntent getUserInputIntent(String needed) {
         Intent intent = new Intent(getApplicationContext(), LaunchVPN.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
@@ -375,11 +364,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
 
     PendingIntent getGraphPendingIntent() {
         // Let the configure Button show the Log
-        Class activityClass = Dashboard.class;
-        if (mNotificationActivityClass != null) {
-            activityClass = mNotificationActivityClass;
-        }
-        Intent intent = new Intent(getBaseContext(), activityClass);
+        Intent intent = new Intent(getBaseContext(), Dashboard.class);
         intent.putExtra("PAGE", "graph");
         intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
         PendingIntent startLW = PendingIntent.getActivity(this, 0, intent, 0);