From 2917ef64a867649aecbb2152d776ace060f762fa Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 2 Sep 2021 23:44:41 +0200 Subject: [PATCH] setUpStartVisibility: check widgets are available to avoid NPEs --- .../fdroid/nearby/SwapWorkflowActivity.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java index bfd49dcea..aedb2545f 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java @@ -1007,18 +1007,18 @@ public class SwapWorkflowActivity extends AppCompatActivity { } private void setUpStartVisibility() { - TextView viewWifiNetwork = findViewById(R.id.wifi_network); bluetoothStatusReceiver.onReceive(this, new Intent(BluetoothManager.ACTION_STATUS)); bonjourStatusReceiver.onReceive(this, new Intent(BonjourManager.ACTION_STATUS)); - viewWifiNetwork.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - promptToSelectWifiNetwork(); - } - }); - + TextView viewWifiNetwork = findViewById(R.id.wifi_network); SwitchMaterial wifiSwitch = findViewById(R.id.switch_wifi); + MaterialButton scanQrButton = findViewById(R.id.btn_scan_qr); + MaterialButton appsButton = findViewById(R.id.btn_apps); + if (viewWifiNetwork == null || wifiSwitch == null || scanQrButton == null || appsButton == null) { + return; + } + viewWifiNetwork.setOnClickListener(v -> promptToSelectWifiNetwork()); + wifiSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @@ -1036,10 +1036,8 @@ public class SwapWorkflowActivity extends AppCompatActivity { } }); - MaterialButton scanQrButton = findViewById(R.id.btn_scan_qr); scanQrButton.setOnClickListener(v -> inflateSwapView(R.layout.swap_wifi_qr)); - MaterialButton appsButton = findViewById(R.id.btn_apps); appsButton.setOnClickListener(v -> inflateSwapView(R.layout.swap_select_apps)); appsButton.setEllipsize(TextUtils.TruncateAt.END);