diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-11-12 19:33:22 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2013-12-10 18:21:24 +0100 |
| commit | 734758d983ed1dfd791ffed460bef988a0bcf09a (patch) | |
| tree | 4cc0a7e1d011b7c7f90bb2fdda6a5438acc74f36 /src/se | |
| parent | 39d1a866d042441bf5c05520203973cb3ff5d357 (diff) | |
Rebased onto current develop.
Diffstat (limited to 'src/se')
| -rw-r--r-- | src/se/leap/bitmaskclient/ConfigurationWizard.java | 7 | ||||
| -rw-r--r-- | src/se/leap/bitmaskclient/EIP.java | 2 | ||||
| -rw-r--r-- | src/se/leap/bitmaskclient/NewProviderDialog.java | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/se/leap/bitmaskclient/ConfigurationWizard.java b/src/se/leap/bitmaskclient/ConfigurationWizard.java index e0a0d799..f6b93db4 100644 --- a/src/se/leap/bitmaskclient/ConfigurationWizard.java +++ b/src/se/leap/bitmaskclient/ConfigurationWizard.java @@ -22,9 +22,10 @@ import java.util.Iterator; import org.json.JSONException;
import org.json.JSONObject;
-import se.leap.bitmaskclient.R;
-import se.leap.bitmaskclient.ProviderAPIResultReceiver.Receiver;
-import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
+ +import se.leap.bitmaskclient.R; +import se.leap.bitmaskclient.ProviderAPIResultReceiver.Receiver; +import se.leap.bitmaskclient.ProviderListContent.ProviderItem; import se.leap.bitmaskclient.DownloadFailedDialog.DownloadFailedDialogInterface; import se.leap.bitmaskclient.NewProviderDialog.NewProviderDialogInterface; diff --git a/src/se/leap/bitmaskclient/EIP.java b/src/se/leap/bitmaskclient/EIP.java index ec2f6972..6717aeae 100644 --- a/src/se/leap/bitmaskclient/EIP.java +++ b/src/se/leap/bitmaskclient/EIP.java @@ -58,10 +58,10 @@ import android.util.Log; */ public final class EIP extends IntentService { + public final static String AUTHED = "authed eip"; public final static String ACTION_START_EIP = "se.leap.bitmaskclient.START_EIP"; public final static String ACTION_STOP_EIP = "se.leap.bitmaskclient.STOP_EIP"; public final static String ACTION_UPDATE_EIP_SERVICE = "se.leap.bitmaskclient.UPDATE_EIP_SERVICE"; - public final static String AUTHED_EIP = "authed_eip"; public final static String ACTION_IS_EIP_RUNNING = "se.leap.bitmaskclient.IS_RUNNING"; public final static String EIP_NOTIFICATION = "EIP_NOTIFICATION"; public final static String ALLOWED_ANON = "allow_anonymous"; diff --git a/src/se/leap/bitmaskclient/NewProviderDialog.java b/src/se/leap/bitmaskclient/NewProviderDialog.java index 5a20a355..cf09c64b 100644 --- a/src/se/leap/bitmaskclient/NewProviderDialog.java +++ b/src/se/leap/bitmaskclient/NewProviderDialog.java @@ -16,8 +16,8 @@ */ package se.leap.bitmaskclient; -import se.leap.leapclient.ProviderListContent.ProviderItem; -import se.leap.leapclient.R; +import se.leap.bitmaskclient.ProviderListContent.ProviderItem; +import se.leap.bitmaskclient.R; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; |