From 0d5277d7380ed5ae61216c7041bbafe934827613 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 15 Jun 2021 16:45:45 +0200
Subject: Number of miscellenous fixes and clean ups

---
 .../main/java/de/blinkt/openvpn/core/OpenVPNService.java   |  5 ++++-
 .../java/de/blinkt/openvpn/activities/ConfigConverter.kt   |  1 +
 .../ui/java/de/blinkt/openvpn/activities/MainActivity.java | 14 ++++----------
 .../de/blinkt/openvpn/fragments/Settings_Allowed_Apps.kt   |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'main/src')

diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index d37f34ed..22d451eb 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -891,7 +891,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
         VpnStatus.logInfo(R.string.dns_server_info, TextUtils.join(", ", mDnslist), mDomain);
         VpnStatus.logInfo(R.string.routes_info_incl, TextUtils.join(", ", mRoutes.getNetworks(true)), TextUtils.join(", ", mRoutesv6.getNetworks(true)));
         VpnStatus.logInfo(R.string.routes_info_excl, TextUtils.join(", ", mRoutes.getNetworks(false)), TextUtils.join(", ", mRoutesv6.getNetworks(false)));
-        if (mProxyInfo != null) {
+        if (mProxyInfo != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             VpnStatus.logInfo(R.string.proxy_info, mProxyInfo.getHost(), mProxyInfo.getPort());
         }
         VpnStatus.logDebug(R.string.routes_debug, TextUtils.join(", ", positiveIPv4Routes), TextUtils.join(", ", positiveIPv6Routes));
@@ -1087,6 +1087,9 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
     }
 
     public boolean addHttpProxy(String proxy, int port) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
+            return false;
+
         try {
             mProxyInfo = ProxyInfo.buildDirectProxy(proxy, port);
         } catch (Exception e)
diff --git a/main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.kt b/main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.kt
index 199c7819..5a42599f 100644
--- a/main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.kt
+++ b/main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.kt
@@ -73,6 +73,7 @@ class ConfigConverter : BaseActivity(), FileSelectCallback, View.OnClickListener
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         // Permission declined, do nothing
         if (grantResults.size == 0 || grantResults[0] == PackageManager.PERMISSION_DENIED)
             return
diff --git a/main/src/ui/java/de/blinkt/openvpn/activities/MainActivity.java b/main/src/ui/java/de/blinkt/openvpn/activities/MainActivity.java
index fa6c4159..58698ea3 100644
--- a/main/src/ui/java/de/blinkt/openvpn/activities/MainActivity.java
+++ b/main/src/ui/java/de/blinkt/openvpn/activities/MainActivity.java
@@ -14,6 +14,8 @@ import android.view.MenuItem;
 import androidx.appcompat.app.ActionBar;
 import androidx.viewpager.widget.ViewPager;
 
+import com.google.android.material.tabs.TabLayout;
+
 import de.blinkt.openvpn.R;
 import de.blinkt.openvpn.fragments.AboutFragment;
 import de.blinkt.openvpn.fragments.FaqFragment;
@@ -29,7 +31,7 @@ public class MainActivity extends BaseActivity {
 
     private static final String FEATURE_TELEVISION = "android.hardware.type.television";
     private static final String FEATURE_LEANBACK = "android.software.leanback";
-    //private TabLayout mTabs;
+    private TabLayout mTabs;
     private ViewPager mPager;
     private ScreenSlidePagerAdapter mPagerAdapter;
 
@@ -58,19 +60,11 @@ public class MainActivity extends BaseActivity {
         }
 
 
-        if (isDirectToTV())
+        if (isAndroidTV())
             mPagerAdapter.addTab(R.string.openvpn_log, LogFragment.class);
 
         mPagerAdapter.addTab(R.string.about, AboutFragment.class);
         mPager.setAdapter(mPagerAdapter);
-
-        //mTabs =  findViewById(R.id.sliding_tabs);
-        //mTabs.setViewPager(mPager);
-    }
-
-    private boolean isDirectToTV() {
-        return (getPackageManager().hasSystemFeature(FEATURE_TELEVISION)
-                || getPackageManager().hasSystemFeature(FEATURE_LEANBACK));
     }
 
 
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 9ad32a47..c6712251 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
@@ -90,7 +90,7 @@ class Settings_Allowed_Apps : Fragment(), AdapterView.OnItemClickListener, View.
         mListView.adapter = packageAdapter
 
         Thread(Runnable {
-            packageAdapter.populateList(activity!!)
+            packageAdapter.populateList(requireActivity())
             activity?.runOnUiThread({
                 (v.findViewById<View>(R.id.loading_container)).visibility = View.GONE
                 (v.findViewById<View>(R.id.app_recycler_view)).visibility = View.VISIBLE
-- 
cgit v1.2.3