summaryrefslogtreecommitdiff
path: root/main/src/ui/java/de
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2019-11-22 11:24:52 +0100
committerArne Schwabe <arne@rfc2549.org>2019-11-22 11:24:52 +0100
commit9145688099385694e9b73727c24e9e35de1df2af (patch)
treef77322dc5e7e45de75d427137b2ccb10e9705e42 /main/src/ui/java/de
parent3b4ce6d5588c87bcc621a0054166c81de31d63aa (diff)
Fix issues with search widget
Diffstat (limited to 'main/src/ui/java/de')
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/ImportASConfig.kt1
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.kt4
2 files changed, 3 insertions, 2 deletions
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/ImportASConfig.kt b/main/src/ui/java/de/blinkt/openvpn/fragments/ImportASConfig.kt
index f501c0cf..1788f9c7 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/ImportASConfig.kt
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/ImportASConfig.kt
@@ -280,7 +280,6 @@ class ImportASConfig : DialogFragment() {
.setPositiveButton("Trust") { _, _ -> addPinnedCert(requireContext(), asProfileUri.host(), fp) }
.setNegativeButton("Do not trust", null)
.show()
- Toast.makeText(requireContext(), "Found cert with FP ${fp}: ${firstCert.subjectDN.toString()}", Toast.LENGTH_LONG).show()
}
}
}
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.kt b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.kt
index e3879775..56171388 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.kt
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.kt
@@ -24,9 +24,9 @@ import android.widget.Filter
import android.widget.Filterable
import android.widget.ImageView
import android.widget.ListView
-import android.widget.SearchView
import android.widget.Switch
import android.widget.TextView
+import androidx.appcompat.widget.SearchView
import androidx.fragment.app.Fragment
import java.util.Collections
@@ -108,6 +108,8 @@ class Settings_Allowed_Apps : Fragment(), AdapterView.OnItemClickListener, Compo
super.onCreateOptionsMenu(menu, inflater)
}
+
+
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
val v = inflater.inflate(R.layout.allowed_vpn_apps, container, false)