summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
diff options
context:
space:
mode:
authorfupduck <fupduck@riseup.net>2018-02-16 00:43:45 -0800
committerfupduck <fupduck@riseup.net>2018-02-16 00:43:45 -0800
commit0365f243fc56112b2f43b35e1b4884d2d1ad2aa4 (patch)
treec2b8cb3b8f40d0a96a6167f13a0114aa8dbbdc0c /app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
parentf6b589d48d99b4458e8977e73433207848373924 (diff)
parent96e5db80d9a949435df32d2d0c46497b86d1fff4 (diff)
Merge branch '#8846_remove_Dashboard' into '0.9.8'
#8846 remove legacy code and files: Dashboard, LogWindow, UserStatusFragment,… See merge request leap/bitmask_android!44
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/LaunchVPN.java')
-rw-r--r--app/src/main/java/de/blinkt/openvpn/LaunchVPN.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
index b2bf6b46..e83cffa0 100644
--- a/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
+++ b/app/src/main/java/de/blinkt/openvpn/LaunchVPN.java
@@ -21,13 +21,12 @@ import android.os.Bundle;
import java.io.IOException;
-import de.blinkt.openvpn.activities.LogWindow;
import de.blinkt.openvpn.core.ConnectionStatus;
import de.blinkt.openvpn.core.Preferences;
import de.blinkt.openvpn.core.ProfileManager;
import de.blinkt.openvpn.core.VPNLaunchHelper;
import de.blinkt.openvpn.core.VpnStatus;
-import se.leap.bitmaskclient.R;
+import se.leap.bitmaskclient.MainActivity;
/**
* This Activity actually handles two stages of a launcher shortcut's life cycle.
@@ -143,7 +142,8 @@ public class LaunchVPN extends Activity {
void showLogWindow() {
- Intent startLW = new Intent(getBaseContext(), LogWindow.class);
+ Intent startLW = new Intent(getBaseContext(), MainActivity.class);
+ startLW.putExtra(MainActivity.ACTION_SHOW_LOG_FRAGMENT, true);
startLW.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
startActivity(startLW);