summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-12-04 01:14:03 +0100
committerParménides GV <parmegv@sdf.org>2014-12-04 01:14:03 +0100
commit568e5b77e7e34e10e5585614f5587df29f45cfd9 (patch)
treeb7707de89f35f5968bf02527fcb4a7d5345c5817 /app
parent6c79290b1783a303fad5ea8be3c3583cc79dad84 (diff)
CW loads, but no provider list appears.
Diffstat (limited to 'app')
-rw-r--r--app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java7
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/ProviderListFragment.java5
-rw-r--r--app/src/main/res/layout/configuration_wizard_activity.xml1
3 files changed, 8 insertions, 5 deletions
diff --git a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
index 65cab91e..55bb43a2 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -45,7 +45,7 @@ import se.leap.bitmaskclient.eip.Constants;
* @author parmegv
*
*/
-public class ConfigurationWizard extends ListActivity
+public class ConfigurationWizard extends Activity
implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderDetailFragmentInterface, DownloadFailedDialogInterface, Receiver {
@InjectView(R.id.progressbar_configuration_wizard)
@@ -96,7 +96,6 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
super.onCreate(savedInstanceState);
preferences = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE);
fragment_manager = new FragmentManagerEnhanced(getFragmentManager());
- ButterKnife.inject(this);
setUpInitialUI();
@@ -136,7 +135,9 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
private void setUpInitialUI() {
setContentView(R.layout.configuration_wizard_activity);
- hideProgressBar();
+ ButterKnife.inject(this);
+
+ hideProgressBar();
}
private void hideProgressBar() {
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListFragment.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListFragment.java
index e5baebc0..6d40bf9f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderListFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListFragment.java
@@ -24,6 +24,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ListView;
+import butterknife.ButterKnife;
import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
/**
@@ -107,7 +108,9 @@ public class ProviderListFragment extends ListFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
- return inflater.inflate(R.layout.provider_list_fragment, container, false);
+ View view = inflater.inflate(R.layout.provider_list_fragment, container, false);
+ ButterKnife.inject(this, view);
+ return view;
}
@Override
diff --git a/app/src/main/res/layout/configuration_wizard_activity.xml b/app/src/main/res/layout/configuration_wizard_activity.xml
index f3d0e48b..49c4b2b9 100644
--- a/app/src/main/res/layout/configuration_wizard_activity.xml
+++ b/app/src/main/res/layout/configuration_wizard_activity.xml
@@ -22,5 +22,4 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_centerHorizontal="true"
android:textColor="@android:color/holo_blue_bright" />
-
</RelativeLayout> \ No newline at end of file