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 --- .../de/blinkt/openvpn/activities/BaseActivity.java | 15 +++--- .../blinkt/openvpn/activities/ConfigConverter.kt | 8 ++-- .../de/blinkt/openvpn/activities/LogWindow.java | 2 +- .../de/blinkt/openvpn/activities/MainActivity.java | 28 ++++------- .../blinkt/openvpn/activities/VPNPreferences.java | 56 ++++++---------------- 5 files changed, 35 insertions(+), 74 deletions(-) (limited to 'main/src/ui/java/de/blinkt/openvpn/activities') 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; } 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 672ffae6..b2a76f3d 100644 --- a/main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.kt +++ b/main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.kt @@ -154,7 +154,7 @@ class ConfigConverter : BaseActivity(), FileSelectCallback, View.OnClickListener outState.putParcelable("mSourceUri", mSourceUri) } - override fun onActivityResult(requestCode: Int, resultCode: Int, result: Intent) { + override fun onActivityResult(requestCode: Int, resultCode: Int, result: Intent?) { if (requestCode == RESULT_INSTALLPKCS12 && resultCode == Activity.RESULT_OK) { showCertDialog() } @@ -593,8 +593,6 @@ class ConfigConverter : BaseActivity(), FileSelectCallback, View.OnClickListener } - val intent = intent - if (intent != null) { doImportIntent(intent) @@ -607,6 +605,7 @@ class ConfigConverter : BaseActivity(), FileSelectCallback, View.OnClickListener private fun doImportIntent(intent: Intent) { val data = intent.data + if (intent.action.equals(IMPORT_PROFILE_DATA)) if (data != null) { mSourceUri = data doImportUri(data) @@ -698,7 +697,7 @@ class ConfigConverter : BaseActivity(), FileSelectCallback, View.OnClickListener mResult!!.mName = getUniqueProfileName(possibleName) mProfilename.visibility = View.VISIBLE mProfilenameLabel.visibility = View.VISIBLE - mProfilename!!.setText(mResult!!.name) + mProfilename.setText(mResult!!.name) log(R.string.import_done) } @@ -785,6 +784,7 @@ class ConfigConverter : BaseActivity(), FileSelectCallback, View.OnClickListener companion object { + @kotlin.jvm.JvmField val IMPORT_PROFILE = "de.blinkt.openvpn.IMPORT_PROFILE" val IMPORT_PROFILE_DATA = "de.blinkt.openvpn.IMPORT_PROFILE_DATA" private val RESULT_INSTALLPKCS12 = 7 diff --git a/main/src/ui/java/de/blinkt/openvpn/activities/LogWindow.java b/main/src/ui/java/de/blinkt/openvpn/activities/LogWindow.java index db70eca9..fa0106a9 100644 --- a/main/src/ui/java/de/blinkt/openvpn/activities/LogWindow.java +++ b/main/src/ui/java/de/blinkt/openvpn/activities/LogWindow.java @@ -23,7 +23,7 @@ public class LogWindow extends BaseActivity { getActionBar().setDisplayHomeAsUpEnabled(true); if (savedInstanceState == null) { - getFragmentManager().beginTransaction() + getSupportFragmentManager().beginTransaction() .add(R.id.container, new LogFragment()) .commit(); } 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 f7c46d01..2a6a0fff 100644 --- a/main/src/ui/java/de/blinkt/openvpn/activities/MainActivity.java +++ b/main/src/ui/java/de/blinkt/openvpn/activities/MainActivity.java @@ -6,19 +6,14 @@ package de.blinkt.openvpn.activities; import android.annotation.TargetApi; -import android.app.ActionBar; -import android.app.Activity; -import android.content.Context; import android.content.Intent; -import android.content.pm.PackageManager; -import android.net.Uri; import android.os.Build; -import android.os.PowerManager; -import android.provider.Settings; -import android.support.v4n.view.ViewPager; import android.view.Menu; import android.view.MenuItem; +import androidx.appcompat.app.ActionBar; +import androidx.viewpager.widget.ViewPager; + import de.blinkt.openvpn.R; import de.blinkt.openvpn.fragments.AboutFragment; import de.blinkt.openvpn.fragments.FaqFragment; @@ -28,16 +23,13 @@ import de.blinkt.openvpn.fragments.LogFragment; import de.blinkt.openvpn.fragments.SendDumpFragment; import de.blinkt.openvpn.fragments.VPNProfileList; import de.blinkt.openvpn.views.ScreenSlidePagerAdapter; -import de.blinkt.openvpn.views.SlidingTabLayout; -import de.blinkt.openvpn.views.TabBarView; public class MainActivity extends BaseActivity { private ViewPager mPager; private ScreenSlidePagerAdapter mPagerAdapter; - private SlidingTabLayout mSlidingTabLayout; - private TabBarView mTabs; + //private TabLayout mTabs; protected void onCreate(android.os.Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -46,8 +38,8 @@ public class MainActivity extends BaseActivity { // Instantiate a ViewPager and a PagerAdapter. - mPager = (ViewPager) findViewById(R.id.pager); - mPagerAdapter = new ScreenSlidePagerAdapter(getFragmentManager(), this); + mPager = findViewById(R.id.pager); + mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager(), this); /* Toolbar and slider should have the same elevation */ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { @@ -72,8 +64,8 @@ public class MainActivity extends BaseActivity { mPagerAdapter.addTab(R.string.about, AboutFragment.class); mPager.setAdapter(mPagerAdapter); - mTabs = (TabBarView) findViewById(R.id.sliding_tabs); - mTabs.setViewPager(mPager); + //mTabs = findViewById(R.id.sliding_tabs); + //mTabs.setViewPager(mPager); } private static final String FEATURE_TELEVISION = "android.hardware.type.television"; @@ -84,9 +76,9 @@ public class MainActivity extends BaseActivity { || getPackageManager().hasSystemFeature(FEATURE_LEANBACK)); } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) + private void disableToolbarElevation() { - ActionBar toolbar = getActionBar(); + ActionBar toolbar = getSupportActionBar(); toolbar.setElevation(0); } diff --git a/main/src/ui/java/de/blinkt/openvpn/activities/VPNPreferences.java b/main/src/ui/java/de/blinkt/openvpn/activities/VPNPreferences.java index 06f1f7b7..2b6c94ad 100644 --- a/main/src/ui/java/de/blinkt/openvpn/activities/VPNPreferences.java +++ b/main/src/ui/java/de/blinkt/openvpn/activities/VPNPreferences.java @@ -6,19 +6,18 @@ package de.blinkt.openvpn.activities; import android.annotation.TargetApi; -import android.app.ActionBar; -import android.app.Activity; import android.app.AlertDialog; -import android.content.DialogInterface; import android.content.Intent; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceActivity; -import android.support.v4n.view.ViewPager; import android.view.Menu; import android.view.MenuItem; - import android.widget.Toast; + +import androidx.appcompat.app.ActionBar; +import androidx.viewpager.widget.ViewPager; + import de.blinkt.openvpn.R; import de.blinkt.openvpn.VpnProfile; import de.blinkt.openvpn.core.ProfileManager; @@ -33,13 +32,12 @@ import de.blinkt.openvpn.fragments.Settings_UserEditable; import de.blinkt.openvpn.fragments.ShowConfigFragment; import de.blinkt.openvpn.fragments.VPNProfileList; import de.blinkt.openvpn.views.ScreenSlidePagerAdapter; -import de.blinkt.openvpn.views.TabBarView; public class VPNPreferences extends BaseActivity { - static final Class validFragments[] = new Class[] { - Settings_Authentication.class, Settings_Basic.class, Settings_IP.class, + static final Class[] validFragments = new Class[]{ + Settings_Authentication.class, Settings_Basic.class, Settings_IP.class, Settings_Obscure.class, Settings_Routing.class, ShowConfigFragment.class, Settings_Connections.class, Settings_Allowed_Apps.class }; @@ -86,7 +84,7 @@ public class VPNPreferences extends BaseActivity { } if (mProfile.mTemporaryProfile) { - Toast.makeText(this, "Temporary profiles cannot be edited", Toast.LENGTH_LONG); + Toast.makeText(this, "Temporary profiles cannot be edited", Toast.LENGTH_LONG).show(); finish(); } } @@ -127,14 +125,11 @@ public class VPNPreferences extends BaseActivity { setContentView(R.layout.main_activity); - /* Toolbar and slider should have the same elevation */ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - disableToolbarElevation(); - } + disableToolbarElevation(); // Instantiate a ViewPager and a PagerAdapter. - mPager = (ViewPager) findViewById(R.id.pager); - mPagerAdapter = new ScreenSlidePagerAdapter(getFragmentManager(), this); + mPager = findViewById(R.id.pager); + mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager(), this); Bundle fragmentArguments = new Bundle(); @@ -160,28 +155,12 @@ public class VPNPreferences extends BaseActivity { mPager.setAdapter(mPagerAdapter); - TabBarView tabs = (TabBarView) findViewById(R.id.sliding_tabs); - tabs.setViewPager(mPager); + //TabBarView tabs = (TabBarView) findViewById(R.id.sliding_tabs); + //tabs.setViewPager(mPager); } -/* - @Override - public void onBuildHeaders(List
target) { - loadHeadersFromResource(R.xml.vpn_headers, target); - Header headerToRemove=null; - for (Header header : target) { - if(header.fragmentArguments==null) - header.fragmentArguments = new Bundle(); - header.fragmentArguments.putString(getPackageName() + ".profileUUID",mProfileUUID); - if (header.id == R.id.allowed_apps_header && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) - headerToRemove = header; - } - if (headerToRemove != null) - target.remove(headerToRemove); - }*/ - @Override public void onBackPressed() { setResult(RESULT_OK, getIntent()); @@ -217,13 +196,7 @@ public class VPNPreferences extends BaseActivity { dialog.setMessage(getString(R.string.remove_vpn_query, mProfile.mName)); dialog.setPositiveButton(android.R.string.yes, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - removeProfile(mProfile); - } - - }); + (dialog1, which) -> removeProfile(mProfile)); dialog.setNegativeButton(android.R.string.no,null); dialog.create().show(); } @@ -235,9 +208,8 @@ public class VPNPreferences extends BaseActivity { } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void disableToolbarElevation() { - ActionBar toolbar = getActionBar(); + ActionBar toolbar = getSupportActionBar(); toolbar.setElevation(0); } -- cgit v1.2.3