diff options
| author | fupduck <fupduck@riseup.net> | 2018-01-21 08:56:46 -0800 |
|---|---|---|
| committer | fupduck <fupduck@riseup.net> | 2018-01-21 08:56:46 -0800 |
| commit | df8b1fcf1ecc55f15229935294a337c897960ff4 (patch) | |
| tree | 1b7279bd85200b04478f9bfe2933f9075385b703 /app/src/main/java/se/leap/bitmaskclient/Dashboard.java | |
| parent | dbda5fbf23ccad615e932be6b8869fe34a6b440d (diff) | |
| parent | 1393b75a17d1c7a60b9ca72a874535824d63db2d (diff) | |
Merge branch '8811_rename_vpn_to_provider_name' into '0.9.8'
8811 rename vpn to provider name
See merge request leap/bitmask_android!26
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/Dashboard.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/Dashboard.java | 3 |
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; |