From a939b0fa37ed799bee8628d834271e37e10baf1f Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Fri, 10 Jul 2020 17:57:30 -0400 Subject: [PATCH] Automatic code cleanup by Android Studio --- app/src/full/res/values/bools.xml | 25 +++++++++---------- app/src/full/res/values/strings.xml | 12 ++++----- app/src/lite/res/values/bools.xml | 25 +++++++++---------- app/src/lite/res/values/strings.xml | 12 ++++----- .../core/gui/lists/SimpleListItem.java | 2 +- .../core/gui/navigation/NavigationHelper.java | 2 +- .../SelectionModificationSpinner.java | 6 ++--- .../core/gui/search/SearchSetting.java | 4 +-- .../core/gui/settings/ServerPreference.java | 2 +- .../core/seedbox/SeedboxSettings.java | 12 ++++----- .../core/seedbox/XirvikDediSettings.java | 4 +-- .../core/service/AppUpdateJobRunner.java | 6 ++--- .../java/org/transdroid/daemon/Daemon.java | 2 +- .../org/transdroid/daemon/DummyAdapter.java | 4 +-- .../org/transdroid/daemon/Finishable.java | 4 +-- .../org/transdroid/daemon/IDaemonAdapter.java | 6 ++--- .../daemon/adapters/aria2c/Aria2Adapter.java | 2 +- .../adapters/bitComet/BitCometAdapter.java | 2 +- .../qBittorrent/QBittorrentAdapter.java | 4 +-- .../adapters/tTorrent/TTorrentAdapter.java | 4 +-- .../daemon/util/FileSizeConverter.java | 2 +- .../daemon/util/SelfSignedTrustManager.java | 2 +- .../daemon/util/TimespanConverter.java | 2 +- 23 files changed, 72 insertions(+), 74 deletions(-) diff --git a/app/src/full/res/values/bools.xml b/app/src/full/res/values/bools.xml index 427a2c88..68b5601f 100644 --- a/app/src/full/res/values/bools.xml +++ b/app/src/full/res/values/bools.xml @@ -1,29 +1,28 @@ - - - - true - - true - - true - - true + + true + + true + + true + + true diff --git a/app/src/full/res/values/strings.xml b/app/src/full/res/values/strings.xml index d50334ce..9ac8c21e 100644 --- a/app/src/full/res/values/strings.xml +++ b/app/src/full/res/values/strings.xml @@ -1,24 +1,24 @@ - Transdroid + Transdroid - Donate with PayPal - https://paypal.me/erickoknl + Donate with PayPal + https://paypal.me/erickoknl diff --git a/app/src/lite/res/values/bools.xml b/app/src/lite/res/values/bools.xml index be7fce50..389bb1d6 100644 --- a/app/src/lite/res/values/bools.xml +++ b/app/src/lite/res/values/bools.xml @@ -1,29 +1,28 @@ - - - - false - - false - - false - - true + + false + + false + + false + + true diff --git a/app/src/lite/res/values/strings.xml b/app/src/lite/res/values/strings.xml index 36912a08..631a0965 100644 --- a/app/src/lite/res/values/strings.xml +++ b/app/src/lite/res/values/strings.xml @@ -1,24 +1,24 @@ - Transdrone + Transdrone - - + + diff --git a/app/src/main/java/org/transdroid/core/gui/lists/SimpleListItem.java b/app/src/main/java/org/transdroid/core/gui/lists/SimpleListItem.java index 37e52f0e..747824fc 100644 --- a/app/src/main/java/org/transdroid/core/gui/lists/SimpleListItem.java +++ b/app/src/main/java/org/transdroid/core/gui/lists/SimpleListItem.java @@ -24,6 +24,6 @@ package org.transdroid.core.gui.lists; */ public interface SimpleListItem { - public String getName(); + String getName(); } diff --git a/app/src/main/java/org/transdroid/core/gui/navigation/NavigationHelper.java b/app/src/main/java/org/transdroid/core/gui/navigation/NavigationHelper.java index 085447d2..0a0d6b2c 100644 --- a/app/src/main/java/org/transdroid/core/gui/navigation/NavigationHelper.java +++ b/app/src/main/java/org/transdroid/core/gui/navigation/NavigationHelper.java @@ -259,7 +259,7 @@ public class NavigationHelper { * @return The app name and version, such as 'Transdroid 1.5.0 (180)' */ public String getAppNameAndVersion() { - return context.getString(R.string.app_name) + " " + BuildConfig.VERSION_NAME + " (" + Integer.toString(BuildConfig.VERSION_CODE) + ")"; + return context.getString(R.string.app_name) + " " + BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ")"; } /** diff --git a/app/src/main/java/org/transdroid/core/gui/navigation/SelectionModificationSpinner.java b/app/src/main/java/org/transdroid/core/gui/navigation/SelectionModificationSpinner.java index 34782788..c14cf00f 100644 --- a/app/src/main/java/org/transdroid/core/gui/navigation/SelectionModificationSpinner.java +++ b/app/src/main/java/org/transdroid/core/gui/navigation/SelectionModificationSpinner.java @@ -84,11 +84,11 @@ public class SelectionModificationSpinner extends AppCompatSpinner { * Interface to implement if an interface want to respond to selection modification actions. */ public interface OnModificationActionSelectedListener { - public void selectAll(); + void selectAll(); - public void selectFinished(); + void selectFinished(); - public void invertSelection(); + void invertSelection(); } /** diff --git a/app/src/main/java/org/transdroid/core/gui/search/SearchSetting.java b/app/src/main/java/org/transdroid/core/gui/search/SearchSetting.java index 8cf21507..5a8e4cea 100644 --- a/app/src/main/java/org/transdroid/core/gui/search/SearchSetting.java +++ b/app/src/main/java/org/transdroid/core/gui/search/SearchSetting.java @@ -25,13 +25,13 @@ public interface SearchSetting extends SimpleListItem { * * @return A unique string identifying this search setting */ - public String getKey(); + String getKey(); /** * Should return an URL (which may still be abstract and not the actual search URL) specific to the search site * * @return A clean URL directing to the search site, to, for example, get the favicon of the site */ - public String getBaseUrl(); + String getBaseUrl(); } diff --git a/app/src/main/java/org/transdroid/core/gui/settings/ServerPreference.java b/app/src/main/java/org/transdroid/core/gui/settings/ServerPreference.java index 688ed9df..17054034 100644 --- a/app/src/main/java/org/transdroid/core/gui/settings/ServerPreference.java +++ b/app/src/main/java/org/transdroid/core/gui/settings/ServerPreference.java @@ -74,7 +74,7 @@ public class ServerPreference extends Preference { } public interface OnServerClickedListener { - public void onServerClicked(ServerSetting serverSetting); + void onServerClicked(ServerSetting serverSetting); } } diff --git a/app/src/main/java/org/transdroid/core/seedbox/SeedboxSettings.java b/app/src/main/java/org/transdroid/core/seedbox/SeedboxSettings.java index 17edb93b..15b0ee8c 100644 --- a/app/src/main/java/org/transdroid/core/seedbox/SeedboxSettings.java +++ b/app/src/main/java/org/transdroid/core/seedbox/SeedboxSettings.java @@ -37,7 +37,7 @@ public interface SeedboxSettings { * * @return A human-readable name of this seedbox provider */ - public String getName(); + String getName(); /** * Should return the order number of the last specified seedbox of this type (regardless of other seedbox types). @@ -45,7 +45,7 @@ public interface SeedboxSettings { * @param prefs The shared preferences to load the settings from * @return The order number (id) of the last configured seedbox, or -1 if none are configured. */ - public int getMaxSeedboxOrder(SharedPreferences prefs); + int getMaxSeedboxOrder(SharedPreferences prefs); /** * Should return a {@link ServerSetting} object that can connect to the seedbox as identified by the given seedbox @@ -57,7 +57,7 @@ public interface SeedboxSettings { * @param order The seedbox provider-specific order id referring to the specific seedbox to load settings for * @return A server settings object corresponding to the user's seedbox settings for the specified order id */ - public ServerSetting getServerSetting(SharedPreferences prefs, int orderOffset, int order); + ServerSetting getServerSetting(SharedPreferences prefs, int orderOffset, int order); /** * Should return a list of all the {@link ServerSetting}s available for this seedbox type. @@ -67,7 +67,7 @@ public interface SeedboxSettings { * seedbox * @return A list of all server settings objects that are stored for this seedbox type */ - public List getAllServerSettings(SharedPreferences prefs, int orderOffset); + List getAllServerSettings(SharedPreferences prefs, int orderOffset); /** * Should remove the settings of a specific seedbox specification as identified by its seedbox provider-unique order @@ -76,7 +76,7 @@ public interface SeedboxSettings { * @param prefs The shared preferences to remove the settings from * @param order The id referring to a specific seedbox order number within this type of seedbox */ - public void removeServerSetting(SharedPreferences prefs, int order); + void removeServerSetting(SharedPreferences prefs, int order); /** * The settings activity in which the user can supply and edit its settings for this specific seedbox type. @@ -84,6 +84,6 @@ public interface SeedboxSettings { * @param context The activity context from where the settings activity will be started * @return An already prepared intent that points to the settings activity for this specific type of seedbox */ - public Intent getSettingsActivityIntent(Context context); + Intent getSettingsActivityIntent(Context context); } diff --git a/app/src/main/java/org/transdroid/core/seedbox/XirvikDediSettings.java b/app/src/main/java/org/transdroid/core/seedbox/XirvikDediSettings.java index a6da7cc6..8d8467d5 100644 --- a/app/src/main/java/org/transdroid/core/seedbox/XirvikDediSettings.java +++ b/app/src/main/java/org/transdroid/core/seedbox/XirvikDediSettings.java @@ -55,8 +55,8 @@ public class XirvikDediSettings extends SeedboxSettingsImpl implements SeedboxSe 0, null, type == Daemon.uTorrent ? 5010 : 443, - type == Daemon.uTorrent ? false : true, - type == Daemon.uTorrent ? false : true, + type != Daemon.uTorrent, + type != Daemon.uTorrent, false, null, type == Daemon.Deluge ? "/deluge" : null, diff --git a/app/src/main/java/org/transdroid/core/service/AppUpdateJobRunner.java b/app/src/main/java/org/transdroid/core/service/AppUpdateJobRunner.java index b7662f54..c525eb6d 100644 --- a/app/src/main/java/org/transdroid/core/service/AppUpdateJobRunner.java +++ b/app/src/main/java/org/transdroid/core/service/AppUpdateJobRunner.java @@ -115,7 +115,7 @@ public class AppUpdateJobRunner { newNotification(context.getString(R.string.update_app_newversion), context.getString(R.string.update_app_newversion), context.getString(R.string.update_updateto, app[1].trim()), - DOWNLOAD_URL_APP + "?" + Integer.toString(random.nextInt()), 90000); + DOWNLOAD_URL_APP + "?" + random.nextInt(), 90000); } } catch (PackageManager.NameNotFoundException e) { // Not installed... this can never happen since this Service is part of the app itself @@ -131,7 +131,7 @@ public class AppUpdateJobRunner { newNotification(context.getString(R.string.update_search_newversion), context.getString(R.string.update_search_newversion), context.getString(R.string.update_updateto, search[1].trim()), - DOWNLOAD_URL_SEARCH + "?" + Integer.toString(random.nextInt()), 90001); + DOWNLOAD_URL_SEARCH + "?" + random.nextInt(), 90001); } } catch (PackageManager.NameNotFoundException e) { // The search module isn't installed yet at all; ignore and wait for the user to manually @@ -164,7 +164,7 @@ public class AppUpdateJobRunner { private String[] retrieveLatestVersion(AbstractHttpClient httpclient, String url) throws IOException { HttpResponse request = httpclient.execute(new HttpGet(url)); InputStream stream = request.getEntity().getContent(); - String appVersion[] = HttpHelper.convertStreamToString(stream).split("\\|"); + String[] appVersion = HttpHelper.convertStreamToString(stream).split("\\|"); stream.close(); return appVersion; } diff --git a/app/src/main/java/org/transdroid/daemon/Daemon.java b/app/src/main/java/org/transdroid/daemon/Daemon.java index 92f8b854..4b2ffef1 100644 --- a/app/src/main/java/org/transdroid/daemon/Daemon.java +++ b/app/src/main/java/org/transdroid/daemon/Daemon.java @@ -28,9 +28,9 @@ import org.transdroid.daemon.adapters.kTorrent.KTorrentAdapter; import org.transdroid.daemon.adapters.qBittorrent.QBittorrentAdapter; import org.transdroid.daemon.adapters.rTorrent.RTorrentAdapter; import org.transdroid.daemon.adapters.synology.SynologyAdapter; +import org.transdroid.daemon.adapters.tTorrent.TTorrentAdapter; import org.transdroid.daemon.adapters.tfb4rt.Tfb4rtAdapter; import org.transdroid.daemon.adapters.transmission.TransmissionAdapter; -import org.transdroid.daemon.adapters.tTorrent.TTorrentAdapter; import org.transdroid.daemon.adapters.uTorrent.UTorrentAdapter; import org.transdroid.daemon.adapters.vuze.VuzeAdapter; diff --git a/app/src/main/java/org/transdroid/daemon/DummyAdapter.java b/app/src/main/java/org/transdroid/daemon/DummyAdapter.java index cb7f53de..aa5354d7 100644 --- a/app/src/main/java/org/transdroid/daemon/DummyAdapter.java +++ b/app/src/main/java/org/transdroid/daemon/DummyAdapter.java @@ -82,7 +82,7 @@ public class DummyAdapter implements IDaemonAdapter { TorrentStatus.Error}; Random random = new Random(); for (int i = 1; i < 2026; i++) { - String name = names[i % names.length] + Integer.toString(i); + String name = names[i % names.length] + i; TorrentStatus status = statuses[i % statuses.length]; int peersGetting = status == TorrentStatus.Downloading ? i * random.nextInt(16) : 0; int peersSending = status == TorrentStatus.Downloading ? i * random.nextInt(16) : 0; @@ -144,7 +144,7 @@ public class DummyAdapter implements IDaemonAdapter { Torrent t = task.getTargetTorrent(); List dummyFiles = new ArrayList(); - Priority priorities[] = new Priority[]{Priority.Normal, Priority.Normal, Priority.High, Priority.Low, + Priority[] priorities = new Priority[]{Priority.Normal, Priority.Normal, Priority.High, Priority.Low, Priority.Normal}; for (int i = 1; i < 16; i++) { String fileName = "file_" + i + ".ext"; diff --git a/app/src/main/java/org/transdroid/daemon/Finishable.java b/app/src/main/java/org/transdroid/daemon/Finishable.java index 9ea1e037..30acf978 100644 --- a/app/src/main/java/org/transdroid/daemon/Finishable.java +++ b/app/src/main/java/org/transdroid/daemon/Finishable.java @@ -13,7 +13,7 @@ public interface Finishable { * * @return True iif the object (like the data transfer) was started and is in progress, but was not finished yet. */ - public boolean isStarted(); + boolean isStarted(); /** * Whether the represented object has been finished. @@ -21,6 +21,6 @@ public interface Finishable { * @return True iif the object (like the data transfer) was finished, which means it is no longer started or in * progress. */ - public boolean isFinished(); + boolean isFinished(); } diff --git a/app/src/main/java/org/transdroid/daemon/IDaemonAdapter.java b/app/src/main/java/org/transdroid/daemon/IDaemonAdapter.java index 64db32d2..5f43724a 100644 --- a/app/src/main/java/org/transdroid/daemon/IDaemonAdapter.java +++ b/app/src/main/java/org/transdroid/daemon/IDaemonAdapter.java @@ -29,10 +29,10 @@ import org.transdroid.daemon.task.DaemonTaskResult; */ public interface IDaemonAdapter { - public DaemonTaskResult executeTask(Log log, DaemonTask task); + DaemonTaskResult executeTask(Log log, DaemonTask task); - public Daemon getType(); + Daemon getType(); - public DaemonSettings getSettings(); + DaemonSettings getSettings(); } diff --git a/app/src/main/java/org/transdroid/daemon/adapters/aria2c/Aria2Adapter.java b/app/src/main/java/org/transdroid/daemon/adapters/aria2c/Aria2Adapter.java index c45e274f..6539082c 100644 --- a/app/src/main/java/org/transdroid/daemon/adapters/aria2c/Aria2Adapter.java +++ b/app/src/main/java/org/transdroid/daemon/adapters/aria2c/Aria2Adapter.java @@ -464,7 +464,7 @@ public class Aria2Adapter implements IDaemonAdapter { private String convertAriaError(int errorCode) { // Aria2 sends an exit code as error (http://aria2.sourceforge.net/manual/en/html/aria2c.html#id1) - String error = "Aria error #" + Integer.toString(errorCode); + String error = "Aria error #" + errorCode; switch (errorCode) { case 3: case 4: diff --git a/app/src/main/java/org/transdroid/daemon/adapters/bitComet/BitCometAdapter.java b/app/src/main/java/org/transdroid/daemon/adapters/bitComet/BitCometAdapter.java index 29d9cdb6..08f8267d 100644 --- a/app/src/main/java/org/transdroid/daemon/adapters/bitComet/BitCometAdapter.java +++ b/app/src/main/java/org/transdroid/daemon/adapters/bitComet/BitCometAdapter.java @@ -133,7 +133,7 @@ public class BitCometAdapter implements IDaemonAdapter { // first, check client for the new AJAX interface (BitComet v.1.34 and up) try { String xmlResult = makeRequest(log, "/panel/task_list_xml"); - if (xmlResult.startsWith("