diff options
| author | cyBerta <richy@cyborgsociety.org> | 2013-12-20 20:25:48 +0100 |
|---|---|---|
| committer | cyBerta <richy@cyborgsociety.org> | 2013-12-20 20:25:48 +0100 |
| commit | 31e0ee7819ff6e852bc40f66858f0ac02659bf04 (patch) | |
| tree | 85969d750a2473a95603e07f256681ca46c746cd /src/se/leap/bitmaskclient/Dashboard.java | |
| parent | 8bc035e5785b8a14c26cdb6ab409242b66554992 (diff) | |
| parent | c500f60c9188c938b550b8741ca9a4f4939429e4 (diff) | |
Merge branch 'feature/token-based-auth' into develop
Conflicts:
src/se/leap/bitmaskclient/ConfigurationWizard.java
src/se/leap/bitmaskclient/Dashboard.java
src/se/leap/bitmaskclient/ProviderAPI.java
src/se/leap/bitmaskclient/ProviderListFragment.java
Diffstat (limited to 'src/se/leap/bitmaskclient/Dashboard.java')
| -rw-r--r-- | src/se/leap/bitmaskclient/Dashboard.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/se/leap/bitmaskclient/Dashboard.java b/src/se/leap/bitmaskclient/Dashboard.java index 7f898a67..01a9c20a 100644 --- a/src/se/leap/bitmaskclient/Dashboard.java +++ b/src/se/leap/bitmaskclient/Dashboard.java @@ -88,6 +88,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf // mProgressBar = (ProgressBar) findViewById(R.id.eipProgress); // eipStatus = (TextView) findViewById(R.id.eipStatus); + mProgressBar = (ProgressBar) findViewById(R.id.eipProgress); ConfigHelper.setSharedPreferences(getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE)); @@ -465,4 +466,5 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf startService(eip_intent); } + } |