X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyCell.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacycell%2Factivities%2FProtocolsActivity.kt;h=8a5912ffa9c396c0a41ae39020d68f29ae4706c6;hp=1a926fe0770501e5536c6bfd51b09f332e076779;hb=b11b84b24c660fac3a69f2dbe4bd615d73811219;hpb=7467e75bda34246c91c4e4989b1c32a81314d53c

diff --git a/app/src/main/java/com/stoutner/privacycell/activities/ProtocolsActivity.kt b/app/src/main/java/com/stoutner/privacycell/activities/ProtocolsActivity.kt
index 1a926fe..8a5912f 100644
--- a/app/src/main/java/com/stoutner/privacycell/activities/ProtocolsActivity.kt
+++ b/app/src/main/java/com/stoutner/privacycell/activities/ProtocolsActivity.kt
@@ -31,6 +31,7 @@ import androidx.preference.PreferenceManager
 
 import com.stoutner.privacycell.R
 import com.stoutner.privacycell.adapters.ProtocolArrayAdapter
+import com.stoutner.privacycell.dataclasses.Protocol
 import com.stoutner.privacycell.dialogs.WebViewDialog
 
 class ProtocolsActivity : AppCompatActivity() {
@@ -65,42 +66,42 @@ class ProtocolsActivity : AppCompatActivity() {
         actionBar.setDisplayHomeAsUpEnabled(true)
 
         // Create a protocol array list.
-        val protocolArrayList = ArrayList<Pair<String, Boolean>>()
+        val protocolArrayList = ArrayList<Protocol>()
 
         // Populate the protocol array list.  Headers are followed by `true`.
-        protocolArrayList.add(Pair(getString(R.string.protocol_2g), true))
-        protocolArrayList.add(Pair(getString(R.string.cdma_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.gsm_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.iden_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.gprs_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.edge_detail), false))
-
-        protocolArrayList.add(Pair(getString(R.string.protocol_3g), true))
-        protocolArrayList.add(Pair(getString(R.string.rtt_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.evdo_0_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.evdo_a_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.evdo_b_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.ehrpd_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.umts_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.td_scdma_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.hsdpa_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.hsupa_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.hspa_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.hspap_detail), false))
-
-        protocolArrayList.add(Pair(getString(R.string.protocol_4g), true))
-        protocolArrayList.add(Pair(getString(R.string.lte_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.lte_ca_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.lte_advanced_pro_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.nr_nsa_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.nr_nsa_mmwave_detail), false))
-
-        protocolArrayList.add(Pair(getString(R.string.protocol_5g), true))
-        protocolArrayList.add(Pair(getString(R.string.nr_detail), false))
-        protocolArrayList.add(Pair(getString(R.string.nr_advanced_detail), false))
-
-        protocolArrayList.add(Pair(getString(R.string.protocol_other), true))
-        protocolArrayList.add(Pair(getString(R.string.iwlan_detail), false))
+        protocolArrayList.add(Protocol(getString(R.string.protocol_2g), isHeader = true, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.cdma_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.gsm_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.iden_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.gprs_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.edge_detail), isHeader = false, isAdditionalNetworkInfo = false))
+
+        protocolArrayList.add(Protocol(getString(R.string.protocol_3g), isHeader = true, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.rtt_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.evdo_0_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.evdo_a_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.evdo_b_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.ehrpd_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.umts_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.td_scdma_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.hsdpa_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.hsupa_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.hspa_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.hspap_detail), isHeader = false, isAdditionalNetworkInfo = false))
+
+        protocolArrayList.add(Protocol(getString(R.string.protocol_4g), isHeader = true, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.lte_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.lte_ca_detail), isHeader = false, isAdditionalNetworkInfo = true))
+        protocolArrayList.add(Protocol(getString(R.string.lte_advanced_pro_detail), isHeader = false, isAdditionalNetworkInfo = true))
+        protocolArrayList.add(Protocol(getString(R.string.nr_nsa_detail), isHeader = false, isAdditionalNetworkInfo = true))
+        protocolArrayList.add(Protocol(getString(R.string.nr_nsa_mmwave_detail), isHeader = false, isAdditionalNetworkInfo = true))
+
+        protocolArrayList.add(Protocol(getString(R.string.protocol_5g), isHeader = true, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.nr_detail), isHeader = false, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.nr_advanced_detail), isHeader = false, isAdditionalNetworkInfo = true))
+
+        protocolArrayList.add(Protocol(getString(R.string.protocol_other), isHeader = true, isAdditionalNetworkInfo = false))
+        protocolArrayList.add(Protocol(getString(R.string.iwlan_detail), isHeader = false, isAdditionalNetworkInfo = false))
 
         // Instantiate the protocol array adapter.
         val protocolArrayAdapter = ProtocolArrayAdapter(this, protocolArrayList)