caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix NPE in pairing dialog

Browse source
This commit is contained in:
Milos Kozak 2021-01-20 15:57:06 +01:00
parent 7aa689d331
commit ad2f2e18b4
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java
View file

@ -60,8 +60,10 @@ public class PairingProgressDialog extends DaggerDialogFragment {
FragmentActivity activity = getActivity(); FragmentActivity activity = getActivity();
if (activity != null) { if (activity != null) {
activity.runOnUiThread(() -> { activity.runOnUiThread(() -> {
if (binding != null) {
binding.danarsPairingprogressProgressbar.setProgress(100); binding.danarsPairingprogressProgressbar.setProgress(100);
binding.danarsPairingprogressStatus.setText(R.string.danars_pairingok); binding.danarsPairingprogressStatus.setText(R.string.danars_pairingok);
}
try { try {
Thread.sleep(1000); Thread.sleep(1000);
} catch (InterruptedException ignored) { } catch (InterruptedException ignored) {
@ -72,7 +74,7 @@ public class PairingProgressDialog extends DaggerDialogFragment {
dismiss(); dismiss();
return; return;
} }
binding.danarsPairingprogressProgressbar.setProgress(i * 5); if (binding != null) binding.danarsPairingprogressProgressbar.setProgress(i * 5);
try { try {
Thread.sleep(1000); Thread.sleep(1000);
} catch (InterruptedException ignored) { } catch (InterruptedException ignored) {
@ -81,9 +83,11 @@ public class PairingProgressDialog extends DaggerDialogFragment {
FragmentActivity activity = getActivity(); FragmentActivity activity = getActivity();
if (activity != null) { if (activity != null) {
activity.runOnUiThread(() -> { activity.runOnUiThread(() -> {
if (binding != null) {
binding.danarsPairingprogressProgressbar.setProgress(100); binding.danarsPairingprogressProgressbar.setProgress(100);
binding.danarsPairingprogressStatus.setText(R.string.danars_pairingtimedout); binding.danarsPairingprogressStatus.setText(R.string.danars_pairingtimedout);
binding.ok.setVisibility(View.VISIBLE); binding.ok.setVisibility(View.VISIBLE);
}
}); });
} }
}; };
@ -131,12 +135,20 @@ public class PairingProgressDialog extends DaggerDialogFragment {
disposable.clear(); disposable.clear();
} }
@Override
public void onDestroyView() {
super.onDestroyView();
binding = null;
}
private void setViews() { private void setViews() {
if (binding != null) {
binding.danarsPairingprogressProgressbar.setMax(100); binding.danarsPairingprogressProgressbar.setMax(100);
binding.danarsPairingprogressProgressbar.setProgress(0); binding.danarsPairingprogressProgressbar.setProgress(0);
binding.danarsPairingprogressStatus.setText(resourceHelper.gs(R.string.danars_waitingforpairing)); binding.danarsPairingprogressStatus.setText(resourceHelper.gs(R.string.danars_waitingforpairing));
binding.ok.setVisibility(View.GONE); binding.ok.setVisibility(View.GONE);
binding.ok.setOnClickListener(v -> dismiss()); binding.ok.setOnClickListener(v -> dismiss());
}
handler.post(runnable); handler.post(runnable);
} }