From cbdaa48705855169827f29014efbaa934d212ccf Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Tue, 12 Nov 2019 22:58:14 +0100 Subject: Convert most fragments/activities to androidx --- .../java/de/blinkt/openvpn/activities/BaseActivity.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'main/src/ui/java/de/blinkt/openvpn/activities/BaseActivity.java') diff --git a/main/src/ui/java/de/blinkt/openvpn/activities/BaseActivity.java b/main/src/ui/java/de/blinkt/openvpn/activities/BaseActivity.java index 7258d8d6..68dd137e 100644 --- a/main/src/ui/java/de/blinkt/openvpn/activities/BaseActivity.java +++ b/main/src/ui/java/de/blinkt/openvpn/activities/BaseActivity.java @@ -5,21 +5,18 @@ package de.blinkt.openvpn.activities; -import android.annotation.TargetApi; -import android.app.Activity; import android.app.UiModeManager; -import android.content.Context; -import android.content.RestrictionsManager; import android.content.res.Configuration; -import android.os.Build; import android.os.Bundle; -import android.os.UserManager; import android.view.Window; -import de.blinkt.openvpn.api.AppRestrictions; -public class BaseActivity extends Activity { +import androidx.appcompat.app.AppCompatActivity; + +public abstract class BaseActivity extends AppCompatActivity { private boolean isAndroidTV() { - final UiModeManager uiModeManager = (UiModeManager) getSystemService(Activity.UI_MODE_SERVICE); + final UiModeManager uiModeManager = (UiModeManager) getSystemService(UI_MODE_SERVICE); + if (uiModeManager == null) + return false; return uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION; } -- cgit v1.2.3