From 0c38405965f96a72e1abda2da5cf47659eaa9457 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Wed, 8 Jul 2020 05:43:36 +0530
Subject: [PATCH] Use view binding in TrustedNetworksActivity.

---
 .../TrustedNetworksActivity.java              | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java b/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java
index 42f1cfaf..b273eb90 100644
--- a/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java
+++ b/src/org/kde/kdeconnect/UserInterface/TrustedNetworksActivity.java
@@ -15,12 +15,13 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import org.kde.kdeconnect.Helpers.TrustedNetworkHelper;
 import org.kde.kdeconnect_tp.R;
+import org.kde.kdeconnect_tp.databinding.TrustedNetworkListBinding;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class TrustedNetworksActivity extends AppCompatActivity {
-
+    private TrustedNetworkListBinding binding;
     private List<String> trustedNetworks;
 
     private ListView trustedNetworksView;
@@ -46,15 +47,16 @@ public class TrustedNetworksActivity extends AppCompatActivity {
 
         ThemeUtil.setUserPreferredTheme(this);
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.trusted_network_list);
-        trustedNetworksView = findViewById(android.R.id.list);
+
+        binding = TrustedNetworkListBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        trustedNetworksView = binding.list;
 
         trustedNetworkHelper = new TrustedNetworkHelper(getApplicationContext());
         trustedNetworks = new ArrayList<>(trustedNetworkHelper.read());
 
-        allowAllCheckBox = findViewById(R.id.trust_all_networks_checkBox);
+        allowAllCheckBox = binding.trustAllNetworksCheckBox;
         allowAllCheckBox.setOnCheckedChangeListener((v, isChecked) -> {
-
             if (trustedNetworkHelper.hasPermissions()) {
                 trustedNetworkHelper.allAllowed(isChecked);
                 updateTrustedNetworkListView();
@@ -78,12 +80,11 @@ public class TrustedNetworksActivity extends AppCompatActivity {
 
     private void updateEmptyListMessage() {
         boolean isVisible = trustedNetworks.isEmpty() && !trustedNetworkHelper.allAllowed();
-        findViewById(R.id.trusted_network_list_empty)
-                .setVisibility(isVisible ? View.VISIBLE : View.GONE );
+        binding.trustedNetworkListEmpty.setVisibility(isVisible ? View.VISIBLE : View.GONE );
     }
 
     private void updateTrustedNetworkListView() {
-        Boolean allAllowed = trustedNetworkHelper.allAllowed();
+        boolean allAllowed = trustedNetworkHelper.allAllowed();
         updateEmptyListMessage();
         trustedNetworksView.setVisibility(allAllowed ? View.GONE : View.VISIBLE);
         if (allAllowed){
@@ -108,19 +109,18 @@ public class TrustedNetworksActivity extends AppCompatActivity {
         addNetworkButton();
     }
 
-
     private void addNetworkButton() {
-        Button addButton = findViewById(android.R.id.button1);
+        Button addButton = binding.button1;
         if (trustedNetworkHelper.allAllowed()) {
             addButton.setVisibility(View.GONE);
             return;
         }
         final String currentSSID = trustedNetworkHelper.currentSSID();
-        if (!currentSSID.isEmpty() && trustedNetworks.indexOf(currentSSID) == -1) {
+        if (!currentSSID.isEmpty() && !trustedNetworks.contains(currentSSID)) {
             String buttonText = getString(R.string.add_trusted_network, currentSSID);
             addButton.setText(buttonText);
             addButton.setOnClickListener(v -> {
-                if (trustedNetworks.indexOf(currentSSID) != -1){
+                if (trustedNetworks.contains(currentSSID)){
                     return;
                 }
                 trustedNetworks.add(currentSSID);