diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/se/leap/bitmaskclient/Dashboard.java | 8 | ||||
| -rw-r--r-- | src/se/leap/bitmaskclient/EipServiceFragment.java | 5 | ||||
| -rw-r--r-- | src/se/leap/bitmaskclient/ProviderListAdapter.java (renamed from src/se/leap/leapclient/ProviderListAdapter.java) | 2 | ||||
| -rw-r--r-- | src/se/leap/bitmaskclient/ProviderListFragment.java | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/src/se/leap/bitmaskclient/Dashboard.java b/src/se/leap/bitmaskclient/Dashboard.java index 5066f286..103310bb 100644 --- a/src/se/leap/bitmaskclient/Dashboard.java +++ b/src/se/leap/bitmaskclient/Dashboard.java @@ -89,7 +89,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf app = this; PRNGFixes.apply(); - mProgressBar = (ProgressBar) findViewById(R.id.progressbar_dashboard); + //mProgressBar = (ProgressBar) findViewById(R.id.progressbar_dashboard); providerAPI_broadcast_receiver_update = new ProviderAPIBroadcastReceiver_Update(); @@ -434,7 +434,13 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf public static Context getAppContext() { return app; } + + @Override + public void startActivityForResult(Intent intent, int requestCode) { + intent.putExtra(Dashboard.REQUEST_CODE, requestCode); + super.startActivityForResult(intent, requestCode); + } /** * Send a command to EIP * diff --git a/src/se/leap/bitmaskclient/EipServiceFragment.java b/src/se/leap/bitmaskclient/EipServiceFragment.java index 0d73f544..4d778b1a 100644 --- a/src/se/leap/bitmaskclient/EipServiceFragment.java +++ b/src/se/leap/bitmaskclient/EipServiceFragment.java @@ -178,11 +178,8 @@ public class EipServiceFragment extends Fragment implements StateListener, OnCli String statusMessage = ""; String prefix = getString(localizedResId); if (state.equals("CONNECTED")){ -<<<<<<< HEAD + statusMessage = getString(R.string.eip_state_connected); -======= - statusMessage = getResources().getString(R.string.connection_secure); ->>>>>>> Dashboard asks for real VPN state. getActivity().findViewById(R.id.eipProgress).setVisibility(View.GONE); mEipStartPending = false; } else if (state.equals("BYTECOUNT")) { diff --git a/src/se/leap/leapclient/ProviderListAdapter.java b/src/se/leap/bitmaskclient/ProviderListAdapter.java index baaa10ba..19c4f72c 100644 --- a/src/se/leap/leapclient/ProviderListAdapter.java +++ b/src/se/leap/bitmaskclient/ProviderListAdapter.java @@ -1,4 +1,4 @@ -package se.leap.leapclient; +package se.leap.bitmaskclient; import java.util.List; diff --git a/src/se/leap/bitmaskclient/ProviderListFragment.java b/src/se/leap/bitmaskclient/ProviderListFragment.java index 61ed040a..84d46a11 100644 --- a/src/se/leap/bitmaskclient/ProviderListFragment.java +++ b/src/se/leap/bitmaskclient/ProviderListFragment.java @@ -203,8 +203,10 @@ public class ProviderListFragment extends ListFragment { }
public void unhideAll() {
- if(content_adapter != null)
+ if(content_adapter != null) {
content_adapter.unHideAll();
+ content_adapter.notifyDataSetChanged();
+ }
}
/**
|