summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2018-01-21 18:01:26 +0100
committerFup Duck <fupduck@sacknagel.com>2018-01-21 18:01:26 +0100
commit6e45a5bcb4de152543b5dd5d9bd2027fb62f7375 (patch)
tree426b1e4ffe9578c106884ce6aef01d9dfa1ca56e /app/src/main/java/se/leap/bitmaskclient/Dashboard.java
parent3b6bc548f6197dfbd8a4e55524a3f6e0cdd224c0 (diff)
parentdf8b1fcf1ecc55f15229935294a337c897960ff4 (diff)
Merge remote-tracking branch '0xacab/0.9.8' into 8819_config_wizard_design
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/Dashboard.java')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/Dashboard.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index 82ff9db8..5ccb48b5 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -18,7 +18,6 @@ package se.leap.bitmaskclient;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
-import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -42,8 +41,8 @@ import java.util.List;
import java.util.Map;
import butterknife.InjectView;
-import se.leap.bitmaskclient.fragments.AboutFragment;
import de.blinkt.openvpn.core.VpnStatus;
+import se.leap.bitmaskclient.fragments.AboutFragment;
import se.leap.bitmaskclient.userstatus.SessionDialog;
import se.leap.bitmaskclient.userstatus.User;
import se.leap.bitmaskclient.userstatus.UserStatusFragment;