X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=inline;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacycell%2Fdialogs%2FWebViewDialog.kt;h=0a40933c95174739c3bc5e95d139c4b7851c8032;hb=7467e75bda34246c91c4e4989b1c32a81314d53c;hp=3b448bd666f0e75b6fd84902884e4abe3aa5f0a1;hpb=20a6dc6adf6f00afe244596b87c96361d040989f;p=PrivacyCell.git diff --git a/app/src/main/java/com/stoutner/privacycell/dialogs/WebViewDialog.kt b/app/src/main/java/com/stoutner/privacycell/dialogs/WebViewDialog.kt index 3b448bd..0a40933 100644 --- a/app/src/main/java/com/stoutner/privacycell/dialogs/WebViewDialog.kt +++ b/app/src/main/java/com/stoutner/privacycell/dialogs/WebViewDialog.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2021 Soren Stoutner . + * Copyright © 2021-2022 Soren Stoutner . * * This file is part of Privacy Cell . * @@ -49,31 +49,33 @@ class WebViewDialog : DialogFragment() { const val LICENSES = 3 const val CONTRIBUTORS = 4 const val STINGRAY = 5 - const val NETWORK_UNKNOWN = 6 - const val NETWORK_GPRS = 7 - const val NETWORK_EDGE = 8 - const val NETWORK_UMTS = 9 - const val NETWORK_CDMA = 10 - const val NETWORK_EVDO_0 = 11 - const val NETWORK_EVDO_A = 12 - const val NETWORK_1xRTT = 13 - const val NETWORK_HSDPA = 14 - const val NETWORK_HSUPA = 15 - const val NETWORK_HSPA = 16 - const val NETWORK_IDEN = 17 - const val NETWORK_EVDO_B = 18 - const val NETWORK_LTE = 19 - const val NETWORK_EHRPD = 20 - const val NETWORK_HSPAP = 21 - const val NETWORK_GSM = 22 - const val NETWORK_TD_SCDMA = 23 - const val NETWORK_IWLAN = 24 - const val NETWORK_NR = 25 - const val OVERRIDE_NETWORK_NONE = 26 - const val OVERRIDE_NETWORK_LTE_CA = 27 - const val OVERRIDE_NETWORK_LTE_ADVANCED_PRO = 28 - const val OVERRIDE_NETWORK_NR_NSA = 29 - const val OVERRIDE_NETWORK_NR_NSA_MMWAVE = 30 + const val ANTIQUATED_NETWORK = 6 + const val NETWORK_UNKNOWN = 7 + const val NETWORK_GPRS = 8 + const val NETWORK_EDGE = 9 + const val NETWORK_UMTS = 10 + const val NETWORK_CDMA = 11 + const val NETWORK_EVDO_0 = 12 + const val NETWORK_EVDO_A = 13 + const val NETWORK_1xRTT = 14 + const val NETWORK_HSDPA = 15 + const val NETWORK_HSUPA = 16 + const val NETWORK_HSPA = 17 + const val NETWORK_IDEN = 18 + const val NETWORK_EVDO_B = 19 + const val NETWORK_LTE = 20 + const val NETWORK_EHRPD = 21 + const val NETWORK_HSPAP = 22 + const val NETWORK_GSM = 23 + const val NETWORK_TD_SCDMA = 24 + const val NETWORK_IWLAN = 25 + const val NETWORK_NR = 26 + const val OVERRIDE_NETWORK_NONE = 27 + const val OVERRIDE_NETWORK_LTE_CA = 28 + const val OVERRIDE_NETWORK_LTE_ADVANCED_PRO = 29 + const val OVERRIDE_NETWORK_NR_NSA = 30 + const val OVERRIDE_NETWORK_NR_NSA_MMWAVE = 31 // Can be removed once the minimum API >= 31. + const val OVERRIDE_NETWORK_NR_ADVANCED = 32 } // Define the class views. @@ -148,15 +150,23 @@ class WebViewDialog : DialogFragment() { STINGRAY -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.secure_5g_nr_sa) + dialogBuilder.setIcon(R.drawable.secure) // Set the tile. dialogBuilder.setTitle(R.string.stingrays) } + ANTIQUATED_NETWORK -> { + // Set the icon. + dialogBuilder.setIcon(R.drawable.antiquated) + + // Set the title. + dialogBuilder.setTitle(R.string.antiquated_network_title) + } + NETWORK_UNKNOWN -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.unknown) @@ -164,7 +174,7 @@ class WebViewDialog : DialogFragment() { NETWORK_GPRS -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.gprs) @@ -172,7 +182,7 @@ class WebViewDialog : DialogFragment() { NETWORK_EDGE -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.edge) @@ -180,7 +190,7 @@ class WebViewDialog : DialogFragment() { NETWORK_UMTS -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.umts) @@ -188,7 +198,7 @@ class WebViewDialog : DialogFragment() { NETWORK_CDMA -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.cdma) @@ -196,7 +206,7 @@ class WebViewDialog : DialogFragment() { NETWORK_EVDO_0 -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.evdo_0) @@ -204,7 +214,7 @@ class WebViewDialog : DialogFragment() { NETWORK_EVDO_A -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.evdo_a) @@ -212,7 +222,7 @@ class WebViewDialog : DialogFragment() { NETWORK_1xRTT -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.rtt) @@ -220,7 +230,7 @@ class WebViewDialog : DialogFragment() { NETWORK_HSDPA -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.hsdpa) @@ -228,7 +238,7 @@ class WebViewDialog : DialogFragment() { NETWORK_HSUPA -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.hsupa) @@ -236,7 +246,7 @@ class WebViewDialog : DialogFragment() { NETWORK_HSPA -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.hspa) @@ -244,7 +254,7 @@ class WebViewDialog : DialogFragment() { NETWORK_IDEN -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.iden) @@ -252,7 +262,7 @@ class WebViewDialog : DialogFragment() { NETWORK_EVDO_B -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.evdo_b) @@ -260,7 +270,7 @@ class WebViewDialog : DialogFragment() { NETWORK_LTE -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.lte) @@ -268,7 +278,7 @@ class WebViewDialog : DialogFragment() { NETWORK_EHRPD -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.ehrpd) @@ -276,7 +286,7 @@ class WebViewDialog : DialogFragment() { NETWORK_HSPAP -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.hspap) @@ -284,7 +294,7 @@ class WebViewDialog : DialogFragment() { NETWORK_GSM -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.gsm) @@ -292,7 +302,7 @@ class WebViewDialog : DialogFragment() { NETWORK_TD_SCDMA -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.td_scdma) @@ -300,7 +310,7 @@ class WebViewDialog : DialogFragment() { NETWORK_IWLAN -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.iwlan) @@ -308,7 +318,7 @@ class WebViewDialog : DialogFragment() { NETWORK_NR -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.nr) @@ -316,7 +326,7 @@ class WebViewDialog : DialogFragment() { OVERRIDE_NETWORK_NONE -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.none) @@ -324,7 +334,7 @@ class WebViewDialog : DialogFragment() { OVERRIDE_NETWORK_LTE_CA -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.lte_ca) @@ -332,15 +342,15 @@ class WebViewDialog : DialogFragment() { OVERRIDE_NETWORK_LTE_ADVANCED_PRO -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. - dialogBuilder.setTitle(R.string.lte_ca) + dialogBuilder.setTitle(R.string.lte_advanced_pro) } OVERRIDE_NETWORK_NR_NSA -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.nr_nsa) @@ -348,11 +358,19 @@ class WebViewDialog : DialogFragment() { OVERRIDE_NETWORK_NR_NSA_MMWAVE -> { // Set the icon. - dialogBuilder.setIcon(R.drawable.privacy_policy) + dialogBuilder.setIcon(R.drawable.protocols) // Set the title. dialogBuilder.setTitle(R.string.nr_nsa_mmwave) } + + OVERRIDE_NETWORK_NR_ADVANCED -> { + // Set the icon. + dialogBuilder.setIcon(R.drawable.protocols) + + // Set the title. + dialogBuilder.setTitle(R.string.nr_advanced) + } } // Set the view. @@ -414,6 +432,7 @@ class WebViewDialog : DialogFragment() { LICENSES -> webView.loadUrl("https://appassets.androidplatform.net/assets/" + getString(R.string.asset_directory) + "/licenses.html") CONTRIBUTORS -> webView.loadUrl("https://appassets.androidplatform.net/assets/" + getString(R.string.asset_directory) + "/contributors.html") STINGRAY -> webView.loadUrl("https://appassets.androidplatform.net/assets/" + getString(R.string.asset_directory) + "/explanations/stingrays.html") + ANTIQUATED_NETWORK -> webView.loadUrl("https://appassets.androidplatform.net/assets/" + getString(R.string.asset_directory) + "/explanations/antiquated_network.html") NETWORK_UNKNOWN -> webView.loadUrl("https://appassets.androidplatform.net/assets/" + getString(R.string.asset_directory) + "/explanations/network_unknown.html") NETWORK_GPRS -> webView.loadUrl("https://appassets.androidplatform.net/assets/" + getString(R.string.asset_directory) + "/explanations/network_gprs.html") NETWORK_EDGE -> webView.loadUrl("https://appassets.androidplatform.net/assets/" + getString(R.string.asset_directory) + "/explanations/network_edge.html") @@ -439,7 +458,9 @@ class WebViewDialog : DialogFragment() { OVERRIDE_NETWORK_LTE_ADVANCED_PRO -> webView.loadUrl("https://appassets.androidplatform.net/assets/" + getString(R.string.asset_directory) + "/explanations/override_network_lte_advanced_pro.html") OVERRIDE_NETWORK_NR_NSA -> webView.loadUrl("https://appassets.androidplatform.net/assets/" + getString(R.string.asset_directory) + "/explanations/override_network_nr_nsa.html") + // The item below can be removed once the minimum API >= 31. OVERRIDE_NETWORK_NR_NSA_MMWAVE -> webView.loadUrl("https://appassets.androidplatform.net/assets/" + getString(R.string.asset_directory) + "/explanations/override_network_nr_nsa_mmwave.html") + OVERRIDE_NETWORK_NR_ADVANCED -> webView.loadUrl("https://appassets.androidplatform.net/assets/" + getString(R.string.asset_directory) + "/explanations/override_network_nr_advanced.html") } // Scroll the WebView if the saved instance state is not null.