mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-11 18:29:05 +01:00
Merge branch '2446-illegal-state-exception-hotspot-activity' into 'master'
Move initialisation of condition manager so it's only called once Closes #2446 See merge request briar/briar!1821
This commit is contained in:
@@ -61,6 +61,7 @@ public class HotspotIntroFragment extends Fragment {
|
|||||||
getAndroidComponent(activity).inject(this);
|
getAndroidComponent(activity).inject(this);
|
||||||
viewModel = new ViewModelProvider(activity, viewModelFactory)
|
viewModel = new ViewModelProvider(activity, viewModelFactory)
|
||||||
.get(HotspotViewModel.class);
|
.get(HotspotViewModel.class);
|
||||||
|
conditionManager.init(requireActivity());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -76,8 +77,6 @@ public class HotspotIntroFragment extends Fragment {
|
|||||||
|
|
||||||
startButton.setOnClickListener(this::onButtonClick);
|
startButton.setOnClickListener(this::onButtonClick);
|
||||||
|
|
||||||
conditionManager.init(requireActivity());
|
|
||||||
|
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user