summaryrefslogtreecommitdiff
path: root/main/src/ui/java/de
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2019-11-12 22:58:14 +0100
committerArne Schwabe <arne@rfc2549.org>2019-11-17 10:16:02 +0100
commitcbdaa48705855169827f29014efbaa934d212ccf (patch)
tree678c3c37bae0578b636bea38691d3eed9bec2f1f /main/src/ui/java/de
parent81d7c76b94335e699b2885cd74f3e364eba60cc3 (diff)
Convert most fragments/activities to androidx
Diffstat (limited to 'main/src/ui/java/de')
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/activities/BaseActivity.java15
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.kt8
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/activities/LogWindow.java2
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/activities/MainActivity.java28
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/activities/VPNPreferences.java56
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java7
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/FaqFragment.java5
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/GeneralSettings.java208
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/GraphFragment.java13
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt20
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/LogFragment.java39
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java6
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/SendDumpFragment.java184
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.kt24
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.java300
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Fragment.java3
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.java40
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Obscure.java18
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Routing.java34
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java24
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/VPNProfileList.java12
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/views/DefaultVPNListPreference.java4
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/views/PagerSlidingTabStrip.java732
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/views/RemoteCNPreference.java172
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/views/RemoteCNPreferenceDialog.java124
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java11
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/views/SlidingTabLayout.java314
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/views/SlidingTabStrip.java207
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/views/TabBarView.java16
29 files changed, 687 insertions, 1939 deletions
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<Header> 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);
}
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java
index 540f4a9a..6ab6e2cc 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java
@@ -5,7 +5,6 @@
package de.blinkt.openvpn.fragments;
-import android.app.Fragment;
import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Intent;
@@ -28,6 +27,8 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+
import com.android.vending.billing.IInAppBillingService;
import de.blinkt.openvpn.core.NativeUtils;
@@ -47,8 +48,8 @@ import de.blinkt.openvpn.core.VpnStatus;
public class AboutFragment extends Fragment implements View.OnClickListener {
- public static final String INAPPITEM_TYPE_INAPP = "inapp";
- public static final String RESPONSE_CODE = "RESPONSE_CODE";
+ private static final String INAPPITEM_TYPE_INAPP = "inapp";
+ private static final String RESPONSE_CODE = "RESPONSE_CODE";
private static final int DONATION_CODE = 12;
private static final int BILLING_RESPONSE_RESULT_OK = 0;
private static final String RESPONSE_BUY_INTENT = "BUY_INTENT";
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/FaqFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/FaqFragment.java
index f9d2d47c..f40c6825 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/FaqFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/FaqFragment.java
@@ -5,10 +5,11 @@
package de.blinkt.openvpn.fragments;
-import android.app.Fragment;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.util.DisplayMetrics;
@@ -184,7 +185,7 @@ public class FaqFragment extends Fragment {
columns = Math.max(1, columns);
- mRecyclerView = (RecyclerView) v.findViewById(R.id.faq_recycler_view);
+ mRecyclerView = v.findViewById(R.id.faq_recycler_view);
// use this setting to improve performance if you know that changes
// in content do not change the layout size of the RecyclerView
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/GeneralSettings.java b/main/src/ui/java/de/blinkt/openvpn/fragments/GeneralSettings.java
index 34d37823..1d8b5f77 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/GeneralSettings.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/GeneralSettings.java
@@ -4,8 +4,8 @@
*/
package de.blinkt.openvpn.fragments;
+
import java.io.File;
-import java.util.Collection;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
@@ -18,13 +18,13 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Build;
import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
+
+
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragmentCompat;
import de.blinkt.openvpn.BuildConfig;
import de.blinkt.openvpn.R;
@@ -34,28 +34,28 @@ import de.blinkt.openvpn.api.ExternalAppDatabase;
import de.blinkt.openvpn.core.ProfileManager;
-public class GeneralSettings extends PreferenceFragment implements OnPreferenceClickListener, OnClickListener, Preference.OnPreferenceChangeListener {
+public class GeneralSettings extends PreferenceFragmentCompat implements Preference.OnPreferenceClickListener, OnClickListener, Preference.OnPreferenceChangeListener {
- private ExternalAppDatabase mExtapp;
- private ListPreference mAlwaysOnVPN;
+ private ExternalAppDatabase mExtapp;
+ private ListPreference mAlwaysOnVPN;
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ @Override
+ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
- // Load the preferences from an XML resource
- addPreferencesFromResource(R.xml.general_settings);
+ // Load the preferences from an XML resource
+ addPreferencesFromResource(R.xml.general_settings);
- PreferenceCategory devHacks = (PreferenceCategory) findPreference("device_hacks");
- mAlwaysOnVPN = (ListPreference) findPreference("alwaysOnVpn");
+
+ PreferenceCategory devHacks = findPreference("device_hacks");
+ mAlwaysOnVPN = findPreference("alwaysOnVpn");
mAlwaysOnVPN.setOnPreferenceChangeListener(this);
Preference loadtun = findPreference("loadTunModule");
- if(!isTunModuleAvailable()) {
- loadtun.setEnabled(false);
+ if (!isTunModuleAvailable()) {
+ loadtun.setEnabled(false);
devHacks.removePreference(loadtun);
}
@@ -65,59 +65,56 @@ public class GeneralSettings extends PreferenceFragment implements OnPreferenceC
}
CheckBoxPreference useInternalFS = (CheckBoxPreference) findPreference("useInternalFileSelector");
- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT)
- {
- devHacks.removePreference(useInternalFS);
- }
+ if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
+ devHacks.removePreference(useInternalFS);
+ }
- /* Android P does not allow access to the file storage anymore */
- if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P)
- {
- Preference useInternalFileSelector = findPreference("useInternalFileSelector");
- devHacks.removePreference(useInternalFileSelector);
- }
+ /* Android P does not allow access to the file storage anymore */
+ if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+ Preference useInternalFileSelector = findPreference("useInternalFileSelector");
+ devHacks.removePreference(useInternalFileSelector);
+ }
- mExtapp = new ExternalAppDatabase(getActivity());
- Preference clearapi = findPreference("clearapi");
- clearapi.setOnPreferenceClickListener(this);
+ mExtapp = new ExternalAppDatabase(getActivity());
+ Preference clearapi = findPreference("clearapi");
+ clearapi.setOnPreferenceClickListener(this);
- findPreference("osslspeed").setOnPreferenceClickListener(this);
+ findPreference("osslspeed").setOnPreferenceClickListener(this);
- if(devHacks.getPreferenceCount()==0)
+ if (devHacks.getPreferenceCount() == 0)
getPreferenceScreen().removePreference(devHacks);
if (!BuildConfig.openvpn3) {
PreferenceCategory appBehaviour = (PreferenceCategory) findPreference("app_behaviour");
- CheckBoxPreference ovpn3 = (CheckBoxPreference) findPreference("ovpn3");
- ovpn3.setEnabled(false);
- ovpn3.setChecked(false);
+ CheckBoxPreference ovpn3 = (CheckBoxPreference) findPreference("ovpn3");
+ ovpn3.setEnabled(false);
+ ovpn3.setChecked(false);
}
- setClearApiSummary();
- }
-
- @Override
- public void onResume() {
- super.onResume();
+ setClearApiSummary();
+ }
+ @Override
+ public void onResume() {
+ super.onResume();
VpnProfile vpn = ProfileManager.getAlwaysOnVPN(getActivity());
- StringBuffer sb = new StringBuffer(getString(R.string.defaultvpnsummary));
- sb.append('\n');
- if (vpn== null)
+ StringBuffer sb = new StringBuffer(getString(R.string.defaultvpnsummary));
+ sb.append('\n');
+ if (vpn == null)
sb.append(getString(R.string.novpn_selected));
else
- sb.append(getString(R.string.vpnselected, vpn.getName()));
- mAlwaysOnVPN.setSummary(sb.toString());
+ sb.append(getString(R.string.vpnselected, vpn.getName()));
+ mAlwaysOnVPN.setSummary(sb.toString());
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (preference== mAlwaysOnVPN) {
+ if (preference == mAlwaysOnVPN) {
VpnProfile vpn = ProfileManager.get(getActivity(), (String) newValue);
mAlwaysOnVPN.setSummary(vpn.getName());
}
@@ -125,66 +122,65 @@ public class GeneralSettings extends PreferenceFragment implements OnPreferenceC
}
private void setClearApiSummary() {
- Preference clearapi = findPreference("clearapi");
-
- if(mExtapp.getExtAppList().isEmpty()) {
- clearapi.setEnabled(false);
- clearapi.setSummary(R.string.no_external_app_allowed);
- } else {
- clearapi.setEnabled(true);
- clearapi.setSummary(getString(R.string.allowed_apps, getExtAppList(", ")));
- }
- }
-
- private String getExtAppList(String delim) {
- ApplicationInfo app;
- PackageManager pm = getActivity().getPackageManager();
-
- StringBuilder applist = new StringBuilder();
- for (String packagename : mExtapp.getExtAppList()) {
- try {
- app = pm.getApplicationInfo(packagename, 0);
- if (applist.length() != 0)
- applist.append(delim);
- applist.append(app.loadLabel(pm));
-
- } catch (NameNotFoundException e) {
- // App not found. Remove it from the list
- mExtapp.removeApp(packagename);
- }
- }
-
- return applist.toString();
- }
-
- private boolean isTunModuleAvailable() {
- // Check if the tun module exists on the file system
+ Preference clearapi = findPreference("clearapi");
+
+ if (mExtapp.getExtAppList().isEmpty()) {
+ clearapi.setEnabled(false);
+ clearapi.setSummary(R.string.no_external_app_allowed);
+ } else {
+ clearapi.setEnabled(true);
+ clearapi.setSummary(getString(R.string.allowed_apps, getExtAppList(", ")));
+ }
+ }
+
+ private String getExtAppList(String delim) {
+ ApplicationInfo app;
+ PackageManager pm = getActivity().getPackageManager();
+
+ StringBuilder applist = new StringBuilder();
+ for (String packagename : mExtapp.getExtAppList()) {
+ try {
+ app = pm.getApplicationInfo(packagename, 0);
+ if (applist.length() != 0)
+ applist.append(delim);
+ applist.append(app.loadLabel(pm));
+
+ } catch (NameNotFoundException e) {
+ // App not found. Remove it from the list
+ mExtapp.removeApp(packagename);
+ }
+ }
+
+ return applist.toString();
+ }
+
+ private boolean isTunModuleAvailable() {
+ // Check if the tun module exists on the file system
return new File("/system/lib/modules/tun.ko").length() > 10;
}
- @Override
- public boolean onPreferenceClick(Preference preference) {
- if(preference.getKey().equals("clearapi")){
- Builder builder = new AlertDialog.Builder(getActivity());
- builder.setPositiveButton(R.string.clear, this);
- builder.setNegativeButton(android.R.string.cancel, null);
- builder.setMessage(getString(R.string.clearappsdialog,getExtAppList("\n")));
- builder.show();
- } else if (preference.getKey().equals("osslspeed")) {
- startActivity(new Intent(getActivity(), OpenSSLSpeed.class));
- }
-
- return true;
- }
-
- @Override
- public void onClick(DialogInterface dialog, int which) {
- if( which == Dialog.BUTTON_POSITIVE){
- mExtapp.clearAllApiApps();
- setClearApiSummary();
- }
- }
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ if (preference.getKey().equals("clearapi")) {
+ Builder builder = new AlertDialog.Builder(getActivity());
+ builder.setPositiveButton(R.string.clear, this);
+ builder.setNegativeButton(android.R.string.cancel, null);
+ builder.setMessage(getString(R.string.clearappsdialog, getExtAppList("\n")));
+ builder.show();
+ } else if (preference.getKey().equals("osslspeed")) {
+ startActivity(new Intent(getActivity(), OpenSSLSpeed.class));
+ }
+
+ return true;
+ }
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ if (which == Dialog.BUTTON_POSITIVE) {
+ mExtapp.clearAllApiApps();
+ setClearApiSummary();
+ }
+ }
} \ No newline at end of file
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/GraphFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/GraphFragment.java
index 4ddf90c4..5d83b8fc 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/GraphFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/GraphFragment.java
@@ -5,7 +5,6 @@
package de.blinkt.openvpn.fragments;
-import android.app.Fragment;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
@@ -22,6 +21,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
import com.github.mikephil.charting.charts.LineChart;
import com.github.mikephil.charting.components.XAxis;
@@ -102,13 +102,10 @@ public class GraphFragment extends Fragment implements VpnStatus.ByteCountListen
break;
}
- logScaleView.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- mLogScale = isChecked;
- mChartAdapter.notifyDataSetChanged();
- getActivity().getPreferences(MODE_PRIVATE).edit().putBoolean(PREF_USE_LOG, isChecked).apply();
- }
+ logScaleView.setOnCheckedChangeListener((buttonView, isChecked) -> {
+ mLogScale = isChecked;
+ mChartAdapter.notifyDataSetChanged();
+ getActivity().getPreferences(MODE_PRIVATE).edit().putBoolean(PREF_USE_LOG, isChecked).apply();
});
mHandler = new Handler();
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt b/main/src/ui/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt
index 5008fe00..ef6eae69 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt
@@ -46,7 +46,7 @@ internal abstract class KeyChainSettingsFragment : Settings_Fragment(), View.OnC
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
@Throws(KeyChainException::class, InterruptedException::class)
get() {
- val key: PrivateKey = KeyChain.getPrivateKey(activity.applicationContext, mProfile.mAlias) ?: return false
+ val key: PrivateKey = KeyChain.getPrivateKey(activity!!.applicationContext, mProfile.mAlias) ?: return false
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
val keyFactory = KeyFactory.getInstance(key.getAlgorithm(), "AndroidKeyStore")
@@ -86,9 +86,9 @@ internal abstract class KeyChainSettingsFragment : Settings_Fragment(), View.OnC
object : Thread() {
override fun run() {
try {
- val b = ExtAuthHelper.getCertificateMetaData(activity, mProfile.mExternalAuthenticator, mProfile.mAlias)
+ val b = ExtAuthHelper.getCertificateMetaData(context!!, mProfile.mExternalAuthenticator, mProfile.mAlias)
mProfile.mAlias = b.getString(ExtAuthHelper.EXTRA_ALIAS)
- activity.runOnUiThread { setAlias() }
+ activity!!.runOnUiThread { setAlias() }
} catch (e: KeyChainException) {
e.printStackTrace()
}
@@ -108,14 +108,14 @@ internal abstract class KeyChainSettingsFragment : Settings_Fragment(), View.OnC
if (external) {
if (!TextUtils.isEmpty(mProfile.mExternalAuthenticator) && !TextUtils.isEmpty(mProfile.mAlias)) {
- cert = ExtAuthHelper.getCertificateChain(activity, mProfile.mExternalAuthenticator, mProfile.mAlias)!![0]
- metadata = ExtAuthHelper.getCertificateMetaData(activity, mProfile.mExternalAuthenticator, mProfile.mAlias)
+ cert = ExtAuthHelper.getCertificateChain(context!!, mProfile.mExternalAuthenticator, mProfile.mAlias)!![0]
+ metadata = ExtAuthHelper.getCertificateMetaData(context!!, mProfile.mExternalAuthenticator, mProfile.mAlias)
} else {
cert = null
certstr = getString(R.string.extauth_not_configured)
}
} else {
- val certChain = KeyChain.getCertificateChain(activity.applicationContext, mProfile.mAlias)
+ val certChain = KeyChain.getCertificateChain(activity!!.applicationContext, mProfile.mAlias)
if (certChain != null) {
cert = certChain[0]
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
@@ -137,7 +137,7 @@ internal abstract class KeyChainSettingsFragment : Settings_Fragment(), View.OnC
val certStringCopy = certstr
val finalMetadata = metadata
- activity.runOnUiThread {
+ activity!!.runOnUiThread {
mAliasCertificate.text = certStringCopy
if (finalMetadata != null)
mExtAliasName.text = finalMetadata.getString(ExtAuthHelper.EXTRA_DESCRIPTION)
@@ -210,7 +210,7 @@ internal abstract class KeyChainSettingsFragment : Settings_Fragment(), View.OnC
fun showCertDialog() {
try {
- KeyChain.choosePrivateKeyAlias(activity,
+ KeyChain.choosePrivateKeyAlias(activity!!,
{ alias ->
// Credential alias selected. Remember the alias selection for future use.
mProfile.mAlias = alias
@@ -248,10 +248,10 @@ internal abstract class KeyChainSettingsFragment : Settings_Fragment(), View.OnC
return true
}
- override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
- if (requestCode == UPDATEE_EXT_ALIAS && resultCode == Activity.RESULT_OK) {
+ if (data != null && requestCode == UPDATEE_EXT_ALIAS && resultCode == Activity.RESULT_OK) {
mProfile.mAlias = data.getStringExtra(ExtAuthHelper.EXTRA_ALIAS)
mExtAliasName.text = data.getStringExtra(ExtAuthHelper.EXTRA_DESCRIPTION)
}
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/LogFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/LogFragment.java
index 32da0ac5..be2007e5 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/LogFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/LogFragment.java
@@ -9,8 +9,6 @@ import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ObjectAnimator;
import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.ListFragment;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
@@ -25,6 +23,9 @@ import android.os.Handler.Callback;
import android.os.Message;
import android.preference.PreferenceManager;
import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.ListFragment;
+
import android.text.SpannableString;
import android.text.format.DateFormat;
import android.text.style.ImageSpan;
@@ -529,16 +530,11 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar.
dialog.setPositiveButton(R.string.restart,
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- Intent intent = new Intent(getActivity(), LaunchVPN.class);
- intent.putExtra(LaunchVPN.EXTRA_KEY, profile.getUUIDString());
- intent.setAction(Intent.ACTION_MAIN);
- startActivity(intent);
- }
-
-
+ (dialog1, which) -> {
+ Intent intent = new Intent(getActivity(), LaunchVPN.class);
+ intent.putExtra(LaunchVPN.EXTRA_KEY, profile.getUUIDString());
+ intent.setAction(Intent.ACTION_MAIN);
+ startActivity(intent);
});
dialog.setNegativeButton(R.string.ignore, null);
dialog.create().show();
@@ -564,18 +560,13 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar.
super.onActivityCreated(savedInstanceState);
ListView lv = getListView();
- lv.setOnItemLongClickListener(new OnItemLongClickListener() {
-
- @Override
- public boolean onItemLongClick(AdapterView<?> parent, View view,
- int position, long id) {
- ClipboardManager clipboard = (ClipboardManager)
- getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
- ClipData clip = ClipData.newPlainText("Log Entry", ((TextView) view).getText());
- clipboard.setPrimaryClip(clip);
- Toast.makeText(getActivity(), R.string.copied_entry, Toast.LENGTH_SHORT).show();
- return true;
- }
+ lv.setOnItemLongClickListener((parent, view, position, id) -> {
+ ClipboardManager clipboard = (ClipboardManager)
+ getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+ ClipData clip = ClipData.newPlainText("Log Entry", ((TextView) view).getText());
+ clipboard.setPrimaryClip(clip);
+ Toast.makeText(getActivity(), R.string.copied_entry, Toast.LENGTH_SHORT).show();
+ return true;
});
}
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
index 9ac8bebb..212c5e71 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
@@ -6,12 +6,14 @@
package de.blinkt.openvpn.fragments;
import android.os.Bundle;
-import android.preference.PreferenceFragment;
+
+import androidx.preference.PreferenceFragmentCompat;
+
import de.blinkt.openvpn.R;
import de.blinkt.openvpn.VpnProfile;
import de.blinkt.openvpn.core.ProfileManager;
-public abstract class OpenVpnPreferencesFragment extends PreferenceFragment {
+public abstract class OpenVpnPreferencesFragment extends PreferenceFragmentCompat {
protected VpnProfile mProfile;
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/SendDumpFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
index 0fe40905..5bc0bbb1 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
@@ -9,7 +9,6 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Date;
-import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
@@ -23,106 +22,95 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+
import de.blinkt.openvpn.R;
import de.blinkt.openvpn.core.VpnStatus;
-public class SendDumpFragment extends Fragment {
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
-
- final View v = inflater.inflate(R.layout.fragment_senddump, container, false);
- v.findViewById(R.id.senddump).setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View v) {
- emailMiniDumps();
- }
- });
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- final Pair<File, Long> ldump = getLastestDump(getActivity());
- if (ldump==null)
- return;
- // Do in background since it does I/O
- getActivity().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- TextView dumpDateText = (TextView) v.findViewById(R.id.dumpdate);
- String datestr = (new Date(ldump.second)).toString();
- long timediff = System.currentTimeMillis() - ldump.second;
- long minutes = timediff / 1000 / 60 % 60;
- long hours = timediff / 1000 / 60 / 60;
- dumpDateText.setText(getString(R.string.lastdumpdate, hours, minutes, datestr));
-
- }
- });
- }
- }).start();
- return v;
- }
-
- public void emailMiniDumps()
- {
- //need to "send multiple" to get more than one attachment
- final Intent emailIntent = new Intent(android.content.Intent.ACTION_SEND_MULTIPLE);
- emailIntent.setType("*/*");
- emailIntent.putExtra(android.content.Intent.EXTRA_EMAIL,
- new String[]{"Arne Schwabe <arne@rfc2549.org>"});
-
- String version;
- String name="ics-openvpn";
- try {
- PackageInfo packageinfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0);
- version = packageinfo.versionName;
- name = packageinfo.applicationInfo.name;
- } catch (NameNotFoundException e) {
- version = "error fetching version";
- }
-
-
- emailIntent.putExtra(Intent.EXTRA_SUBJECT, String.format("%s(%s) %s Minidump",name, getActivity().getPackageName(), version));
-
- emailIntent.putExtra(Intent.EXTRA_TEXT, "Please describe the issue you have experienced");
-
- ArrayList<Uri> uris = new ArrayList<>();
-
- Pair<File, Long> ldump = getLastestDump(getActivity());
- if(ldump==null) {
- VpnStatus.logError("No Minidump found!");
- }
-
- uris.add(Uri.parse("content://de.blinkt.openvpn.FileProvider/" + ldump.first.getName()));
- uris.add(Uri.parse("content://de.blinkt.openvpn.FileProvider/" + ldump.first.getName() + ".log"));
-
- emailIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- emailIntent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
- startActivity(emailIntent);
- }
-
- static public Pair<File,Long> getLastestDump(Context c) {
- long newestDumpTime=0;
- File newestDumpFile=null;
-
- if (c.getCacheDir() ==null)
+public class SendDumpFragment extends Fragment {
+
+ static public Pair<File, Long> getLastestDump(Context c) {
+ long newestDumpTime = 0;
+ File newestDumpFile = null;
+
+ if (c.getCacheDir() == null)
+ return null;
+
+ for (File f : c.getCacheDir().listFiles()) {
+ if (!f.getName().endsWith(".dmp"))
+ continue;
+
+ if (newestDumpTime < f.lastModified()) {
+ newestDumpTime = f.lastModified();
+ newestDumpFile = f;
+ }
+ }
+ // Ignore old dumps
+ if (System.currentTimeMillis() - 48 * 60 * 1000 > newestDumpTime)
return null;
- for(File f:c.getCacheDir().listFiles()) {
- if(!f.getName().endsWith(".dmp"))
- continue;
-
- if (newestDumpTime < f.lastModified()) {
- newestDumpTime = f.lastModified();
- newestDumpFile=f;
- }
- }
- // Ignore old dumps
- if(System.currentTimeMillis() - 48 * 60 * 1000 > newestDumpTime )
- return null;
-
- return Pair.create(newestDumpFile, newestDumpTime);
- }
+ return Pair.create(newestDumpFile, newestDumpTime);
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+
+ final View v = inflater.inflate(R.layout.fragment_senddump, container, false);
+ v.findViewById(R.id.senddump).setOnClickListener(v1 -> emailMiniDumps());
+
+ new Thread(() -> {
+ final Pair<File, Long> ldump = getLastestDump(getActivity());
+ if (ldump == null)
+ return;
+ // Do in background since it does I/O
+ getActivity().runOnUiThread(() -> {
+ TextView dumpDateText = (TextView) v.findViewById(R.id.dumpdate);
+ String datestr = (new Date(ldump.second)).toString();
+ long timediff = System.currentTimeMillis() - ldump.second;
+ long minutes = timediff / 1000 / 60 % 60;
+ long hours = timediff / 1000 / 60 / 60;
+ dumpDateText.setText(getString(R.string.lastdumpdate, hours, minutes, datestr));
+
+ });
+ }).start();
+ return v;
+ }
+
+ public void emailMiniDumps() {
+ //need to "send multiple" to get more than one attachment
+ final Intent emailIntent = new Intent(android.content.Intent.ACTION_SEND_MULTIPLE);
+ emailIntent.setType("*/*");
+ emailIntent.putExtra(android.content.Intent.EXTRA_EMAIL,
+ new String[]{"Arne Schwabe <arne@rfc2549.org>"});
+
+ String version;
+ String name = "ics-openvpn";
+ try {
+ PackageInfo packageinfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0);
+ version = packageinfo.versionName;
+ name = packageinfo.applicationInfo.name;
+ } catch (NameNotFoundException e) {
+ version = "error fetching version";
+ }
+
+
+ emailIntent.putExtra(Intent.EXTRA_SUBJECT, String.format("%s(%s) %s Minidump", name, getActivity().getPackageName(), version));
+
+ emailIntent.putExtra(Intent.EXTRA_TEXT, "Please describe the issue you have experienced");
+
+ ArrayList<Uri> uris = new ArrayList<>();
+
+ Pair<File, Long> ldump = getLastestDump(getActivity());
+ if (ldump == null) {
+ VpnStatus.logError("No Minidump found!");
+ }
+
+ uris.add(Uri.parse("content://de.blinkt.openvpn.FileProvider/" + ldump.first.getName()));
+ uris.add(Uri.parse("content://de.blinkt.openvpn.FileProvider/" + ldump.first.getName() + ".log"));
+
+ emailIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ emailIntent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
+ startActivity(emailIntent);
+ }
}
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 dd2aa3b7..e3879775 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
@@ -6,8 +6,6 @@
package de.blinkt.openvpn.fragments
import android.Manifest
-import android.app.Activity
-import android.app.Fragment
import android.content.Context
import android.content.pm.ApplicationInfo
import android.content.pm.PackageManager
@@ -29,6 +27,7 @@ import android.widget.ListView
import android.widget.SearchView
import android.widget.Switch
import android.widget.TextView
+import androidx.fragment.app.Fragment
import java.util.Collections
import java.util.Locale
@@ -37,6 +36,7 @@ import java.util.Vector
import de.blinkt.openvpn.R
import de.blinkt.openvpn.VpnProfile
import de.blinkt.openvpn.core.ProfileManager
+import org.jetbrains.anko.runOnUiThread
/**
* Created by arne on 16.11.14.
@@ -75,9 +75,9 @@ class Settings_Allowed_Apps : Fragment(), AdapterView.OnItemClickListener, Compo
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- val profileUuid = arguments.getString(activity.packageName + ".profileUUID")
+ val profileUuid = requireArguments().getString(activity!!.packageName + ".profileUUID")
mProfile = ProfileManager.get(activity, profileUuid)
- activity.title = getString(R.string.edit_profile_title, mProfile.name)
+ activity!!.title = getString(R.string.edit_profile_title, mProfile.name)
setHasOptionsMenu(true)
}
@@ -116,7 +116,7 @@ class Settings_Allowed_Apps : Fragment(), AdapterView.OnItemClickListener, Compo
val vpnOnDefaultSwitch = mSettingsView.findViewById<View>(R.id.default_allow) as Switch
- vpnOnDefaultSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+ vpnOnDefaultSwitch.setOnCheckedChangeListener { _, isChecked ->
changeDisallowText(isChecked)
mProfile.mAllowedAppsVpnAreDisallowed = isChecked
}
@@ -125,19 +125,19 @@ class Settings_Allowed_Apps : Fragment(), AdapterView.OnItemClickListener, Compo
val vpnAllowBypassSwitch = mSettingsView.findViewById<View>(R.id.allow_bypass) as Switch
- vpnAllowBypassSwitch.setOnCheckedChangeListener { buttonView, isChecked -> mProfile.mAllowAppVpnBypass = isChecked }
+ vpnAllowBypassSwitch.setOnCheckedChangeListener { _, isChecked -> mProfile.mAllowAppVpnBypass = isChecked }
vpnAllowBypassSwitch.isChecked = mProfile.mAllowAppVpnBypass
mListView = v.findViewById<View>(android.R.id.list) as ListView
- mListAdapter = PackageAdapter(activity, mProfile)
+ mListAdapter = PackageAdapter(requireContext(), mProfile)
mListView.adapter = mListAdapter
mListView.onItemClickListener = this
mListView.emptyView = v.findViewById(R.id.loading_container)
- Thread(Runnable { mListAdapter.populateList(activity) }).start()
+ Thread(Runnable { mListAdapter.populateList(requireContext()) }).start()
return v
}
@@ -197,7 +197,7 @@ class Settings_Allowed_Apps : Fragment(), AdapterView.OnItemClickListener, Compo
private val mProfile = vp
- fun populateList(c: Activity) {
+ fun populateList(c: Context) {
val installedPackages = mPm.getInstalledApplications(PackageManager.GET_META_DATA)
// Remove apps not using Internet
@@ -282,11 +282,11 @@ class Settings_Allowed_Apps : Fragment(), AdapterView.OnItemClickListener, Compo
}
private inner class ItemFilter : Filter() {
- override fun performFiltering(constraint: CharSequence): Filter.FilterResults {
+ override fun performFiltering(constraint: CharSequence): FilterResults {
val filterString = constraint.toString().toLowerCase(Locale.getDefault())
- val results = Filter.FilterResults()
+ val results = FilterResults()
val count = mPackages.size
@@ -313,7 +313,7 @@ class Settings_Allowed_Apps : Fragment(), AdapterView.OnItemClickListener, Compo
return results
}
- override fun publishResults(constraint: CharSequence, results: Filter.FilterResults) {
+ override fun publishResults(constraint: CharSequence, results: FilterResults) {
mFilteredData = results.values as Vector<ApplicationInfo>
notifyDataSetChanged()
}
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
index 8fd6aa98..b58db81a 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
@@ -9,91 +9,98 @@ import android.app.Activity;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.SwitchPreference;
import android.text.TextUtils;
import android.util.Pair;
+
+import androidx.fragment.app.DialogFragment;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.EditTextPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import de.blinkt.openvpn.activities.FileSelect;
import de.blinkt.openvpn.R;
import de.blinkt.openvpn.core.VpnStatus;
import de.blinkt.openvpn.views.RemoteCNPreference;
import de.blinkt.openvpn.VpnProfile;
+import de.blinkt.openvpn.views.RemoteCNPreferenceDialog;
import java.io.IOException;
-public class Settings_Authentication extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener, OnPreferenceClickListener {
- private static final int SELECT_TLS_FILE_LEGACY_DIALOG = 23223232;
- private static final int SELECT_TLS_FILE_KITKAT = SELECT_TLS_FILE_LEGACY_DIALOG +1;
+public class Settings_Authentication extends OpenVpnPreferencesFragment implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
+ private static final int SELECT_TLS_FILE_LEGACY_DIALOG = 23223232;
+ private static final int SELECT_TLS_FILE_KITKAT = SELECT_TLS_FILE_LEGACY_DIALOG + 1;
private CheckBoxPreference mExpectTLSCert;
- private CheckBoxPreference mCheckRemoteCN;
- private RemoteCNPreference mRemoteCN;
- private ListPreference mTLSAuthDirection;
- private Preference mTLSAuthFile;
- private SwitchPreference mUseTLSAuth;
- private EditTextPreference mCipher;
- private String mTlsAuthFileData;
- private EditTextPreference mAuth;
+ private CheckBoxPreference mCheckRemoteCN;
+ private RemoteCNPreference mRemoteCN;
+ private ListPreference mTLSAuthDirection;
+ private Preference mTLSAuthFile;
+ private SwitchPreference mUseTLSAuth;
+ private EditTextPreference mCipher;
+ private String mTlsAuthFileData;
+ private EditTextPreference mAuth;
private EditTextPreference mRemoteX509Name;
@Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
- // Load the preferences from an XML resource
- addPreferencesFromResource(R.xml.vpn_authentification);
+ // Load the preferences from an XML resource
+ addPreferencesFromResource(R.xml.vpn_authentification);
- mExpectTLSCert = (CheckBoxPreference) findPreference("remoteServerTLS");
- mCheckRemoteCN = (CheckBoxPreference) findPreference("checkRemoteCN");
- mRemoteCN = (RemoteCNPreference) findPreference("remotecn");
- mRemoteCN.setOnPreferenceChangeListener(this);
+ mExpectTLSCert = findPreference("remoteServerTLS");
+ mCheckRemoteCN = (CheckBoxPreference) findPreference("checkRemoteCN");
+ mRemoteCN = (RemoteCNPreference) findPreference("remotecn");
+ mRemoteCN.setOnPreferenceChangeListener(this);
- mRemoteX509Name = (EditTextPreference) findPreference("remotex509name");
+ mRemoteX509Name = (EditTextPreference) findPreference("remotex509name");
mRemoteX509Name.setOnPreferenceChangeListener(this);
- mUseTLSAuth = (SwitchPreference) findPreference("useTLSAuth" );
- mTLSAuthFile = findPreference("tlsAuthFile");
- mTLSAuthDirection = (ListPreference) findPreference("tls_direction");
+ mUseTLSAuth = (SwitchPreference) findPreference("useTLSAuth");
+ mTLSAuthFile = findPreference("tlsAuthFile");
+ mTLSAuthDirection = (ListPreference) findPreference("tls_direction");
+
+
+ mTLSAuthFile.setOnPreferenceClickListener(this);
+ mCipher = (EditTextPreference) findPreference("cipher");
+ mCipher.setOnPreferenceChangeListener(this);
- mTLSAuthFile.setOnPreferenceClickListener(this);
+ mAuth = (EditTextPreference) findPreference("auth");
+ mAuth.setOnPreferenceChangeListener(this);
- mCipher =(EditTextPreference) findPreference("cipher");
- mCipher.setOnPreferenceChangeListener(this);
+ loadSettings();
- mAuth =(EditTextPreference) findPreference("auth");
- mAuth.setOnPreferenceChangeListener(this);
+ }
- loadSettings();
+ @Override
+ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
- }
+ }
- @Override
- protected void loadSettings() {
+ @Override
+ protected void loadSettings() {
- mExpectTLSCert.setChecked(mProfile.mExpectTLSCert);
- mCheckRemoteCN.setChecked(mProfile.mCheckRemoteCN);
- mRemoteCN.setDN(mProfile.mRemoteCN);
- mRemoteCN.setAuthType(mProfile.mX509AuthType);
- onPreferenceChange(mRemoteCN,
- new Pair<Integer, String>(mProfile.mX509AuthType, mProfile.mRemoteCN));
+ mExpectTLSCert.setChecked(mProfile.mExpectTLSCert);
+ mCheckRemoteCN.setChecked(mProfile.mCheckRemoteCN);
+ mRemoteCN.setDN(mProfile.mRemoteCN);
+ mRemoteCN.setAuthType(mProfile.mX509AuthType);
+ onPreferenceChange(mRemoteCN,
+ new Pair<Integer, String>(mProfile.mX509AuthType, mProfile.mRemoteCN));
mRemoteX509Name.setText(mProfile.mx509UsernameField);
onPreferenceChange(mRemoteX509Name, mProfile.mx509UsernameField);
- mUseTLSAuth.setChecked(mProfile.mUseTLSAuth);
- mTlsAuthFileData= mProfile.mTLSAuthFilename;
- setTlsAuthSummary(mTlsAuthFileData);
- mTLSAuthDirection.setValue(mProfile.mTLSAuthDirection);
- mCipher.setText(mProfile.mCipher);
- onPreferenceChange(mCipher, mProfile.mCipher);
- mAuth.setText(mProfile.mAuth);
- onPreferenceChange(mAuth, mProfile.mAuth);
+ mUseTLSAuth.setChecked(mProfile.mUseTLSAuth);
+ mTlsAuthFileData = mProfile.mTLSAuthFilename;
+ setTlsAuthSummary(mTlsAuthFileData);
+ mTLSAuthDirection.setValue(mProfile.mTLSAuthDirection);
+ mCipher.setText(mProfile.mCipher);
+ onPreferenceChange(mCipher, mProfile.mCipher);
+ mAuth.setText(mProfile.mAuth);
+ onPreferenceChange(mAuth, mProfile.mAuth);
if (mProfile.mAuthenticationType == VpnProfile.TYPE_STATICKEYS) {
mExpectTLSCert.setEnabled(false);
@@ -104,47 +111,46 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
mCheckRemoteCN.setEnabled(true);
}
- }
-
- @Override
- protected void saveSettings() {
- mProfile.mExpectTLSCert=mExpectTLSCert.isChecked();
- mProfile.mCheckRemoteCN=mCheckRemoteCN.isChecked();
- mProfile.mRemoteCN=mRemoteCN.getCNText();
- mProfile.mX509AuthType=mRemoteCN.getAuthtype();
+ }
- mProfile.mUseTLSAuth = mUseTLSAuth.isChecked();
- mProfile.mTLSAuthFilename = mTlsAuthFileData;
+ @Override
+ protected void saveSettings() {
+ mProfile.mExpectTLSCert = mExpectTLSCert.isChecked();
+ mProfile.mCheckRemoteCN = mCheckRemoteCN.isChecked();
+ mProfile.mRemoteCN = mRemoteCN.getCNText();
+ mProfile.mX509AuthType = mRemoteCN.getAuthtype();
+
+ mProfile.mUseTLSAuth = mUseTLSAuth.isChecked();
+ mProfile.mTLSAuthFilename = mTlsAuthFileData;
mProfile.mx509UsernameField = mRemoteX509Name.getText();
- if(mTLSAuthDirection.getValue()==null)
- mProfile.mTLSAuthDirection=null;
- else
- mProfile.mTLSAuthDirection = mTLSAuthDirection.getValue();
-
- if(mCipher.getText()==null)
- mProfile.mCipher=null;
- else
- mProfile.mCipher = mCipher.getText();
+ if (mTLSAuthDirection.getValue() == null)
+ mProfile.mTLSAuthDirection = null;
+ else
+ mProfile.mTLSAuthDirection = mTLSAuthDirection.getValue();
- if(mAuth.getText()==null)
- mProfile.mAuth = null;
- else
- mProfile.mAuth = mAuth.getText();
-
- }
+ if (mCipher.getText() == null)
+ mProfile.mCipher = null;
+ else
+ mProfile.mCipher = mCipher.getText();
+ if (mAuth.getText() == null)
+ mProfile.mAuth = null;
+ else
+ mProfile.mAuth = mAuth.getText();
+ }
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- if(preference==mRemoteCN) {
- @SuppressWarnings("unchecked")
- int authtype = ((Pair<Integer, String>) newValue).first;
- @SuppressWarnings("unchecked")
- String dn = ((Pair<Integer, String>) newValue).second;
- if ("".equals(dn)) {
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ if (preference == mRemoteCN) {
+ @SuppressWarnings("unchecked")
+ int authtype = ((Pair<Integer, String>) newValue).first;
+ @SuppressWarnings("unchecked")
+ String dn = ((Pair<Integer, String>) newValue).second;
+
+ if ("".equals(dn)) {
if (mProfile.mConnections.length > 0) {
preference.setSummary(getX509String(VpnProfile.X509_VERIFY_TLSREMOTE_RDN, mProfile.mConnections[0].mServerName));
} else {
@@ -154,39 +160,40 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
preference.setSummary(getX509String(authtype, dn));
}
- } else if (preference == mCipher || preference == mAuth) {
- preference.setSummary((CharSequence) newValue);
- } else if (preference == mRemoteX509Name) {
- preference.setSummary(TextUtils.isEmpty((CharSequence) newValue) ? "CN (default)" : (CharSequence)newValue);
+ } else if (preference == mCipher || preference == mAuth) {
+ preference.setSummary((CharSequence) newValue);
+ } else if (preference == mRemoteX509Name) {
+ preference.setSummary(TextUtils.isEmpty((CharSequence) newValue) ? "CN (default)" : (CharSequence) newValue);
+ }
+ return true;
+ }
+
+ private CharSequence getX509String(int authtype, String dn) {
+ String ret = "";
+ switch (authtype) {
+ case VpnProfile.X509_VERIFY_TLSREMOTE:
+ case VpnProfile.X509_VERIFY_TLSREMOTE_COMPAT_NOREMAPPING:
+ ret += "tls-remote ";
+ break;
+
+ case VpnProfile.X509_VERIFY_TLSREMOTE_DN:
+ ret = "dn: ";
+ break;
+
+ case VpnProfile.X509_VERIFY_TLSREMOTE_RDN:
+ ret = "rdn: ";
+ break;
+
+ case VpnProfile.X509_VERIFY_TLSREMOTE_RDN_PREFIX:
+ ret = "rdn prefix: ";
+ break;
}
- return true;
- }
- private CharSequence getX509String(int authtype, String dn) {
- String ret ="";
- switch (authtype) {
- case VpnProfile.X509_VERIFY_TLSREMOTE:
- case VpnProfile.X509_VERIFY_TLSREMOTE_COMPAT_NOREMAPPING:
- ret+="tls-remote ";
- break;
-
- case VpnProfile.X509_VERIFY_TLSREMOTE_DN:
- ret="dn: ";
- break;
-
- case VpnProfile.X509_VERIFY_TLSREMOTE_RDN:
- ret="rdn: ";
- break;
-
- case VpnProfile.X509_VERIFY_TLSREMOTE_RDN_PREFIX:
- ret="rdn prefix: ";
- break;
- }
- return ret + dn;
- }
+ return ret + dn;
+ }
void startFileDialog() {
Intent startFC = null;
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && ! Utils.alwaysUseOldFileChooser(getActivity())) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && !Utils.alwaysUseOldFileChooser(getActivity())) {
startFC = Utils.getFilePickerIntent(getActivity(), Utils.FileType.TLS_AUTH_FILE);
startActivityForResult(startFC, SELECT_TLS_FILE_KITKAT);
}
@@ -200,22 +207,22 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
}
@Override
- public boolean onPreferenceClick(Preference preference) {
- startFileDialog();
- return true;
-
- }
-
- @Override
- public void onActivityResult(int requestCode, int resultCode, Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
- if(requestCode == SELECT_TLS_FILE_LEGACY_DIALOG && resultCode == Activity.RESULT_OK){
- String result = data.getStringExtra(FileSelect.RESULT_DATA);
- mTlsAuthFileData=result;
- setTlsAuthSummary(result);
- } else if (requestCode == SELECT_TLS_FILE_KITKAT && resultCode == Activity.RESULT_OK) {
+ public boolean onPreferenceClick(Preference preference) {
+ startFileDialog();
+ return true;
+
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == SELECT_TLS_FILE_LEGACY_DIALOG && resultCode == Activity.RESULT_OK) {
+ String result = data.getStringExtra(FileSelect.RESULT_DATA);
+ mTlsAuthFileData = result;
+ setTlsAuthSummary(result);
+ } else if (requestCode == SELECT_TLS_FILE_KITKAT && resultCode == Activity.RESULT_OK) {
try {
- mTlsAuthFileData= Utils.getFilePickerResult(Utils.FileType.TLS_AUTH_FILE,data,getActivity());
+ mTlsAuthFileData = Utils.getFilePickerResult(Utils.FileType.TLS_AUTH_FILE, data, getActivity());
setTlsAuthSummary(mTlsAuthFileData);
} catch (IOException e) {
VpnStatus.logException(e);
@@ -223,16 +230,31 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
VpnStatus.logException(se);
}
}
- }
+ }
- private void setTlsAuthSummary(String result) {
- if(result==null)
+ private void setTlsAuthSummary(String result) {
+ if (result == null)
result = getString(R.string.no_certificate);
- if(result.startsWith(VpnProfile.INLINE_TAG))
- mTLSAuthFile.setSummary(R.string.inline_file_data);
+ if (result.startsWith(VpnProfile.INLINE_TAG))
+ mTLSAuthFile.setSummary(R.string.inline_file_data);
else if (result.startsWith(VpnProfile.DISPLAYNAME_TAG))
- mTLSAuthFile.setSummary(getString(R.string.imported_from_file, VpnProfile.getDisplayName(result)));
- else
- mTLSAuthFile.setSummary(result);
- }
+ mTLSAuthFile.setSummary(getString(R.string.imported_from_file, VpnProfile.getDisplayName(result)));
+ else
+ mTLSAuthFile.setSummary(result);
+ }
+
+ @Override
+ public void onDisplayPreferenceDialog(Preference preference) {
+ DialogFragment dialogFragment = null;
+ if (preference instanceof RemoteCNPreference) {
+ dialogFragment = RemoteCNPreferenceDialog.newInstance(preference.getKey());
+ }
+
+ if (dialogFragment != null) {
+ dialogFragment.setTargetFragment(this, 0);
+ dialogFragment.show(requireFragmentManager(), "RemoteCNDialog");
+ } else {
+ super.onDisplayPreferenceDialog(preference);
+ }
+ }
} \ No newline at end of file
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Fragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Fragment.java
index 738bd0e9..f29f2063 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Fragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Fragment.java
@@ -5,9 +5,10 @@
package de.blinkt.openvpn.fragments;
-import android.app.Fragment;
import android.os.Bundle;
+import androidx.fragment.app.Fragment;
+
import de.blinkt.openvpn.R;
import de.blinkt.openvpn.VpnProfile;
import de.blinkt.openvpn.core.ProfileManager;
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.java
index bd2ad5f2..843ff750 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.java
@@ -4,17 +4,19 @@
*/
package de.blinkt.openvpn.fragments;
+
import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.PreferenceManager;
-import android.preference.SwitchPreference;
+
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.EditTextPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.SwitchPreference;
+
import de.blinkt.openvpn.R;
import de.blinkt.openvpn.VpnProfile;
-public class Settings_IP extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener {
+public class Settings_IP extends OpenVpnPreferencesFragment implements Preference.OnPreferenceChangeListener {
private EditTextPreference mIPv4;
private EditTextPreference mIPv6;
private SwitchPreference mUsePull;
@@ -33,19 +35,19 @@ public class Settings_IP extends OpenVpnPreferencesFragment implements OnPrefere
// Make sure default values are applied. In a real app, you would
// want this in a shared function that is used to retrieve the
// SharedPreferences wherever they are needed.
- PreferenceManager.setDefaultValues(getActivity(),
+ PreferenceManager.setDefaultValues(requireActivity(),
R.xml.vpn_ipsettings, false);
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.vpn_ipsettings);
- mIPv4 = (EditTextPreference) findPreference("ipv4_address");
- mIPv6 = (EditTextPreference) findPreference("ipv6_address");
- mUsePull = (SwitchPreference) findPreference("usePull");
- mOverrideDNS = (CheckBoxPreference) findPreference("overrideDNS");
- mSearchdomain =(EditTextPreference) findPreference("searchdomain");
- mDNS1 = (EditTextPreference) findPreference("dns1");
- mDNS2 = (EditTextPreference) findPreference("dns2");
- mNobind = (CheckBoxPreference) findPreference("nobind");
+ mIPv4 = findPreference("ipv4_address");
+ mIPv6 = findPreference("ipv6_address");
+ mUsePull = findPreference("usePull");
+ mOverrideDNS = findPreference("overrideDNS");
+ mSearchdomain = findPreference("searchdomain");
+ mDNS1 = findPreference("dns1");
+ mDNS2 = findPreference("dns2");
+ mNobind = findPreference("nobind");
mIPv4.setOnPreferenceChangeListener(this);
mIPv6.setOnPreferenceChangeListener(this);
@@ -141,4 +143,8 @@ public class Settings_IP extends OpenVpnPreferencesFragment implements OnPrefere
}
- } \ No newline at end of file
+ @Override
+ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+
+ }
+} \ No newline at end of file
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Obscure.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Obscure.java
index 6674599d..4b1db582 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Obscure.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Obscure.java
@@ -6,19 +6,20 @@
package de.blinkt.openvpn.fragments;
import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
import android.widget.Toast;
+
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.EditTextPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
import java.util.Locale;
import de.blinkt.openvpn.R;
import de.blinkt.openvpn.VpnProfile;
-public class Settings_Obscure extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener {
+public class Settings_Obscure extends OpenVpnPreferencesFragment implements Preference.OnPreferenceChangeListener {
private CheckBoxPreference mUseRandomHostName;
private CheckBoxPreference mUseFloat;
private CheckBoxPreference mUseCustomConfig;
@@ -126,6 +127,11 @@ public class Settings_Obscure extends OpenVpnPreferencesFragment implements OnPr
}
+ @Override
+ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+
+ }
+
protected void loadSettings() {
mUseRandomHostName.setChecked(mProfile.mUseRandomHostname);
mUseFloat.setChecked(mProfile.mUseFloat);
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Routing.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Routing.java
index 91a41ef3..6b963bb8 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Routing.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Routing.java
@@ -6,14 +6,15 @@
package de.blinkt.openvpn.fragments;
import android.os.Build;
import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
+
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.EditTextPreference;
+import androidx.preference.Preference;
+
import de.blinkt.openvpn.R;
-public class Settings_Routing extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener {
+public class Settings_Routing extends OpenVpnPreferencesFragment implements Preference.OnPreferenceChangeListener {
private EditTextPreference mCustomRoutes;
private CheckBoxPreference mUseDefaultRoute;
private EditTextPreference mCustomRoutesv6;
@@ -30,17 +31,17 @@ public class Settings_Routing extends OpenVpnPreferencesFragment implements OnPr
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.vpn_routing);
- mCustomRoutes = (EditTextPreference) findPreference("customRoutes");
- mUseDefaultRoute = (CheckBoxPreference) findPreference("useDefaultRoute");
- mCustomRoutesv6 = (EditTextPreference) findPreference("customRoutesv6");
- mUseDefaultRoutev6 = (CheckBoxPreference) findPreference("useDefaultRoutev6");
- mExcludedRoutes = (EditTextPreference) findPreference("excludedRoutes");
- mExcludedRoutesv6 = (EditTextPreference) findPreference("excludedRoutesv6");
+ mCustomRoutes = findPreference("customRoutes");
+ mUseDefaultRoute = findPreference("useDefaultRoute");
+ mCustomRoutesv6 = findPreference("customRoutesv6");
+ mUseDefaultRoutev6 = findPreference("useDefaultRoutev6");
+ mExcludedRoutes = findPreference("excludedRoutes");
+ mExcludedRoutesv6 = findPreference("excludedRoutesv6");
- mRouteNoPull = (CheckBoxPreference) findPreference("routenopull");
- mLocalVPNAccess = (CheckBoxPreference) findPreference("unblockLocal");
+ mRouteNoPull = findPreference("routenopull");
+ mLocalVPNAccess = findPreference("unblockLocal");
- mBlockUnusedAF = (CheckBoxPreference) findPreference("blockUnusedAF");
+ mBlockUnusedAF = findPreference("blockUnusedAF");
mCustomRoutes.setOnPreferenceChangeListener(this);
mCustomRoutesv6.setOnPreferenceChangeListener(this);
@@ -55,6 +56,11 @@ public class Settings_Routing extends OpenVpnPreferencesFragment implements OnPr
}
@Override
+ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+
+ }
+
+ @Override
protected void loadSettings() {
mUseDefaultRoute.setChecked(mProfile.mUseDefaultRoute);
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
index f5c1750a..d69b4581 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
@@ -5,7 +5,6 @@
package de.blinkt.openvpn.fragments;
-import android.app.Fragment;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
@@ -17,6 +16,10 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
import de.blinkt.openvpn.R;
import de.blinkt.openvpn.VpnProfile;
import de.blinkt.openvpn.core.ProfileManager;
@@ -30,17 +33,12 @@ public class ShowConfigFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
View v=inflater.inflate(R.layout.viewconfig, container,false);
- mConfigView = (TextView) v.findViewById(R.id.configview);
+ mConfigView = v.findViewById(R.id.configview);
- mfabButton = (ImageButton) v.findViewById(R.id.share_config);
+ mfabButton = v.findViewById(R.id.share_config);
if (mfabButton!=null) {
- mfabButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- shareConfig();
- }
- });
+ mfabButton.setOnClickListener(v1 -> shareConfig());
mfabButton.setVisibility(View.INVISIBLE);
}
return v;
@@ -53,12 +51,12 @@ public class ShowConfigFragment extends Fragment {
/* Add a few newlines to make the textview scrollable past the FAB */
try {
- configtext = vp.getConfigFile(getActivity(), VpnProfile.doUseOpenVPN3(getActivity())) + "\n\n\n";
+ configtext = vp.getConfigFile(requireContext(), VpnProfile.doUseOpenVPN3(getActivity())) + "\n\n\n";
} catch (Exception e) {
e.printStackTrace();
configtext = "Error generating config file: " + e.getLocalizedMessage();
}
- getActivity().runOnUiThread(() -> {
+ requireActivity().runOnUiThread(() -> {
cv.setText(configtext);
if (mfabButton!=null)
mfabButton.setVisibility(View.VISIBLE);
@@ -76,7 +74,7 @@ public class ShowConfigFragment extends Fragment {
}
@Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
inflater.inflate(R.menu.configmenu, menu);
}
@@ -108,7 +106,7 @@ public class ShowConfigFragment extends Fragment {
}
private void populateConfigText() {
- String profileUUID = getArguments().getString(getActivity().getPackageName() + ".profileUUID");
+ String profileUUID = requireArguments().getString(requireActivity().getPackageName() + ".profileUUID");
final VpnProfile vp = ProfileManager.get(getActivity(),profileUUID);
int check=vp.checkProfile(getActivity());
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/VPNProfileList.java b/main/src/ui/java/de/blinkt/openvpn/fragments/VPNProfileList.java
index c1aadb7e..eaccd201 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/VPNProfileList.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/VPNProfileList.java
@@ -8,7 +8,6 @@ package de.blinkt.openvpn.fragments;
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.AlertDialog;
-import android.app.ListFragment;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -21,6 +20,8 @@ import android.os.Build;
import android.os.Bundle;
import android.os.PersistableBundle;
import androidx.annotation.RequiresApi;
+import androidx.fragment.app.ListFragment;
+
import android.text.Html;
import android.text.Html.ImageGetter;
import android.view.LayoutInflater;
@@ -76,12 +77,9 @@ public class VPNProfileList extends ListFragment implements OnClickListener, Vpn
@Override
public void updateState(String state, String logmessage, final int localizedResId, ConnectionStatus level) {
- getActivity().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- mLastStatusMessage = VpnStatus.getLastCleanLogMessage(getActivity());
- mArrayadapter.notifyDataSetChanged();
- }
+ getActivity().runOnUiThread(() -> {
+ mLastStatusMessage = VpnStatus.getLastCleanLogMessage(getActivity());
+ mArrayadapter.notifyDataSetChanged();
});
}
diff --git a/main/src/ui/java/de/blinkt/openvpn/views/DefaultVPNListPreference.java b/main/src/ui/java/de/blinkt/openvpn/views/DefaultVPNListPreference.java
index e8328f5c..46722e03 100644
--- a/main/src/ui/java/de/blinkt/openvpn/views/DefaultVPNListPreference.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/DefaultVPNListPreference.java
@@ -6,8 +6,10 @@
package de.blinkt.openvpn.views;
import android.content.Context;
-import android.preference.ListPreference;
import android.util.AttributeSet;
+
+import androidx.preference.ListPreference;
+
import de.blinkt.openvpn.VpnProfile;
import de.blinkt.openvpn.core.ProfileManager;
diff --git a/main/src/ui/java/de/blinkt/openvpn/views/PagerSlidingTabStrip.java b/main/src/ui/java/de/blinkt/openvpn/views/PagerSlidingTabStrip.java
deleted file mode 100644
index 3232edc6..00000000
--- a/main/src/ui/java/de/blinkt/openvpn/views/PagerSlidingTabStrip.java
+++ /dev/null
@@ -1,732 +0,0 @@
-/*
- * Copyright (C) 2013 Andreas Stuetz <andreas.stuetz@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.blinkt.openvpn.views;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.TypedArray;
-import android.database.DataSetObserver;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Paint.Style;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.os.Parcel;
-import android.os.Parcelable;
-import androidx.core.view.ViewCompat;
-import android.support.v4n.view.ViewPager;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.util.Pair;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.widget.HorizontalScrollView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-
-import java.util.Locale;
-
-import de.blinkt.openvpn.R;
-
-public class PagerSlidingTabStrip extends HorizontalScrollView implements TabBarView {
-
- private static final float OPAQUE = 1.0f;
- private static final float HALF_TRANSP = 0.5f;
-
- public interface CustomTabProvider {
- public View getCustomTabView(ViewGroup parent, int position);
- }
-
- // @formatter:off
- private static final int[] ATTRS = new int[]{
- android.R.attr.textSize,
- android.R.attr.textColor,
- android.R.attr.paddingLeft,
- android.R.attr.paddingRight,
- };
- // @formatter:on
-
- private final PagerAdapterObserver adapterObserver = new PagerAdapterObserver();
-
- //These indexes must be related with the ATTR array above
- private static final int TEXT_SIZE_INDEX = 0;
- private static final int TEXT_COLOR_INDEX = 1;
- private static final int PADDING_LEFT_INDEX = 2;
- private static final int PADDING_RIGHT_INDEX = 3;
-
- private LinearLayout.LayoutParams defaultTabLayoutParams;
- private LinearLayout.LayoutParams expandedTabLayoutParams;
-
- private final PageListener pageListener = new PageListener();
- public ViewPager.OnPageChangeListener delegatePageListener;
-
- private LinearLayout tabsContainer;
- private ViewPager pager;
-
- private int tabCount;
-
- private int currentPosition = 0;
- private float currentPositionOffset = 0f;
-
- private Paint rectPaint;
- private Paint dividerPaint;
-
- private int indicatorColor;
- private int indicatorHeight = 2;
-
- private int underlineHeight = 0;
- private int underlineColor;
-
- private int dividerWidth = 0;
- private int dividerPadding = 0;
- private int dividerColor;
-
- private int tabPadding = 12;
- private int tabTextSize = 14;
- private ColorStateList tabTextColor = null;
- private float tabTextAlpha = HALF_TRANSP;
- private float tabTextSelectedAlpha = OPAQUE;
-
- private int paddingLeft = 0;
- private int paddingRight = 0;
-
- private boolean shouldExpand = false;
- private boolean textAllCaps = true;
- private boolean isPaddingMiddle = false;
-
- private Typeface tabTypeface = null;
- private int tabTypefaceStyle = Typeface.BOLD;
- private int tabTypefaceSelectedStyle = Typeface.BOLD;
-
- private int scrollOffset;
- private int lastScrollX = 0;
-
- private int tabBackgroundResId = R.drawable.slidingtab_background;
-
- private Locale locale;
-
- public PagerSlidingTabStrip(Context context) {
- this(context, null);
- }
-
- public PagerSlidingTabStrip(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public PagerSlidingTabStrip(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- setFillViewport(true);
- setWillNotDraw(false);
- tabsContainer = new LinearLayout(context);
- tabsContainer.setOrientation(LinearLayout.HORIZONTAL);
- tabsContainer.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
- addView(tabsContainer);
-
- //Default color will be 'textColorPrimary'
- int colorPrimary = context.getResources().getColor(android.R.color.primary_text_dark);
- setTextColor(colorPrimary);
- underlineColor = colorPrimary;
- dividerColor = colorPrimary;
- indicatorColor = colorPrimary;
-
-
- DisplayMetrics dm = getResources().getDisplayMetrics();
- scrollOffset = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, scrollOffset, dm);
- indicatorHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, indicatorHeight, dm);
- underlineHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, underlineHeight, dm);
- dividerPadding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dividerPadding, dm);
- tabPadding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, tabPadding, dm);
- dividerWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dividerWidth, dm);
- tabTextSize = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, tabTextSize, dm);
-
- // get system attrs (android:textSize and android:textColor)
- TypedArray a = context.obtainStyledAttributes(attrs, ATTRS);
- tabTextSize = a.getDimensionPixelSize(TEXT_SIZE_INDEX, tabTextSize);
- ColorStateList colorStateList = a.getColorStateList(TEXT_COLOR_INDEX);
- if (colorStateList != null) {
- tabTextColor = colorStateList;
- }
- paddingLeft = a.getDimensionPixelSize(PADDING_LEFT_INDEX, paddingLeft);
- paddingRight = a.getDimensionPixelSize(PADDING_RIGHT_INDEX, paddingRight);
- a.recycle();
-
- //In case we have the padding they must be equal so we take the biggest
- if (paddingRight < paddingLeft) {
- paddingRight = paddingLeft;
- }
-
- if (paddingLeft < paddingRight) {
- paddingLeft = paddingRight;
- }
-
- // get custom attrs
- a = context.obtainStyledAttributes(attrs, R.styleable.PagerSlidingTabStrip);
- indicatorColor = a.getColor(R.styleable.PagerSlidingTabStrip_pstsIndicatorColor, indicatorColor);
- underlineColor = a.getColor(R.styleable.PagerSlidingTabStrip_pstsUnderlineColor, underlineColor);
- dividerColor = a.getColor(R.styleable.PagerSlidingTabStrip_pstsDividerColor, dividerColor);
- dividerWidth = a.getDimensionPixelSize(R.styleable.PagerSlidingTabStrip_pstsDividerWidth, dividerWidth);
- indicatorHeight = a.getDimensionPixelSize(R.styleable.PagerSlidingTabStrip_pstsIndicatorHeight, indicatorHeight);
- underlineHeight = a.getDimensionPixelSize(R.styleable.PagerSlidingTabStrip_pstsUnderlineHeight, underlineHeight);
- dividerPadding = a.getDimensionPixelSize(R.styleable.PagerSlidingTabStrip_pstsDividerPadding, dividerPadding);
- tabPadding = a.getDimensionPixelSize(R.styleable.PagerSlidingTabStrip_pstsTabPaddingLeftRight, tabPadding);
- tabBackgroundResId = a.getResourceId(R.styleable.PagerSlidingTabStrip_pstsTabBackground, tabBackgroundResId);
- shouldExpand = a.getBoolean(R.styleable.PagerSlidingTabStrip_pstsShouldExpand, shouldExpand);
- scrollOffset = a.getDimensionPixelSize(R.styleable.PagerSlidingTabStrip_pstsScrollOffset, scrollOffset);
- textAllCaps = a.getBoolean(R.styleable.PagerSlidingTabStrip_pstsTextAllCaps, textAllCaps);
- isPaddingMiddle = a.getBoolean(R.styleable.PagerSlidingTabStrip_pstsPaddingMiddle, isPaddingMiddle);
- tabTypefaceStyle = a.getInt(R.styleable.PagerSlidingTabStrip_pstsTextStyle, Typeface.BOLD);
- tabTypefaceSelectedStyle = a.getInt(R.styleable.PagerSlidingTabStrip_pstsTextSelectedStyle, Typeface.BOLD);
- tabTextAlpha = a.getFloat(R.styleable.PagerSlidingTabStrip_pstsTextAlpha, HALF_TRANSP);
- tabTextSelectedAlpha = a.getFloat(R.styleable.PagerSlidingTabStrip_pstsTextSelectedAlpha, OPAQUE);
- a.recycle();
-
- rectPaint = new Paint();
- rectPaint.setAntiAlias(true);
- rectPaint.setStyle(Style.FILL);
-
-
- dividerPaint = new Paint();
- dividerPaint.setAntiAlias(true);
- dividerPaint.setStrokeWidth(dividerWidth);
-
- defaultTabLayoutParams = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
- expandedTabLayoutParams = new LinearLayout.LayoutParams(0, LayoutParams.MATCH_PARENT, 1.0f);
-
- if (locale == null) {
- locale = getResources().getConfiguration().locale;
- }
- }
-
- public void setViewPager(ViewPager pager) {
- this.pager = pager;
- if (pager.getAdapter() == null) {
- throw new IllegalStateException("ViewPager does not have adapter instance.");
- }
-
- pager.setOnPageChangeListener(pageListener);
- pager.getAdapter().registerDataSetObserver(adapterObserver);
- adapterObserver.setAttached(true);
- notifyDataSetChanged();
- }
-
- public void notifyDataSetChanged() {
- tabsContainer.removeAllViews();
- tabCount = pager.getAdapter().getCount();
- View tabView;
- for (int i = 0; i < tabCount; i++) {
-
- if (pager.getAdapter() instanceof CustomTabProvider) {
- tabView = ((CustomTabProvider) pager.getAdapter()).getCustomTabView(this, i);
- } else {
- tabView = LayoutInflater.from(getContext()).inflate(R.layout.padersliding_tab, this, false);
- }
-
- CharSequence title = pager.getAdapter().getPageTitle(i);
-
- addTab(i, title, tabView);
- }
-
- updateTabStyles();
- getViewTreeObserver().addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
-
- @SuppressWarnings("deprecation")
- @SuppressLint("NewApi")
- @Override
- public void onGlobalLayout() {
-
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
- getViewTreeObserver().removeGlobalOnLayoutListener(this);
- } else {
- getViewTreeObserver().removeOnGlobalLayoutListener(this);
- }
-
- currentPosition = pager.getCurrentItem();
- currentPositionOffset = 0f;
- scrollToChild(currentPosition, 0);
- updateSelection(currentPosition);
- }
- });
- }
-
- private void addTab(final int position, CharSequence title, View tabView) {
- TextView textView = (TextView) tabView.findViewById(R.id.tab_title);
- if (textView != null) {
- if (title != null) textView.setText(title);
- float alpha = pager.getCurrentItem() == position ? tabTextSelectedAlpha : tabTextAlpha;
- ViewCompat.setAlpha(textView, alpha);
- }
-
- tabView.setFocusable(true);
- tabView.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- if (pager.getCurrentItem() != position) {
- View tab = tabsContainer.getChildAt(pager.getCurrentItem());
- notSelected(tab);
- pager.setCurrentItem(position);
- }
- }
- });
-
- tabView.setPadding(tabPadding, tabView.getPaddingTop(), tabPadding, tabView.getPaddingBottom());
- tabsContainer.addView(tabView, position, shouldExpand ? expandedTabLayoutParams : defaultTabLayoutParams);
- }
-
- private void updateTabStyles() {
- for (int i = 0; i < tabCount; i++) {
- View v = tabsContainer.getChildAt(i);
- v.setBackgroundResource(tabBackgroundResId);
- TextView tab_title = (TextView) v.findViewById(R.id.tab_title);
-
- if (tab_title != null) {
- tab_title.setTextSize(TypedValue.COMPLEX_UNIT_PX, tabTextSize);
- tab_title.setTypeface(tabTypeface, pager.getCurrentItem() == i ? tabTypefaceSelectedStyle : tabTypefaceStyle);
- if (tabTextColor != null) {
- tab_title.setTextColor(tabTextColor);
- }
- // setAllCaps() is only available from API 14, so the upper case is made manually if we are on a
- // pre-ICS-build
- if (textAllCaps) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
- tab_title.setAllCaps(true);
- } else {
- tab_title.setText(tab_title.getText().toString().toUpperCase(locale));
- }
- }
- }
- }
-
- }
-
- private void scrollToChild(int position, int offset) {
- if (tabCount == 0) {
- return;
- }
-
- int newScrollX = tabsContainer.getChildAt(position).getLeft() + offset;
- if (position > 0 || offset > 0) {
-
- //Half screen offset.
- //- Either tabs start at the middle of the view scrolling straight away
- //- Or tabs start at the begging (no padding) scrolling when indicator gets
- // to the middle of the view width
- newScrollX -= scrollOffset;
- Pair<Float, Float> lines = getIndicatorCoordinates();
- newScrollX += ((lines.second - lines.first) / 2);
- }
-
- if (newScrollX != lastScrollX) {
- lastScrollX = newScrollX;
- scrollTo(newScrollX, 0);
- }
- }
-
- private Pair<Float, Float> getIndicatorCoordinates() {
- // default: line below current tab
- View currentTab = tabsContainer.getChildAt(currentPosition);
- float lineLeft = currentTab.getLeft();
- float lineRight = currentTab.getRight();
-
- // if there is an offset, start interpolating left and right coordinates between current and next tab
- if (currentPositionOffset > 0f && currentPosition < tabCount - 1) {
-
- View nextTab = tabsContainer.getChildAt(currentPosition + 1);
- final float nextTabLeft = nextTab.getLeft();
- final float nextTabRight = nextTab.getRight();
-
- lineLeft = (currentPositionOffset * nextTabLeft + (1f - currentPositionOffset) * lineLeft);
- lineRight = (currentPositionOffset * nextTabRight + (1f - currentPositionOffset) * lineRight);
- }
- return new Pair<Float, Float>(lineLeft, lineRight);
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
- if (isInEditMode() || tabCount == 0) {
- return;
- }
-
- final int height = getHeight();
- // draw indicator line
- rectPaint.setColor(indicatorColor);
- Pair<Float, Float> lines = getIndicatorCoordinates();
- canvas.drawRect(lines.first + paddingLeft, height - indicatorHeight, lines.second + paddingRight, height, rectPaint);
- // draw underline
- rectPaint.setColor(underlineColor);
- canvas.drawRect(paddingLeft, height - underlineHeight, tabsContainer.getWidth() + paddingRight, height, rectPaint);
- // draw divider
- if (dividerWidth != 0) {
- dividerPaint.setStrokeWidth(dividerWidth);
- dividerPaint.setColor(dividerColor);
- for (int i = 0; i < tabCount - 1; i++) {
- View tab = tabsContainer.getChildAt(i);
- canvas.drawLine(tab.getRight(), dividerPadding, tab.getRight(), height - dividerPadding, dividerPaint);
- }
- }
- }
-
- @Override
- protected void onLayout(boolean changed, int l, int t, int r, int b) {
- if (isPaddingMiddle) {
- //Make sure tabContainer is bigger than the HorizontalScrollView to be able to scroll
- tabsContainer.setMinimumWidth(getWidth());
- int halfFirstTab = 0;
- if (tabsContainer.getChildCount() > 0) {
- halfFirstTab = (tabsContainer.getChildAt(0).getWidth() / 2);
- }
- //The user choose the tabs to start in the middle of the view width (padding)
- paddingLeft = paddingRight = getWidth() / 2 - halfFirstTab;
- //Clipping padding to false to see the tabs while we pass them swiping
- setClipToPadding(false);
- }
-
- if (scrollOffset == 0) scrollOffset = getWidth() / 2 - paddingLeft;
- setPadding(paddingLeft, getPaddingTop(), paddingRight, getPaddingBottom());
- super.onLayout(changed, l, t, r, b);
- }
-
- public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) {
- this.delegatePageListener = listener;
- }
-
- private class PageListener implements ViewPager.OnPageChangeListener {
-
- @Override
- public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
- currentPosition = position;
- currentPositionOffset = positionOffset;
- int offset = tabCount > 0 ? (int) (positionOffset * tabsContainer.getChildAt(position).getWidth()) : 0;
- scrollToChild(position, offset);
- invalidate();
- if (delegatePageListener != null) {
- delegatePageListener.onPageScrolled(position, positionOffset, positionOffsetPixels);
- }
- }
-
- @Override
- public void onPageScrollStateChanged(int state) {
- if (state == ViewPager.SCROLL_STATE_IDLE) {
- scrollToChild(pager.getCurrentItem(), 0);
- }
- //Full alpha for current item
- View currentTab = tabsContainer.getChildAt(pager.getCurrentItem());
- selected(currentTab);
- //Half transparent for prev item
- if (pager.getCurrentItem() - 1 >= 0) {
- View prevTab = tabsContainer.getChildAt(pager.getCurrentItem() - 1);
- notSelected(prevTab);
- }
- //Half transparent for next item
- if (pager.getCurrentItem() + 1 <= pager.getAdapter().getCount() - 1) {
- View nextTab = tabsContainer.getChildAt(pager.getCurrentItem() + 1);
- notSelected(nextTab);
- }
-
- if (delegatePageListener != null) {
- delegatePageListener.onPageScrollStateChanged(state);
- }
- }
-
- @Override
- public void onPageSelected(int position) {
- updateSelection(position);
- if (delegatePageListener != null) {
- delegatePageListener.onPageSelected(position);
- }
- }
-
- }
-
- private void updateSelection(int position) {
- for (int i = 0; i < tabCount; ++i) {
- View tv = tabsContainer.getChildAt(i);
- tv.setSelected(i == position);
- }
- }
-
- private void notSelected(View tab) {
- TextView title = (TextView) tab.findViewById(R.id.tab_title);
- if (title != null) {
- title.setTypeface(tabTypeface, tabTypefaceStyle);
- ViewCompat.setAlpha(title, tabTextAlpha);
- }
- }
-
- private void selected(View tab) {
- TextView title = (TextView) tab.findViewById(R.id.tab_title);
- if (title != null) {
- title.setTypeface(tabTypeface, tabTypefaceSelectedStyle);
- ViewCompat.setAlpha(title, tabTextSelectedAlpha);
- }
- }
-
- private class PagerAdapterObserver extends DataSetObserver {
-
- private boolean attached = false;
-
- @Override
- public void onChanged() {
- notifyDataSetChanged();
- }
-
- public void setAttached(boolean attached) {
- this.attached = attached;
- }
-
- public boolean isAttached() {
- return attached;
- }
- }
-
- @Override
- protected void onAttachedToWindow() {
- super.onAttachedToWindow();
- if (pager != null) {
- if (!adapterObserver.isAttached()) {
- pager.getAdapter().registerDataSetObserver(adapterObserver);
- adapterObserver.setAttached(true);
- }
- }
- }
-
- @Override
- protected void onDetachedFromWindow() {
- super.onDetachedFromWindow();
- if (pager != null) {
- if (adapterObserver.isAttached()) {
- pager.getAdapter().unregisterDataSetObserver(adapterObserver);
- adapterObserver.setAttached(false);
- }
- }
- }
-
- @Override
- public void onRestoreInstanceState(Parcelable state) {
- SavedState savedState = (SavedState) state;
- super.onRestoreInstanceState(savedState.getSuperState());
- currentPosition = savedState.currentPosition;
- if (currentPosition != 0 && tabsContainer.getChildCount() > 0) {
- notSelected(tabsContainer.getChildAt(0));
- selected(tabsContainer.getChildAt(currentPosition));
- }
- requestLayout();
- }
-
- @Override
- public Parcelable onSaveInstanceState() {
- Parcelable superState = super.onSaveInstanceState();
- SavedState savedState = new SavedState(superState);
- savedState.currentPosition = currentPosition;
- return savedState;
- }
-
- static class SavedState extends BaseSavedState {
- int currentPosition;
-
- public SavedState(Parcelable superState) {
- super(superState);
- }
-
- private SavedState(Parcel in) {
- super(in);
- currentPosition = in.readInt();
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- super.writeToParcel(dest, flags);
- dest.writeInt(currentPosition);
- }
-
- public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
- @Override
- public SavedState createFromParcel(Parcel in) {
- return new SavedState(in);
- }
-
- @Override
- public SavedState[] newArray(int size) {
- return new SavedState[size];
- }
- };
- }
-
- public int getIndicatorColor() {
- return this.indicatorColor;
- }
-
- public int getIndicatorHeight() {
- return indicatorHeight;
- }
-
- public int getUnderlineColor() {
- return underlineColor;
- }
-
- public int getDividerColor() {
- return dividerColor;
- }
-
- public int getDividerWidth() {
- return dividerWidth;
- }
-
- public int getUnderlineHeight() {
- return underlineHeight;
- }
-
- public int getDividerPadding() {
- return dividerPadding;
- }
-
- public int getScrollOffset() {
- return scrollOffset;
- }
-
- public boolean getShouldExpand() {
- return shouldExpand;
- }
-
- public int getTextSize() {
- return tabTextSize;
- }
-
- public boolean isTextAllCaps() {
- return textAllCaps;
- }
-
- public ColorStateList getTextColor() {
- return tabTextColor;
- }
-
- public int getTabBackground() {
- return tabBackgroundResId;
- }
-
- public int getTabPaddingLeftRight() {
- return tabPadding;
- }
-
- public void setIndicatorColor(int indicatorColor) {
- this.indicatorColor = indicatorColor;
- invalidate();
- }
-
- public void setIndicatorColorResource(int resId) {
- this.indicatorColor = getResources().getColor(resId);
- invalidate();
- }
-
- public void setIndicatorHeight(int indicatorLineHeightPx) {
- this.indicatorHeight = indicatorLineHeightPx;
- invalidate();
- }
-
- public void setUnderlineColor(int underlineColor) {
- this.underlineColor = underlineColor;
- invalidate();
- }
-
- public void setUnderlineColorResource(int resId) {
- this.underlineColor = getResources().getColor(resId);
- invalidate();
- }
-
- public void setDividerColor(int dividerColor) {
- this.dividerColor = dividerColor;
- invalidate();
- }
-
- public void setDividerColorResource(int resId) {
- this.dividerColor = getResources().getColor(resId);
- invalidate();
- }
-
- public void setDividerWidth(int dividerWidthPx) {
- this.dividerWidth = dividerWidthPx;
- invalidate();
- }
-
- public void setUnderlineHeight(int underlineHeightPx) {
- this.underlineHeight = underlineHeightPx;
- invalidate();
- }
-
- public void setDividerPadding(int dividerPaddingPx) {
- this.dividerPadding = dividerPaddingPx;
- invalidate();
- }
-
- public void setScrollOffset(int scrollOffsetPx) {
- this.scrollOffset = scrollOffsetPx;
- invalidate();
- }
-
- public void setShouldExpand(boolean shouldExpand) {
- this.shouldExpand = shouldExpand;
- if (pager != null) {
- requestLayout();
- }
- }
-
- public void setAllCaps(boolean textAllCaps) {
- this.textAllCaps = textAllCaps;
- }
-
- public void setTextSize(int textSizePx) {
- this.tabTextSize = textSizePx;
- updateTabStyles();
- }
-
- public void setTextColor(int textColor) {
- setTextColor(new ColorStateList(new int[][]{new int[]{}}, new int[]{textColor}));
- }
-
- public void setTextColor(ColorStateList colorStateList) {
- this.tabTextColor = colorStateList;
- updateTabStyles();
- }
-
- public void setTextColorResource(int resId) {
- setTextColor(getResources().getColor(resId));
- }
-
- public void setTextColorStateListResource(int resId) {
- setTextColor(getResources().getColorStateList(resId));
- }
-
- public void setTypeface(Typeface typeface, int style) {
- this.tabTypeface = typeface;
- this.tabTypefaceSelectedStyle = style;
- updateTabStyles();
- }
-
- public void setTabBackground(int resId) {
- this.tabBackgroundResId = resId;
- }
-
- public void setTabPaddingLeftRight(int paddingPx) {
- this.tabPadding = paddingPx;
- updateTabStyles();
- }
-} \ No newline at end of file
diff --git a/main/src/ui/java/de/blinkt/openvpn/views/RemoteCNPreference.java b/main/src/ui/java/de/blinkt/openvpn/views/RemoteCNPreference.java
index 4b477f9c..46c9ed48 100644
--- a/main/src/ui/java/de/blinkt/openvpn/views/RemoteCNPreference.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/RemoteCNPreference.java
@@ -6,141 +6,55 @@
package de.blinkt.openvpn.views;
import android.content.Context;
-import android.preference.DialogPreference;
import android.util.AttributeSet;
-import android.util.Pair;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.Spinner;
-import android.widget.TextView;
+
+import androidx.preference.DialogPreference;
import de.blinkt.openvpn.R;
-import de.blinkt.openvpn.VpnProfile;
public class RemoteCNPreference extends DialogPreference {
- private Spinner mSpinner;
- private EditText mEditText;
- private int mDNType;
- private String mDn;
- private TextView mRemoteTLSNote;
- //private ScrollView mScrollView;
-
- public RemoteCNPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- setDialogLayoutResource(R.layout.tlsremote);
-
- }
-
- @Override
- protected void onBindDialogView(View view) {
-
- super.onBindDialogView(view);
-
- mEditText = (EditText) view.findViewById(R.id.tlsremotecn);
- mSpinner = (Spinner) view.findViewById(R.id.x509verifytype);
- mRemoteTLSNote = (TextView) view.findViewById(R.id.tlsremotenote);
- //mScrollView = (ScrollView) view.findViewById(R.id.tlsremotescroll);
- if(mDn!=null)
- mEditText.setText(mDn);
-
- populateSpinner();
-
- }
-
-
-
- public String getCNText() {
- return mDn;
- }
-
- public int getAuthtype() {
- return mDNType;
- }
-
- public void setDN(String dn) {
- mDn = dn;
- if(mEditText!=null)
- mEditText.setText(dn);
- }
-
- public void setAuthType(int x509authtype) {
- mDNType = x509authtype;
- if (mSpinner!=null)
- populateSpinner();
- }
-
- @Override
- protected void onDialogClosed(boolean positiveResult) {
- super.onDialogClosed(positiveResult);
-
- if (positiveResult) {
- String dn = mEditText.getText().toString();
- int authtype = getAuthTypeFromSpinner();
- if (callChangeListener(new Pair<Integer, String>(authtype, dn))) {
- mDn = dn;
- mDNType = authtype;
- }
- }
- }
-
- private void populateSpinner() {
- ArrayAdapter<String> authtypes = new ArrayAdapter<String>(getContext(), android.R.layout.simple_spinner_item);
- authtypes.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-
- authtypes.add(getContext().getString(R.string.complete_dn));
- authtypes.add(getContext().getString(R.string.rdn));
- authtypes.add(getContext().getString(R.string.rdn_prefix));
- if ((mDNType == VpnProfile.X509_VERIFY_TLSREMOTE || mDNType == VpnProfile.X509_VERIFY_TLSREMOTE_COMPAT_NOREMAPPING)
- && !(mDn==null || "".equals(mDn))) {
- authtypes.add(getContext().getString(R.string.tls_remote_deprecated));
- mRemoteTLSNote.setVisibility(View.VISIBLE);
- } else {
- mRemoteTLSNote.setVisibility(View.GONE);
- }
- mSpinner.setAdapter(authtypes);
- mSpinner.setSelection(getSpinnerPositionFromAuthTYPE());
- }
-
- private int getSpinnerPositionFromAuthTYPE() {
- switch (mDNType) {
- case VpnProfile.X509_VERIFY_TLSREMOTE_DN:
- return 0;
- case VpnProfile.X509_VERIFY_TLSREMOTE_RDN:
- return 1;
- case VpnProfile.X509_VERIFY_TLSREMOTE_RDN_PREFIX:
- return 2;
- case VpnProfile.X509_VERIFY_TLSREMOTE_COMPAT_NOREMAPPING:
- case VpnProfile.X509_VERIFY_TLSREMOTE:
- if (mDn==null || "".equals(mDn))
- return 1;
- else
- return 3;
-
-
- default:
- return 0;
- }
- }
-
- private int getAuthTypeFromSpinner() {
- int pos = mSpinner.getSelectedItemPosition();
- switch (pos) {
- case 0:
- return VpnProfile.X509_VERIFY_TLSREMOTE_DN;
- case 1:
- return VpnProfile.X509_VERIFY_TLSREMOTE_RDN;
- case 2:
- return VpnProfile.X509_VERIFY_TLSREMOTE_RDN_PREFIX;
- case 3:
- // This is the tls-remote entry, only visible if mDntype is a
- // tls-remote type
- return mDNType;
- default:
- return VpnProfile.X509_VERIFY_TLSREMOTE;
- }
- }
+ private int mDNType;
+ private String mDn;
+
+ public RemoteCNPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+
+ }
+
+ public RemoteCNPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, defStyleAttr);
+ }
+
+ public RemoteCNPreference(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public RemoteCNPreference(Context context) {
+ this(context, null);
+ }
+
+
+ public void setDN(String dn) {
+ mDn = dn;
+ }
+
+
+ public void setAuthType(int x509authtype) {
+ mDNType = x509authtype;
+ }
+
+ public String getCNText() {
+ return mDn;
+ }
+
+ public int getAuthtype() {
+ return mDNType;
+ }
+ @Override
+ public int getDialogLayoutResource() {
+ return R.layout.tlsremote;
+ }
}
diff --git a/main/src/ui/java/de/blinkt/openvpn/views/RemoteCNPreferenceDialog.java b/main/src/ui/java/de/blinkt/openvpn/views/RemoteCNPreferenceDialog.java
new file mode 100644
index 00000000..37258489
--- /dev/null
+++ b/main/src/ui/java/de/blinkt/openvpn/views/RemoteCNPreferenceDialog.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2012-2019 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+
+package de.blinkt.openvpn.views;
+
+import android.os.Bundle;
+import android.util.Pair;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import androidx.preference.PreferenceDialogFragmentCompat;
+
+import de.blinkt.openvpn.R;
+import de.blinkt.openvpn.VpnProfile;
+
+import static de.blinkt.openvpn.VpnProfile.X509_VERIFY_TLSREMOTE_COMPAT_NOREMAPPING;
+
+public class RemoteCNPreferenceDialog extends PreferenceDialogFragmentCompat {
+ private Spinner mSpinner;
+ private EditText mEditText;
+ private TextView mRemoteTLSNote;
+
+ public static RemoteCNPreferenceDialog newInstance(String key) {
+ RemoteCNPreferenceDialog f = new RemoteCNPreferenceDialog();
+ Bundle args = new Bundle();
+ args.putString(ARG_KEY, key);
+ f.setArguments(args);
+ return f;
+ }
+
+ @Override
+ public void onBindDialogView(View view) {
+ String mDn = ((RemoteCNPreference) getPreference()).getCNText();
+ int mDNType = ((RemoteCNPreference) getPreference()).getAuthtype();
+
+ mEditText = view.findViewById(R.id.tlsremotecn);
+ mSpinner = view.findViewById(R.id.x509verifytype);
+ mRemoteTLSNote = view.findViewById(R.id.tlsremotenote);
+ mEditText.setText(mDn);
+
+ populateSpinner(mDn, mDNType);
+ }
+
+ private void populateSpinner(String mDn, int mDNType) {
+ ArrayAdapter<String> authtypes = new ArrayAdapter<>(requireContext(), android.R.layout.simple_spinner_item);
+ authtypes.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
+ authtypes.add(requireContext().getString(R.string.complete_dn));
+ authtypes.add(requireContext().getString(R.string.rdn));
+ authtypes.add(requireContext().getString(R.string.rdn_prefix));
+ if ((mDNType == VpnProfile.X509_VERIFY_TLSREMOTE || mDNType == X509_VERIFY_TLSREMOTE_COMPAT_NOREMAPPING)
+ && !(mDn == null || "".equals(mDn))) {
+ authtypes.add(requireContext().getString(R.string.tls_remote_deprecated));
+ mRemoteTLSNote.setVisibility(View.VISIBLE);
+ } else {
+ mRemoteTLSNote.setVisibility(View.GONE);
+ }
+ mSpinner.setAdapter(authtypes);
+ mSpinner.setSelection(getSpinnerPositionFromAuthTYPE(mDNType, mDn));
+ }
+
+ private int getSpinnerPositionFromAuthTYPE(int mDNType, String mDn) {
+ switch (mDNType) {
+ case VpnProfile.X509_VERIFY_TLSREMOTE_DN:
+ return 0;
+ case VpnProfile.X509_VERIFY_TLSREMOTE_RDN:
+ return 1;
+ case VpnProfile.X509_VERIFY_TLSREMOTE_RDN_PREFIX:
+ return 2;
+ case X509_VERIFY_TLSREMOTE_COMPAT_NOREMAPPING:
+ case VpnProfile.X509_VERIFY_TLSREMOTE:
+ if (mDn == null || "".equals(mDn))
+ return 1;
+ else
+ return 3;
+
+
+ default:
+ return 0;
+ }
+ }
+
+
+ private int getAuthTypeFromSpinner() {
+ int pos = mSpinner.getSelectedItemPosition();
+ switch (pos) {
+ case 0:
+ return VpnProfile.X509_VERIFY_TLSREMOTE_DN;
+ case 1:
+ return VpnProfile.X509_VERIFY_TLSREMOTE_RDN;
+ case 2:
+ return VpnProfile.X509_VERIFY_TLSREMOTE_RDN_PREFIX;
+ case 3:
+ // This is the tls-remote entry, only visible if mDntype is a
+ // tls-remote type
+ return X509_VERIFY_TLSREMOTE_COMPAT_NOREMAPPING;
+ default:
+ return VpnProfile.X509_VERIFY_TLSREMOTE;
+ }
+ }
+
+
+ @Override
+ public void onDialogClosed(boolean positiveResult) {
+
+ if (positiveResult) {
+ RemoteCNPreference pref = ((RemoteCNPreference) getPreference());
+
+ String dn = mEditText.getText().toString();
+ int authtype = getAuthTypeFromSpinner();
+ if (pref.callChangeListener(new Pair<>(authtype, dn))) {
+ pref.setDN(dn);
+ pref.setAuthType(authtype);
+ }
+ }
+ }
+
+
+}
diff --git a/main/src/ui/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java b/main/src/ui/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java
index 481e4c16..4f1150a2 100644
--- a/main/src/ui/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java
@@ -5,20 +5,22 @@
package de.blinkt.openvpn.views;
-import android.app.Fragment;
-import android.app.FragmentManager;
import android.content.Context;
import android.content.res.Resources;
import android.os.Bundle;
+
+import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
-import android.support.v4n.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
import java.util.Vector;
/**
* Created by arne on 18.11.14.
*/
-public class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
+public class ScreenSlidePagerAdapter extends FragmentPagerAdapter {
private final Resources res;
private Bundle mFragmentArguments;
@@ -46,6 +48,7 @@ public class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
res = c.getResources();
}
+ @NonNull
@Override
public Fragment getItem(int position) {
try {
diff --git a/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabLayout.java b/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabLayout.java
deleted file mode 100644
index 51ad6933..00000000
--- a/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabLayout.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.blinkt.openvpn.views;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.support.v4n.view.PagerAdapter;
-import android.support.v4n.view.ViewPager;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.HorizontalScrollView;
-import android.widget.TextView;
-
-/**
- * To be used with ViewPager to provide a tab indicator component which give constant feedback as to
- * the user's scroll progress.
- * <p>
- * To use the component, simply add it to your view hierarchy. Then in your
- * {@link android.app.Activity} or {@link androidx.core.app.Fragment} call
- * {@link #setViewPager(ViewPager)} providing it the ViewPager this layout is being used for.
- * <p>
- * The colors can be customized in two ways. The first and simplest is to provide an array of colors
- * via {@link #setSelectedIndicatorColors(int...)} and {@link #setDividerColors(int...)}. The
- * alternative is via the {@link TabColorizer} interface which provides you complete control over
- * which color is used for any individual position.
- * <p>
- * The views used as tabs can be customized by calling {@link #setCustomTabView(int, int)},
- * providing the layout ID of your custom layout.
- */
-public class SlidingTabLayout extends HorizontalScrollView implements TabBarView {
-
- /**
- * Allows complete control over the colors drawn in the tab layout. Set with
- * {@link #setCustomTabColorizer(TabColorizer)}.
- */
- public interface TabColorizer {
-
- /**
- * @return return the color of the indicator used when {@code position} is selected.
- */
- int getIndicatorColor(int position);
-
- /**
- * @return return the color of the divider drawn to the right of {@code position}.
- */
- int getDividerColor(int position);
-
- }
-
- private static final int TITLE_OFFSET_DIPS = 24;
- private static final int TAB_VIEW_PADDING_DIPS = 16;
- private static final int TAB_VIEW_TEXT_SIZE_SP = 12;
-
- private int mTitleOffset;
-
- private int mTabViewLayoutId;
- private int mTabViewTextViewId;
-
- private ViewPager mViewPager;
- private ViewPager.OnPageChangeListener mViewPagerPageChangeListener;
-
- private final SlidingTabStrip mTabStrip;
-
- public SlidingTabLayout(Context context) {
- this(context, null);
- }
-
- public SlidingTabLayout(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public SlidingTabLayout(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
-
- // Disable the Scroll Bar
- setHorizontalScrollBarEnabled(false);
- // Make sure that the Tab Strips fills this View
- setFillViewport(true);
-
- mTitleOffset = (int) (TITLE_OFFSET_DIPS * getResources().getDisplayMetrics().density);
-
- mTabStrip = new SlidingTabStrip(context);
- addView(mTabStrip, LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
- }
-
- /**
- * Set the custom {@link TabColorizer} to be used.
- *
- * If you only require simple custmisation then you can use
- * {@link #setSelectedIndicatorColors(int...)} and {@link #setDividerColors(int...)} to achieve
- * similar effects.
- */
- public void setCustomTabColorizer(TabColorizer tabColorizer) {
- mTabStrip.setCustomTabColorizer(tabColorizer);
- }
-
- /**
- * Sets the colors to be used for indicating the selected tab. These colors are treated as a
- * circular array. Providing one color will mean that all tabs are indicated with the same color.
- */
- public void setSelectedIndicatorColors(int... colors) {
- mTabStrip.setSelectedIndicatorColors(colors);
- }
-
- /**
- * Sets the colors to be used for tab dividers. These colors are treated as a circular array.
- * Providing one color will mean that all tabs are indicated with the same color.
- */
- public void setDividerColors(int... colors) {
- mTabStrip.setDividerColors(colors);
- }
-
- /**
- * Set the {@link ViewPager.OnPageChangeListener}. When using {@link SlidingTabLayout} you are
- * required to set any {@link ViewPager.OnPageChangeListener} through this method. This is so
- * that the layout can update it's scroll position correctly.
- *
- * @see ViewPager#setOnPageChangeListener(ViewPager.OnPageChangeListener)
- */
- public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) {
- mViewPagerPageChangeListener = listener;
- }
-
- /**
- * Set the custom layout to be inflated for the tab views.
- *
- * @param layoutResId Layout id to be inflated
- * @param textViewId id of the {@link TextView} in the inflated view
- */
- public void setCustomTabView(int layoutResId, int textViewId) {
- mTabViewLayoutId = layoutResId;
- mTabViewTextViewId = textViewId;
- }
-
- /**
- * Sets the associated view pager. Note that the assumption here is that the pager content
- * (number of tabs and tab titles) does not change after this call has been made.
- */
- public void setViewPager(ViewPager viewPager) {
- mTabStrip.removeAllViews();
-
- mViewPager = viewPager;
- if (viewPager != null) {
- viewPager.setOnPageChangeListener(new InternalViewPagerListener());
- populateTabStrip();
- }
- }
-
- /**
- * Create a default view to be used for tabs. This is called if a custom tab view is not set via
- * {@link #setCustomTabView(int, int)}.
- */
- protected TextView createDefaultTabView(Context context) {
- TextView textView = new TextView(context);
- textView.setGravity(Gravity.CENTER);
- textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, TAB_VIEW_TEXT_SIZE_SP);
- textView.setTypeface(Typeface.DEFAULT_BOLD);
-
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
- // If we're running on Honeycomb or newer, then we can use the Theme's
- // selectableItemBackground to ensure that the View has a pressed state
- TypedValue outValue = new TypedValue();
- getContext().getTheme().resolveAttribute(android.R.attr.selectableItemBackground,
- outValue, true);
- textView.setBackgroundResource(outValue.resourceId);
- }
-
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
- // If we're running on ICS or newer, enable all-caps to match the Action Bar tab style
- textView.setAllCaps(true);
- }
-
- int padding = (int) (TAB_VIEW_PADDING_DIPS * getResources().getDisplayMetrics().density);
- textView.setPadding(padding, padding, padding, padding);
-
- return textView;
- }
-
- private void populateTabStrip() {
- final PagerAdapter adapter = mViewPager.getAdapter();
- final View.OnClickListener tabClickListener = new TabClickListener();
-
- for (int i = 0; i < adapter.getCount(); i++) {
- View tabView = null;
- TextView tabTitleView = null;
-
- if (mTabViewLayoutId != 0) {
- // If there is a custom tab view layout id set, try and inflate it
- tabView = LayoutInflater.from(getContext()).inflate(mTabViewLayoutId, mTabStrip,
- false);
- tabTitleView = (TextView) tabView.findViewById(mTabViewTextViewId);
- }
-
- if (tabView == null) {
- tabView = createDefaultTabView(getContext());
- }
-
- if (tabTitleView == null && TextView.class.isInstance(tabView)) {
- tabTitleView = (TextView) tabView;
- }
-
- tabTitleView.setText(adapter.getPageTitle(i));
- tabView.setOnClickListener(tabClickListener);
-
- mTabStrip.addView(tabView);
- }
- }
-
- @Override
- protected void onAttachedToWindow() {
- super.onAttachedToWindow();
-
- if (mViewPager != null) {
- scrollToTab(mViewPager.getCurrentItem(), 0);
- }
- }
-
- private void scrollToTab(int tabIndex, int positionOffset) {
- final int tabStripChildCount = mTabStrip.getChildCount();
- if (tabStripChildCount == 0 || tabIndex < 0 || tabIndex >= tabStripChildCount) {
- return;
- }
-
- View selectedChild = mTabStrip.getChildAt(tabIndex);
- if (selectedChild != null) {
- int targetScrollX = selectedChild.getLeft() + positionOffset;
-
- if (tabIndex > 0 || positionOffset > 0) {
- // If we're not at the first child and are mid-scroll, make sure we obey the offset
- targetScrollX -= mTitleOffset;
- }
-
- scrollTo(targetScrollX, 0);
- }
- }
-
- private class InternalViewPagerListener implements ViewPager.OnPageChangeListener {
- private int mScrollState;
-
- @Override
- public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
- int tabStripChildCount = mTabStrip.getChildCount();
- if ((tabStripChildCount == 0) || (position < 0) || (position >= tabStripChildCount)) {
- return;
- }
-
- mTabStrip.onViewPagerPageChanged(position, positionOffset);
-
- View selectedTitle = mTabStrip.getChildAt(position);
- int extraOffset = (selectedTitle != null)
- ? (int) (positionOffset * selectedTitle.getWidth())
- : 0;
- scrollToTab(position, extraOffset);
-
- if (mViewPagerPageChangeListener != null) {
- mViewPagerPageChangeListener.onPageScrolled(position, positionOffset,
- positionOffsetPixels);
- }
- }
-
- @Override
- public void onPageScrollStateChanged(int state) {
- mScrollState = state;
-
- if (mViewPagerPageChangeListener != null) {
- mViewPagerPageChangeListener.onPageScrollStateChanged(state);
- }
- }
-
- @Override
- public void onPageSelected(int position) {
- if (mScrollState == ViewPager.SCROLL_STATE_IDLE) {
- mTabStrip.onViewPagerPageChanged(position, 0f);
- scrollToTab(position, 0);
- }
-
- if (mViewPagerPageChangeListener != null) {
- mViewPagerPageChangeListener.onPageSelected(position);
- }
- }
-
- }
-
- private class TabClickListener implements View.OnClickListener {
- @Override
- public void onClick(View v) {
- for (int i = 0; i < mTabStrip.getChildCount(); i++) {
- if (v == mTabStrip.getChildAt(i)) {
- mViewPager.setCurrentItem(i);
- return;
- }
- }
- }
- }
-
-}
diff --git a/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabStrip.java b/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabStrip.java
deleted file mode 100644
index 88bfb9a3..00000000
--- a/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabStrip.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package de.blinkt.openvpn.views;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.LinearLayout;
-
-class SlidingTabStrip extends LinearLayout {
-
- private static final int DEFAULT_BOTTOM_BORDER_THICKNESS_DIPS = 2;
- private static final byte DEFAULT_BOTTOM_BORDER_COLOR_ALPHA = 0x26;
- private static final int SELECTED_INDICATOR_THICKNESS_DIPS = 8;
- private static final int DEFAULT_SELECTED_INDICATOR_COLOR = 0xFF33B5E5;
-
- private static final int DEFAULT_DIVIDER_THICKNESS_DIPS = 1;
- private static final byte DEFAULT_DIVIDER_COLOR_ALPHA = 0x20;
- private static final float DEFAULT_DIVIDER_HEIGHT = 0.5f;
-
- private final int mBottomBorderThickness;
- private final Paint mBottomBorderPaint;
-
- private final int mSelectedIndicatorThickness;
- private final Paint mSelectedIndicatorPaint;
-
- private final int mDefaultBottomBorderColor;
-
- private final Paint mDividerPaint;
- private final float mDividerHeight;
-
- private int mSelectedPosition;
- private float mSelectionOffset;
-
- private SlidingTabLayout.TabColorizer mCustomTabColorizer;
- private final SimpleTabColorizer mDefaultTabColorizer;
-
- SlidingTabStrip(Context context) {
- this(context, null);
- }
-
- SlidingTabStrip(Context context, AttributeSet attrs) {
- super(context, attrs);
- setWillNotDraw(false);
-
- final float density = getResources().getDisplayMetrics().density;
-
- TypedValue outValue = new TypedValue();
- context.getTheme().resolveAttribute(android.R.attr.colorForeground, outValue, true);
- final int themeForegroundColor = outValue.data;
-
- mDefaultBottomBorderColor = setColorAlpha(themeForegroundColor,
- DEFAULT_BOTTOM_BORDER_COLOR_ALPHA);
-
- mDefaultTabColorizer = new SimpleTabColorizer();
- mDefaultTabColorizer.setIndicatorColors(DEFAULT_SELECTED_INDICATOR_COLOR);
- mDefaultTabColorizer.setDividerColors(setColorAlpha(themeForegroundColor,
- DEFAULT_DIVIDER_COLOR_ALPHA));
-
- mBottomBorderThickness = (int) (DEFAULT_BOTTOM_BORDER_THICKNESS_DIPS * density);
- mBottomBorderPaint = new Paint();
- mBottomBorderPaint.setColor(mDefaultBottomBorderColor);
-
- mSelectedIndicatorThickness = (int) (SELECTED_INDICATOR_THICKNESS_DIPS * density);
- mSelectedIndicatorPaint = new Paint();
-
- mDividerHeight = DEFAULT_DIVIDER_HEIGHT;
- mDividerPaint = new Paint();
- mDividerPaint.setStrokeWidth((int) (DEFAULT_DIVIDER_THICKNESS_DIPS * density));
- }
-
- void setCustomTabColorizer(SlidingTabLayout.TabColorizer customTabColorizer) {
- mCustomTabColorizer = customTabColorizer;
- invalidate();
- }
-
- void setSelectedIndicatorColors(int... colors) {
- // Make sure that the custom colorizer is removed
- mCustomTabColorizer = null;
- mDefaultTabColorizer.setIndicatorColors(colors);
- invalidate();
- }
-
- void setDividerColors(int... colors) {
- // Make sure that the custom colorizer is removed
- mCustomTabColorizer = null;
- mDefaultTabColorizer.setDividerColors(colors);
- invalidate();
- }
-
- void onViewPagerPageChanged(int position, float positionOffset) {
- mSelectedPosition = position;
- mSelectionOffset = positionOffset;
- invalidate();
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- final int height = getHeight();
- final int childCount = getChildCount();
- final int dividerHeightPx = (int) (Math.min(Math.max(0f, mDividerHeight), 1f) * height);
- final SlidingTabLayout.TabColorizer tabColorizer = mCustomTabColorizer != null
- ? mCustomTabColorizer
- : mDefaultTabColorizer;
-
- // Thick colored underline below the current selection
- if (childCount > 0) {
- View selectedTitle = getChildAt(mSelectedPosition);
- int left = selectedTitle.getLeft();
- int right = selectedTitle.getRight();
- int color = tabColorizer.getIndicatorColor(mSelectedPosition);
-
- if (mSelectionOffset > 0f && mSelectedPosition < (getChildCount() - 1)) {
- int nextColor = tabColorizer.getIndicatorColor(mSelectedPosition + 1);
- if (color != nextColor) {
- color = blendColors(nextColor, color, mSelectionOffset);
- }
-
- // Draw the selection partway between the tabs
- View nextTitle = getChildAt(mSelectedPosition + 1);
- left = (int) (mSelectionOffset * nextTitle.getLeft() +
- (1.0f - mSelectionOffset) * left);
- right = (int) (mSelectionOffset * nextTitle.getRight() +
- (1.0f - mSelectionOffset) * right);
- }
-
- mSelectedIndicatorPaint.setColor(color);
-
- canvas.drawRect(left, height - mSelectedIndicatorThickness, right,
- height, mSelectedIndicatorPaint);
- }
-
- // Thin underline along the entire bottom edge
- canvas.drawRect(0, height - mBottomBorderThickness, getWidth(), height, mBottomBorderPaint);
-
- // Vertical separators between the titles
- int separatorTop = (height - dividerHeightPx) / 2;
- for (int i = 0; i < childCount - 1; i++) {
- View child = getChildAt(i);
- mDividerPaint.setColor(tabColorizer.getDividerColor(i));
- canvas.drawLine(child.getRight(), separatorTop, child.getRight(),
- separatorTop + dividerHeightPx, mDividerPaint);
- }
- }
-
- /**
- * Set the alpha value of the {@code color} to be the given {@code alpha} value.
- */
- private static int setColorAlpha(int color, byte alpha) {
- return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color));
- }
-
- /**
- * Blend {@code color1} and {@code color2} using the given ratio.
- *
- * @param ratio of which to blend. 1.0 will return {@code color1}, 0.5 will give an even blend,
- * 0.0 will return {@code color2}.
- */
- private static int blendColors(int color1, int color2, float ratio) {
- final float inverseRation = 1f - ratio;
- float r = (Color.red(color1) * ratio) + (Color.red(color2) * inverseRation);
- float g = (Color.green(color1) * ratio) + (Color.green(color2) * inverseRation);
- float b = (Color.blue(color1) * ratio) + (Color.blue(color2) * inverseRation);
- return Color.rgb((int) r, (int) g, (int) b);
- }
-
- private static class SimpleTabColorizer implements SlidingTabLayout.TabColorizer {
- private int[] mIndicatorColors;
- private int[] mDividerColors;
-
- @Override
- public final int getIndicatorColor(int position) {
- return mIndicatorColors[position % mIndicatorColors.length];
- }
-
- @Override
- public final int getDividerColor(int position) {
- return mDividerColors[position % mDividerColors.length];
- }
-
- void setIndicatorColors(int... colors) {
- mIndicatorColors = colors;
- }
-
- void setDividerColors(int... colors) {
- mDividerColors = colors;
- }
- }
-} \ No newline at end of file
diff --git a/main/src/ui/java/de/blinkt/openvpn/views/TabBarView.java b/main/src/ui/java/de/blinkt/openvpn/views/TabBarView.java
deleted file mode 100644
index 71f03c03..00000000
--- a/main/src/ui/java/de/blinkt/openvpn/views/TabBarView.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2012-2016 Arne Schwabe
- * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
- */
-
-package de.blinkt.openvpn.views;
-
-import android.support.v4n.view.ViewPager;
-
-/**
- * Created by arne on 18.11.14.
- */
-public interface TabBarView {
-
- void setViewPager(ViewPager mPager);
-}