diff options
Diffstat (limited to 'app/src/main/java/de')
7 files changed, 36 insertions, 33 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java index 03e6b89db..f4d312a4f 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java @@ -57,6 +57,7 @@ public class OpmlImportActivity extends AppCompatActivity { */ @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); Log.d(TAG, "Received result"); if (resultCode == RESULT_CANCELED) { Log.d(TAG, "Activity was cancelled"); diff --git a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java index 8527949b0..d1cd50608 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java @@ -121,8 +121,9 @@ public class StorageErrorActivity extends AppCompatActivity { } public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (resultCode == Activity.RESULT_OK && - requestCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) { + super.onActivityResult(requestCode, resultCode, data); + if (resultCode == Activity.RESULT_OK + && requestCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) { String dir = data.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR); File path; @@ -131,19 +132,19 @@ public class StorageErrorActivity extends AppCompatActivity { } else { path = getExternalFilesDir(null); } - if(path == null) { + if (path == null) { return; } String message = null; - if(!path.exists()) { + if (!path.exists()) { message = String.format(getString(R.string.folder_does_not_exist_error), dir); - } else if(!path.canRead()) { + } else if (!path.canRead()) { message = String.format(getString(R.string.folder_not_readable_error), dir); - } else if(!path.canWrite()) { + } else if (!path.canWrite()) { message = String.format(getString(R.string.folder_not_writable_error), dir); } - if(message == null) { + if (message == null) { Log.d(TAG, "Setting data folder: " + dir); UserPreferences.setDataFolder(dir); leaveErrorState(); diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java index 11256f2de..0c25e3e9f 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java @@ -84,16 +84,16 @@ public class ProxyDialog { String host = etHost.getText().toString(); String port = etPort.getText().toString(); String username = etUsername.getText().toString(); - if(TextUtils.isEmpty(username)) { + if (TextUtils.isEmpty(username)) { username = null; } String password = etPassword.getText().toString(); - if(TextUtils.isEmpty(password)) { + if (TextUtils.isEmpty(password)) { password = null; } int portValue = 0; - if(!TextUtils.isEmpty(port)) { - portValue = Integer.valueOf(port); + if (!TextUtils.isEmpty(port)) { + portValue = Integer.parseInt(port); } if (Proxy.Type.valueOf(type) == Proxy.Type.SOCKS) { proxy = ProxyConfig.socks(host, portValue, username, password); @@ -257,8 +257,8 @@ public class ProxyDialog { String username = etUsername.getText().toString(); String password = etPassword.getText().toString(); int portValue = 8080; - if(!TextUtils.isEmpty(port)) { - portValue = Integer.valueOf(port); + if (!TextUtils.isEmpty(port)) { + portValue = Integer.parseInt(port); } SocketAddress address = InetSocketAddress.createUnresolved(host, portValue); Proxy.Type proxyType = Proxy.Type.valueOf(type.toUpperCase()); @@ -268,7 +268,7 @@ public class ProxyDialog { .proxy(proxy); builder.interceptors().clear(); OkHttpClient client = builder.build(); - if(!TextUtils.isEmpty(username)) { + if (!TextUtils.isEmpty(username)) { String credentials = Credentials.basic(username, password); client.interceptors().add(chain -> { Request request = chain.request().newBuilder() diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java index 1ca8f63aa..f9015c006 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java @@ -96,8 +96,7 @@ public class NetworkPreferencesFragment extends PreferenceFragmentCompat { private void setParallelDownloadsText(int downloads) { final Resources res = getActivity().getResources(); - String s = Integer.toString(downloads) - + res.getString(R.string.parallel_downloads_suffix); + String s = downloads + res.getString(R.string.parallel_downloads_suffix); findPreference(UserPreferences.PREF_PARALLEL_DOWNLOADS).setSummary(s); } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java index c3611d683..2e7c5c6af 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java @@ -59,26 +59,26 @@ public class UserInterfacePreferencesFragment extends PreferenceFragmentCompat { findPreference(UserPreferences.PREF_BACK_BUTTON_BEHAVIOR) .setOnPreferenceChangeListener((preference, newValue) -> { - if (newValue.equals("page")) { - final Context context = getActivity(); - final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages); - final String[] navTags = context.getResources().getStringArray(R.array.back_button_go_to_pages_tags); - final String[] choice = { UserPreferences.getBackButtonGoToPage() }; + if (!newValue.equals("page")) { + return true; + } + final Context context = getActivity(); + final String[] navTitles = context.getResources().getStringArray(R.array.back_button_go_to_pages); + final String[] navTags = context.getResources().getStringArray(R.array.back_button_go_to_pages_tags); + final String[] choice = { UserPreferences.getBackButtonGoToPage() }; - AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setTitle(R.string.back_button_go_to_page_title); - builder.setSingleChoiceItems(navTitles, ArrayUtils.indexOf(navTags, UserPreferences.getBackButtonGoToPage()), (dialogInterface, i) -> { + AlertDialog.Builder builder = new AlertDialog.Builder(context); + builder.setTitle(R.string.back_button_go_to_page_title); + builder.setSingleChoiceItems(navTitles, ArrayUtils.indexOf(navTags, + UserPreferences.getBackButtonGoToPage()), (dialogInterface, i) -> { if (i >= 0) { choice[0] = navTags[i]; } }); - builder.setPositiveButton(R.string.confirm_label, (dialogInterface, i) -> UserPreferences.setBackButtonGoToPage(choice[0])); - builder.setNegativeButton(R.string.cancel_label, null); - builder.create().show(); - return true; - } else { - return true; - } + builder.setPositiveButton(R.string.confirm_label, (dialogInterface, i) -> UserPreferences.setBackButtonGoToPage(choice[0])); + builder.setNegativeButton(R.string.cancel_label, null); + builder.create().show(); + return true; }); if (Build.VERSION.SDK_INT >= 26) { diff --git a/app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java b/app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java index f41b036b2..f755a4c84 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java +++ b/app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java @@ -18,6 +18,7 @@ public class CircularProgressBar extends View { private float percentage = 0; private float targetPercentage = 0; private Object tag = null; + private final RectF bounds = new RectF(); public CircularProgressBar(Context context) { super(context); @@ -70,7 +71,7 @@ public class CircularProgressBar extends View { float padding = getHeight() * 0.07f; paintBackground.setStrokeWidth(getHeight() * 0.02f); paintProgress.setStrokeWidth(padding); - RectF bounds = new RectF(padding, padding, getWidth() - padding, getHeight() - padding); + bounds.set(padding, padding, getWidth() - padding, getHeight() - padding); canvas.drawArc(bounds, 0, 360, false, paintBackground); if (percentage > EPSILON && 1 - percentage > EPSILON) { diff --git a/app/src/main/java/de/danoeh/antennapod/view/PlaybackSpeedIndicatorView.java b/app/src/main/java/de/danoeh/antennapod/view/PlaybackSpeedIndicatorView.java index 52c6e5375..d7f1eac1d 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/PlaybackSpeedIndicatorView.java +++ b/app/src/main/java/de/danoeh/antennapod/view/PlaybackSpeedIndicatorView.java @@ -24,6 +24,7 @@ public class PlaybackSpeedIndicatorView extends View { private float degreePerFrame = 2; private float paddingArc = 20; private float paddingIndicator = 10; + private RectF arcBounds = new RectF(); public PlaybackSpeedIndicatorView(Context context) { super(context); @@ -100,7 +101,7 @@ public class PlaybackSpeedIndicatorView extends View { canvas.drawPath(trianglePath, indicatorPaint); arcPaint.setStrokeWidth(getHeight() / 15f); - RectF arcBounds = new RectF(paddingArc, paddingArc, getWidth() - paddingArc, getHeight() - paddingArc); + arcBounds.set(paddingArc, paddingArc, getWidth() - paddingArc, getHeight() - paddingArc); canvas.drawArc(arcBounds, -180 - 45, 90 + 45 + angle - PADDING_ANGLE, false, arcPaint); canvas.drawArc(arcBounds, -90 + PADDING_ANGLE + angle, 90 + 45 - PADDING_ANGLE - angle, false, arcPaint); |