summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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
-rw-r--r--main/src/ui/res/menu/allowed_apps.xml16
3 files changed, 11 insertions, 10 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)
diff --git a/main/src/ui/res/menu/allowed_apps.xml b/main/src/ui/res/menu/allowed_apps.xml
index d4f2a02a..f357be69 100644
--- a/main/src/ui/res/menu/allowed_apps.xml
+++ b/main/src/ui/res/menu/allowed_apps.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2012-2015 Arne Schwabe
~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
- android:id="@+id/app_search_widget"
- android:actionViewClass="android.widget.SearchView"
- android:icon="@drawable/ic_search_white_24dp"
- android:showAsAction="always"
- android:title="@string/Search"/>
+ android:id="@+id/app_search_widget"
+ android:icon="@drawable/ic_search_white_24dp"
+ app:showAsAction="always"
+ android:title="@string/Search"
+ app:actionViewClass="androidx.appcompat.widget.SearchView" />
</menu> \ No newline at end of file