diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2873ea14..bf8e4aee 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -225,9 +225,6 @@
-
diff --git a/app/src/main/java/org/transdroid/core/seedbox/SeedboxProvider.java b/app/src/main/java/org/transdroid/core/seedbox/SeedboxProvider.java
index 20115e33..8043eb30 100644
--- a/app/src/main/java/org/transdroid/core/seedbox/SeedboxProvider.java
+++ b/app/src/main/java/org/transdroid/core/seedbox/SeedboxProvider.java
@@ -32,12 +32,6 @@ public enum SeedboxProvider {
return new DediseedboxSettings();
}
},
- Seedstuff {
- @Override
- public SeedboxSettings getSettings() {
- return new SeedstuffSettings();
- }
- },
XirvikShared {
@Override
public SeedboxSettings getSettings() {
diff --git a/app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettings.java b/app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettings.java
deleted file mode 100644
index 00bb90b5..00000000
--- a/app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettings.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2010-2018 Eric Kok et al.
- *
- * Transdroid is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Transdroid is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Transdroid. If not, see .
- */
-package org.transdroid.core.seedbox;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-
-import org.transdroid.core.app.settings.ServerSetting;
-import org.transdroid.daemon.Daemon;
-import org.transdroid.daemon.OS;
-
-/**
- * Implementation of {@link SeedboxSettings} for Seedstuff seedboxes.
- *
- * @author Eric Kok
- */
-public class SeedstuffSettings extends SeedboxSettingsImpl implements SeedboxSettings {
-
- @Override
- public String getName() {
- return "Seedstuff";
- }
-
- @Override
- public ServerSetting getServerSetting(SharedPreferences prefs, int orderOffset, int order) {
- // @formatter:off
- String server = prefs.getString("seedbox_seedstuff_server_" + order, null);
- if (server == null) {
- return null;
- }
- String user = prefs.getString("seedbox_seedstuff_user_" + order, null);
- String pass = prefs.getString("seedbox_seedstuff_pass_" + order, null);
- return new ServerSetting(
- orderOffset + order,
- prefs.getString("seedbox_seedstuff_name_" + order, null),
- Daemon.rTorrent,
- server,
- null,
- 443,
- null,
- 443,
- true,
- true,
- false,
- null,
- "/user/" + user,
- true,
- user,
- pass,
- null,
- OS.Linux,
- "/rtorrent/downloads",
- "ftp://" + user + "@" + server + ":32001/rtorrent/downloads",
- pass,
- 6,
- prefs.getBoolean("seedbox_seedstuff_alarmfinished_" + order, true),
- prefs.getBoolean("seedbox_seedstuff_alarmnew_" + order, false),
- prefs.getString("seedbox_seedstuff_alarmexclude_" + order, null),
- prefs.getString("seedbox_seedstuff_alarminclude_" + order, null),
- true);
- // @formatter:on
- }
-
- @Override
- public Intent getSettingsActivityIntent(Context context) {
- return SeedstuffSettingsActivity_.intent(context).get();
- }
-
- @Override
- public int getMaxSeedboxOrder(SharedPreferences prefs) {
- return getMaxSeedboxOrder(prefs, "seedbox_seedstuff_server_");
- }
-
- @Override
- public void removeServerSetting(SharedPreferences prefs, int order) {
- removeServerSetting(prefs, "seedbox_seedstuff_server_", new String[]{"seedbox_seedstuff_name_",
- "seedbox_seedstuff_server_", "seedbox_seedstuff_user_", "seedbox_seedstuff_pass_"}, order);
- }
-
-}
diff --git a/app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettingsActivity.java b/app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettingsActivity.java
deleted file mode 100644
index 80d8f4db..00000000
--- a/app/src/main/java/org/transdroid/core/seedbox/SeedstuffSettingsActivity.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2010-2018 Eric Kok et al.
- *
- * Transdroid is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Transdroid is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Transdroid. If not, see .
- */
-package org.transdroid.core.seedbox;
-
-import android.annotation.TargetApi;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Bundle;
-
-import androidx.preference.EditTextPreference;
-import androidx.preference.PreferenceManager;
-
-import org.androidannotations.annotations.EActivity;
-import org.androidannotations.annotations.OptionsItem;
-import org.androidannotations.annotations.OptionsMenu;
-import org.transdroid.R;
-import org.transdroid.core.gui.settings.KeyBoundPreferencesActivity;
-import org.transdroid.core.gui.settings.MainSettingsActivity_;
-
-/**
- * Activity that allows for the configuration of a Seedstuff seedbox. The key can be supplied to update an
- * existing server setting instead of creating a new one.
- *
- * @author Eric Kok
- */
-@EActivity
-@OptionsMenu(resName = "activity_deleteableprefs")
-public class SeedstuffSettingsActivity extends KeyBoundPreferencesActivity {
-
- private EditTextPreference excludeFilter, includeFilter;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
- // Load the raw preferences to show in this screen
- init(R.xml.pref_seedbox_seedstuff,
- SeedboxProvider.Seedstuff.getSettings().getMaxSeedboxOrder(
- PreferenceManager.getDefaultSharedPreferences(this)));
- initTextPreference("seedbox_seedstuff_name");
- initTextPreference("seedbox_seedstuff_server");
- initTextPreference("seedbox_seedstuff_user");
- initTextPreference("seedbox_seedstuff_pass");
- initBooleanPreference("seedbox_seedstuff_alarmfinished", true);
- initBooleanPreference("seedbox_seedstuff_alarmnew", true);
- excludeFilter = initTextPreference("seedbox_seedstuff_alarmexclude");
- includeFilter = initTextPreference("seedbox_seedstuff_alarminclude");
-
- }
-
- @TargetApi(Build.VERSION_CODES.HONEYCOMB)
- @OptionsItem(android.R.id.home)
- protected void navigateUp() {
- MainSettingsActivity_.intent(this).flags(Intent.FLAG_ACTIVITY_CLEAR_TOP).start();
- }
-
- @OptionsItem(resName = "action_removesettings")
- protected void removeSettings() {
- SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
- SeedboxProvider.Seedstuff.getSettings().removeServerSetting(prefs, key);
- finish();
- }
-
- @Override
- protected void onPreferencesChanged() {
-
- // Show the exclude and the include filters if notifying
- SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
- boolean alarmFinished = prefs.getBoolean("seedbox_seedstuff_alarmfinished_" + key, true);
- boolean alarmNew = prefs.getBoolean("seedbox_seedstuff_alarmnew_" + key, true);
- excludeFilter.setEnabled(alarmNew || alarmFinished);
- includeFilter.setEnabled(alarmNew || alarmFinished);
-
- }
-
-}
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index dd61f110..74bfb796 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -220,7 +220,6 @@
Като eplus001.xirvik.com
Като semixl001a.xirvik.com
Като desharedgbit001.xirvik.com
- Като 001.seedstuff.ca
- 15 минути
- 30 минути
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 2a5cbb0e..2f6b615a 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -284,7 +284,6 @@
Např.: semixl001a.xirvik.com
Např.: desharedgbit001.xirvik.com
Nelze načíst nastavení složky Xirvik SCGI; opakujte akci později nebo zkontrolujte nastavení adresy vašeho serveru
- Např.: Like 001.seedstuff.ca
- 15 minut
- 30 minut
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 39ec7fcc..a678b02b 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -300,7 +300,6 @@
Eks. semixl001a.xirvik.com
Eks. desharedgbit001.xirvik.com
Kan ikke hente indstillingen for Xirvik SCGI; Prøv igen senere, eller ret din server adresseindstilling
- Eks. 001.seedstuff.ca
- 15 minutter
- 30 minutter
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index afba0267..edc17a2f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -316,7 +316,6 @@
Like semixl001a.xirvik.com
Like desharedgbit001.xirvik.com
Die Xirvik SCGI-Ordner-Einstellung kann nicht abgerufen werden; Bitte versuchen Sie es später erneut, oder korrigieren Sie ihre Serveradresse
- Like 001.seedstuff.ca
- 15 Minuten
- 30 Minuten
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 0c7185cb..8bbf6761 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -183,7 +183,6 @@
Nagu eplus001.xirvik.com
Nagu semixl001a.xirvik.com
Nagu desharedgbit001.xirvik.com
- Nagu 001.seedstuff.ca
- 15 minutit
- 30 minutit
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 734f5b5f..69e7dd19 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -305,7 +305,6 @@
مانند semixl001a.xirvik.com
مانند desharedgbit001.xirvik.com
نمیتوان تنظیمات پوشهی SCGIی Xirvik را دریافت کرد؛ لطفا ً بعدا ً دوباره امتحان کنید یا تنظیمات نشانی کارگزار را درست کنید
- مانند 001.seedstuff.ca
- 15 دقیقه
- 30 دقیقه
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b878e27c..e9b5e1da 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -141,7 +141,6 @@
Kuten eplus001.xirvik.com
Kuten semixl001a.xirvik.com
Kuten desharedgbit001.xirvik.com
- Kuten 001.seedstuff.ca
- 15 minuuttia
- 30 minuuttia
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 48b5b3a5..5b95a410 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -300,7 +300,6 @@
Comme semixl001a.xirvik.com
Comme desharedgbit001.xirvik.com
Impossible de récupérer le paramètre dossier de Xirvik SCGI ; Veuillez réessayer ultérieurement ou corriger le réglage d\'adresse de votre serveur
- Comme 001.seedstuff.ca
- 15 minutes
- 30 minutes
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d69039c7..781de658 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -316,7 +316,6 @@
Például semixl001a.xirvik.com
Például desharedgbit001.xirvik.com
Nem lehet letölteni a Xirvik SCGI mappa beállításait; próbálja meg újra később, vagy javítsa ki a szerver címének beállításait
- Például 001.seedstuff.ca
- 15 perc
- 30 perc
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index cf174e19..de22968d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -316,7 +316,6 @@
Esempio: semixl001a.xirvik.com
Esempio: desharedgbit001.xirvik.com
Impossibile recuperare la cartella Xirvik SCGI; riprovare più tardi o correggere l\'indirizzo del server
- Esempio: 001.seedstuff.ca
- 15 minuto
- 30 minuto
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 6e260dd5..35b9fadb 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -254,7 +254,6 @@
לדוגמא: eplus001.xirvik.com
לדוגמא: semixl001a.xirvik.com
לדוגמא: desharedgbit001.xirvik.com
- לדוגמא: 001.seedstuff.ca
- 15 דקות
- חצי שעה
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 32074ab1..92c75d57 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -308,7 +308,6 @@
semixl001a.xirvik.com のように
desharedgbit001.xirvik.com のように
Xirvik SCGI フォルダー設定を読み取りできません。後で再度実行するか、サーバー・アドレス設定を確認してください
- 001.seedstuff.ca のように
- 15 分
- 30 分
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 118345dd..5380a154 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -308,7 +308,6 @@
예) semixl001a.xirvik.com
예) desharedgbit001.xirvik.com
Xirvik SCGI 폴더 설정을 받아오지 못했습니다; 다음에 다시 시도해 보시거나 서버 주소 설정을 고쳐보세요
- 예) 001.seedstuff.ca
- 15분
- 30분
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2ce09942..1219b12f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -203,7 +203,7 @@
Servers
Nieuwe server toevoegen
Seedbox toevoegen
- Standaardserver
+ Standaardserver kiezen
Laatstgebruikte
Vraag bij toevoegen van torrent
Zoeksites
@@ -312,7 +312,6 @@
Zoals semixl001a.xirvik.com
Zoals desharedgbit001.xirvik.com
Kan de Xirvik SCGI mount instelling niet laden; probeer later nog eens en controleer je serveradres
- Zoals 001.seedstuff.ca
- 15 minuten
- 30 minuten
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index a6c45484..ae4ff4c5 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -281,7 +281,6 @@
Jak eplus001.xirvik.com
Jak semixl001a.xirvik.com
Jak desharedgbit001.xirvik.com
- Jak 001.seedstuff.ca
- 15 minut
- 30 minut
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index add3b6ce..8138c0ac 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -316,7 +316,6 @@
Como semixl001a.xirvik.com
Como desharedgbit001.xirvik.com
Não foi possível recuperar a pasta de configuração do Xirvik SCGI; por favor, tente novamente mais tarde ou corrija a configuração de endereço do servidor
- Como 001.seedstuff.ca
- 15 minutos
- 30 minutos
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 847eef3d..53300286 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -316,7 +316,6 @@
Como semixl001a.xirvik.com
Como desharedgbit001.xirvik.com
Não é possível obter a configuração de pasta Xirvik SCGI; por favor, tente novamente mais tarde ou corrija a sua configuração de endereço do servidor
- Por ex. 001.seedstuff.ca
- 15 minutos
- 30 minutos
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9522bdb1..21305233 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -333,7 +333,6 @@
Как semixl001a.xirvik.com
Как desharedgbit001.xirvik.com
Не удается получить настройки папок Xirvik SCGI. Пожалуйста, повторите попытку позже или измените адрес сервера.
- Как 001.seedstuff.ca
- 15 минут
- 30 минут
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index e03bd8cb..1759f76b 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -332,7 +332,6 @@
Npr. semixl001a.xirvik.com
Npr. desharedgbit001.xirvik.com
Ne morem pridobiti Xirvik SCGI nastavitev map; poskusite pozneje ali popravite naslov strežnika
- Npr. 001.seedstuff.ca
- 15 minut
- 30 minut
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index c0544b30..746166c5 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -316,7 +316,6 @@
Som semixl001a.xirvik.com
Som desharedgbit001.xirvik.com
Går inte att hämta Xirvik SCGI mappinställningen. Försök igen senare eller korrigera din serveradress
- Som 001.seedstuff.ca
- 15 minuter
- 30 minuter
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 80c5b4d5..6a01e592 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -315,7 +315,6 @@
semixl001a.xirvik.com gibi
desharedgbit001.xirvik.com gibi
Xirvik SCGI klasör ayarı alınamıyor; Lütfen daha sonra yeniden deneyin veya sunucu adresi ayarını doğrulayın
- 001.seedstuff.CA gibi
- 15 dakika
- 30 dakika
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c20a1c81..78de8e06 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -292,7 +292,6 @@
例如:semixl001a.xirvik.com
例如:desharedgbit001.xirvik.com
无法检索Xirvik SCGI的文件夹设置,请稍后再试或更正您的服务器地址
- 例如:001.seedstuff.ca
- 每15分钟
- 每30分钟
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b2323ad..e43f4875 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -241,7 +241,7 @@
Add new server
Add normal, custom server
Add seedbox
- Default server
+ Set the default server
Last used
Ask when adding torrent
Search sites
@@ -383,7 +383,6 @@
Like semixl001a.xirvik.com
Like desharedgbit001.xirvik.com
Cannot retrieve the Xirvik SCGI folder setting; please try again later or correct your server address setting
- Like 001.seedstuff.ca
Like abcd123.dediseedbox.com
- rTorrent
diff --git a/app/src/main/res/xml/pref_seedbox_seedstuff.xml b/app/src/main/res/xml/pref_seedbox_seedstuff.xml
deleted file mode 100644
index 221a494a..00000000
--- a/app/src/main/res/xml/pref_seedbox_seedstuff.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-