summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-12-22 11:07:25 +0100
committerParménides GV <parmegv@sdf.org>2014-12-22 11:07:25 +0100
commit1d37f94a7980d1181a49863cb3880bc7938cc6d1 (patch)
tree8604e855b69ec04894a72e971530207059051ab3
parentc4b797a2b0773088065b8fe62c3451db1312de52 (diff)
Set the adapter before calling ButterKnife.
According to https://github.com/JakeWharton/butterknife/issues/167: "The view isn't set until onPostCreate. You need to either trigger layout creation by setting the adapter before calling ButterKnife or by moving the call to inject to onPostCreate."
-rw-r--r--app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
index 73de29bc..3d9bb7b1 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -82,14 +82,6 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
private String progressbar_text = "";
private String provider_name = "";
private int progress = -1;
-
- private void initProviderList() {
- List<Renderer<Provider>> prototypes = new ArrayList<Renderer<Provider>>();
- prototypes.add(new ProviderRenderer(this));
- ProviderRendererBuilder providerRendererBuilder = new ProviderRendererBuilder(prototypes);
- adapter = new ProviderListAdapter(getLayoutInflater(), providerRendererBuilder, provider_manager);
- provider_list_view.setAdapter(adapter);
- }
@Override
protected void onSaveInstanceState(Bundle outState) {
@@ -109,13 +101,13 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
preferences = getSharedPreferences(Dashboard.SHARED_PREFERENCES, MODE_PRIVATE);
fragment_manager = new FragmentManagerEnhanced(getFragmentManager());
provider_manager = ProviderManager.getInstance(getAssets(), getExternalFilesDir(null));
+
+ setUpProviderList();
setUpInitialUI();
setUpProviderAPIResultReceiver();
- setUpProviderList();
-
if ( savedInstanceState != null ) {
restoreState(savedInstanceState);
}
@@ -147,6 +139,7 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
private void setUpInitialUI() {
setContentView(R.layout.configuration_wizard_activity);
ButterKnife.inject(this);
+ provider_list_view.setAdapter(adapter);
hideProgressBar();
}
@@ -176,6 +169,13 @@ implements NewProviderDialogInterface, ProviderDetailFragmentInterface, Download
update_intent_filter.addCategory(Intent.CATEGORY_DEFAULT);
registerReceiver(providerAPI_broadcast_receiver_update, update_intent_filter);
}
+
+ private void initProviderList() {
+ List<Renderer<Provider>> prototypes = new ArrayList<Renderer<Provider>>();
+ prototypes.add(new ProviderRenderer(this));
+ ProviderRendererBuilder providerRendererBuilder = new ProviderRendererBuilder(prototypes);
+ adapter = new ProviderListAdapter(getLayoutInflater(), providerRendererBuilder, provider_manager);
+ }
@Override
public void onReceiveResult(int resultCode, Bundle resultData) {