diff options
author | Fup Duck <fupduck@sacknagel.com> | 2018-02-16 10:38:41 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-16 10:38:41 +0100 |
commit | 9108878992e9825a00c44f0596818d0ab245b183 (patch) | |
tree | 088b116ca4b1236827337a3d5ae204abc0f907bb /app/src/main/java/de/blinkt/openvpn/LaunchVPN.java | |
parent | 6c1434addf1ee25a8c7ce30c240e2033d5075f35 (diff) | |
parent | 0365f243fc56112b2f43b35e1b4884d2d1ad2aa4 (diff) |
Merge branch 'leap_0.9.8' into #8797_certificate_expiration
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/LaunchVPN.java')
-rw-r--r-- | app/src/main/java/de/blinkt/openvpn/LaunchVPN.java | 6 |
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); |