diff --git a/app/build.gradle b/app/build.gradle
index 371a92a..ae2a4fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -116,7 +116,7 @@ dependencies {
implementation "net.gotev:uploadservice-okhttp:3.5.2"
implementation "com.google.code.gson:gson:2.8.6"
implementation 'androidx.media:media:1.2.0'
-
+ implementation 'com.github.ybq:Android-SpinKit:1.4.0'
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
diff --git a/app/src/acad/res/values/strings.xml b/app/src/acad/res/values/strings.xml
index 0a7efae..e477011 100644
--- a/app/src/acad/res/values/strings.xml
+++ b/app/src/acad/res/values/strings.xml
@@ -199,7 +199,7 @@
Cache
- Set the cache for videos (default 100Mb)
+ Définir le cache pour les vidéos (défaut 100Mo)
Cache pour les vidéos: %d Mo
set_video_mode_choice
set_video_minimize_choice
diff --git a/app/src/acad/res/values/styles.xml b/app/src/acad/res/values/styles.xml
index aceb64c..7e44535 100644
--- a/app/src/acad/res/values/styles.xml
+++ b/app/src/acad/res/values/styles.xml
@@ -15,4 +15,7 @@
- @color/colorPrimaryDark
- @color/colorAccent
+
+
+
\ No newline at end of file
diff --git a/app/src/fdroid_acad/play/release-notes/en-US/default.txt b/app/src/fdroid_acad/play/release-notes/en-US/default.txt
index 029184f..753aa65 100644
--- a/app/src/fdroid_acad/play/release-notes/en-US/default.txt
+++ b/app/src/fdroid_acad/play/release-notes/en-US/default.txt
@@ -1,4 +1,4 @@
- Force le mode paysage lors du passage en mode plein écran
- Modifier la valeur du cache pour les vidéos
-- Définir la résolution pour les vidéos
+- Définir la résolution par défaut pour les vidéos
- Correction de bugs
\ No newline at end of file
diff --git a/app/src/full/res/values-ar/strings.xml b/app/src/full/res/values-ar/strings.xml
index cdea048..48b7fb0 100644
--- a/app/src/full/res/values-ar/strings.xml
+++ b/app/src/full/res/values-ar/strings.xml
@@ -1,6 +1,7 @@
Home
+ Local
Discover
Notifications
Recently added
@@ -103,8 +104,13 @@
Pick another instance
History
Edit
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Captions
Pick captions
None
diff --git a/app/src/full/res/values-de/strings.xml b/app/src/full/res/values-de/strings.xml
index 72e9c9b..b192f03 100644
--- a/app/src/full/res/values-de/strings.xml
+++ b/app/src/full/res/values-de/strings.xml
@@ -1,6 +1,7 @@
Startseite
+ Local
Mehr erfahren
Benachrichtigungen
Zuletzt hinzugefügt
@@ -103,8 +104,13 @@
Wähle eine andere Instanz
Verlauf
Bearbeiten
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Untertitel
Untertitel abholen
Keine
diff --git a/app/src/full/res/values-el/strings.xml b/app/src/full/res/values-el/strings.xml
index 7487cb1..1234bf2 100644
--- a/app/src/full/res/values-el/strings.xml
+++ b/app/src/full/res/values-el/strings.xml
@@ -1,6 +1,7 @@
Αρχική
+ Local
Ανακαλύψτε
Ειδοποιήσεις
Προστέθηκαν πρόσφατα
@@ -103,8 +104,13 @@
Επιλογή άλλης υπόστασης
Ιστορικό
Επεξεργασία
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Υπότιτλοι
Επιλογή υποτίτλων
Κανένας
diff --git a/app/src/full/res/values-es/strings.xml b/app/src/full/res/values-es/strings.xml
index 366a85d..8356432 100644
--- a/app/src/full/res/values-es/strings.xml
+++ b/app/src/full/res/values-es/strings.xml
@@ -1,6 +1,7 @@
Inicio
+ Local
Descubre
Notificaciones
Añadido recientemente
@@ -103,8 +104,13 @@
Selecciona otra instancia
Historia
Editar
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Subtítulos
Pies de foto de la camioneta
Ninguno
diff --git a/app/src/full/res/values-fr/strings.xml b/app/src/full/res/values-fr/strings.xml
index b3cf631..5aebe4d 100644
--- a/app/src/full/res/values-fr/strings.xml
+++ b/app/src/full/res/values-fr/strings.xml
@@ -1,6 +1,7 @@
Locale
+ Local
Découvrir
Notifications
Nouveautés
@@ -16,7 +17,7 @@
Choisissez une instance
Cette instance ne semble pas être valide !
Aucune vidéo !
- No notifications!
+ Aucune notification !
Favicon
Ouvrir avec
Modifier une liste de lecture
@@ -103,8 +104,13 @@
Changer d\'instance
Historique
Modifier
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Légendes
Options d\'envoi
Aucune
diff --git a/app/src/full/res/values-it/strings.xml b/app/src/full/res/values-it/strings.xml
index 8a97b0d..a466916 100644
--- a/app/src/full/res/values-it/strings.xml
+++ b/app/src/full/res/values-it/strings.xml
@@ -1,6 +1,7 @@
Inizio
+ Local
Esplora
Notifiche
Aggiunti di recente
@@ -103,8 +104,13 @@
Prendi un\'altra istanza
Cronologia
Modifica
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Didascalie
Scegliere le didascalie
Nessuno
diff --git a/app/src/full/res/values-ja/strings.xml b/app/src/full/res/values-ja/strings.xml
index b2efa75..5cd0ef5 100644
--- a/app/src/full/res/values-ja/strings.xml
+++ b/app/src/full/res/values-ja/strings.xml
@@ -1,6 +1,7 @@
ホーム
+ Local
発見
通知
最近追加された項目
@@ -103,8 +104,13 @@
Pick another instance
履歴
編集
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
字幕
字幕を選択
なし
diff --git a/app/src/full/res/values-ko/strings.xml b/app/src/full/res/values-ko/strings.xml
index cdea048..48b7fb0 100644
--- a/app/src/full/res/values-ko/strings.xml
+++ b/app/src/full/res/values-ko/strings.xml
@@ -1,6 +1,7 @@
Home
+ Local
Discover
Notifications
Recently added
@@ -103,8 +104,13 @@
Pick another instance
History
Edit
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Captions
Pick captions
None
diff --git a/app/src/full/res/values-nl/strings.xml b/app/src/full/res/values-nl/strings.xml
index 6ef562f..c61c874 100644
--- a/app/src/full/res/values-nl/strings.xml
+++ b/app/src/full/res/values-nl/strings.xml
@@ -1,6 +1,7 @@
Home
+ Local
Ontdek
Meldingen
Onlangs toegevoegd
@@ -103,8 +104,13 @@
Kies een andere instantie
Geschiedenis
Bewerk
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Bijschriften
Pick captions
Geen
diff --git a/app/src/full/res/values-pl/strings.xml b/app/src/full/res/values-pl/strings.xml
index a7568f2..85667af 100644
--- a/app/src/full/res/values-pl/strings.xml
+++ b/app/src/full/res/values-pl/strings.xml
@@ -1,6 +1,7 @@
Strona główna
+ Local
Odkryj
Powiadomienia
Ostatnio dodany
@@ -103,8 +104,13 @@
Wybierz inny przypadek
Historia
Edycja
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Podpisy
Wybierz podpisy
Brak
diff --git a/app/src/full/res/values-pt/strings.xml b/app/src/full/res/values-pt/strings.xml
index cdea048..48b7fb0 100644
--- a/app/src/full/res/values-pt/strings.xml
+++ b/app/src/full/res/values-pt/strings.xml
@@ -1,6 +1,7 @@
Home
+ Local
Discover
Notifications
Recently added
@@ -103,8 +104,13 @@
Pick another instance
History
Edit
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Captions
Pick captions
None
diff --git a/app/src/full/res/values-ro/strings.xml b/app/src/full/res/values-ro/strings.xml
index cdea048..48b7fb0 100644
--- a/app/src/full/res/values-ro/strings.xml
+++ b/app/src/full/res/values-ro/strings.xml
@@ -1,6 +1,7 @@
Home
+ Local
Discover
Notifications
Recently added
@@ -103,8 +104,13 @@
Pick another instance
History
Edit
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Captions
Pick captions
None
diff --git a/app/src/full/res/values-ru/strings.xml b/app/src/full/res/values-ru/strings.xml
index fecbd92..fbdeac4 100644
--- a/app/src/full/res/values-ru/strings.xml
+++ b/app/src/full/res/values-ru/strings.xml
@@ -1,15 +1,16 @@
- Главная страница
+ Главная
+ Локальные
Подборка
Уведомления
- Недавно добавленные
+ По добавлению
Популярные
Много лайков
Упс! Произошла ошибка!
Беззвучный
Каналы
- Не показывать
+ Скрыто
Размыть
Показать
Не выбрано
@@ -22,7 +23,7 @@
Редактировать плейлист
Закрыть
Загрузить
- Предпросмотр
+ Предпросмотр изображения
Выберите файл для загрузки
Канал
Видео
@@ -33,11 +34,11 @@
Скачать
Изображение профиля
Обновить видео
- %d с
- %d м
- %d ч
- %d д
- %s просмотров
+ %d сек.
+ %d мин.
+ %d час.
+ %d д.
+ Просмотры: %s
Хост экземпляра
Загрузка, пожалуйста, подождите…
Видео было загружено!
@@ -103,12 +104,17 @@
Выберите другой экземпляр
История
Редактировать
+ Настройки видео
+ Интерфейс
+ Кэш
+ Определите кеш для видео (по умолчанию 100 Мб)
Определить качество видео по умолчанию
Разрешение для видео
+ Видео кэш: %d Мб
Субтитры
Выбрать субтитры
Ничто
- Позволяет изменить режим воспроизведения видео (по умолчанию, потоковой или через браузер).
+ Позволяет изменить режим воспроизведения видео (по умолчанию потоковый или через браузер).
Удалить видео
Вы уверены, что хотите удалить это видео?
Нет видео для отображения!
@@ -120,8 +126,8 @@
%1$s успешно импортировано]]>
%1$s произошла ошибка]]>
%1$s опубликовал новое видео: %2$s]]>
- %1$s занесено в черный список]]>
- %1$s удалено из черного списка]]>
+ %1$s занесено в чёрный список]]>
+ %1$s удалено из чёрного списка]]>
%1$s]]>
Добавить публичный комментарий
Оставить комментарий
@@ -201,17 +207,17 @@
Выбрать этот экземпляр
Неприличные видео
Неприличный контент: %1$s
- %1$s подписчиков у экземпляра
+ Подписчиков у экземпляра: %1$s
Помощь
Выбрать категории
Выбрать языки
- Информация об обновлении
+ Обновить данные
Добавление аккаунта
Список аккаунтов
Пауза
Воспроизвести
Свернуть
- Быстрое перемотка
+ Быстрая перемотка
Перемотка вперед
Вид свёрнутого видео
Уменьшить размер видео, когда приложение находится в фоновом режиме (Android N+)
diff --git a/app/src/full/res/values-sv/strings.xml b/app/src/full/res/values-sv/strings.xml
index cdea048..48b7fb0 100644
--- a/app/src/full/res/values-sv/strings.xml
+++ b/app/src/full/res/values-sv/strings.xml
@@ -1,6 +1,7 @@
Home
+ Local
Discover
Notifications
Recently added
@@ -103,8 +104,13 @@
Pick another instance
History
Edit
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Captions
Pick captions
None
diff --git a/app/src/full/res/values-zh-rCN/strings.xml b/app/src/full/res/values-zh-rCN/strings.xml
index cdea048..48b7fb0 100644
--- a/app/src/full/res/values-zh-rCN/strings.xml
+++ b/app/src/full/res/values-zh-rCN/strings.xml
@@ -1,6 +1,7 @@
Home
+ Local
Discover
Notifications
Recently added
@@ -103,8 +104,13 @@
Pick another instance
History
Edit
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Captions
Pick captions
None
diff --git a/app/src/full/res/values-zh-rTW/strings.xml b/app/src/full/res/values-zh-rTW/strings.xml
index cdea048..48b7fb0 100644
--- a/app/src/full/res/values-zh-rTW/strings.xml
+++ b/app/src/full/res/values-zh-rTW/strings.xml
@@ -1,6 +1,7 @@
Home
+ Local
Discover
Notifications
Recently added
@@ -103,8 +104,13 @@
Pick another instance
History
Edit
+ Video settings
+ Interface
+ Cache
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
+ Video cache: %d Mb
Captions
Pick captions
None
diff --git a/app/src/full/res/values/strings.xml b/app/src/full/res/values/strings.xml
index 7d472aa..f366db4 100644
--- a/app/src/full/res/values/strings.xml
+++ b/app/src/full/res/values/strings.xml
@@ -145,7 +145,7 @@
set_video_quality_choice
set_video_cache_choice
Cache
- Définir le cache pour les vidéos (défaut 100Mo)
+ Set the cache for videos (default 100Mb)
Define a default quality for videos
Resolution for videos
Video cache: %d Mb
diff --git a/app/src/full/res/values/styles.xml b/app/src/full/res/values/styles.xml
index f4807f3..97c4971 100644
--- a/app/src/full/res/values/styles.xml
+++ b/app/src/full/res/values/styles.xml
@@ -14,4 +14,8 @@
- @color/colorPrimaryDark_full
- @color/colorAccent_full
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/fedilabtube/AccountActivity.java b/app/src/main/java/app/fedilab/fedilabtube/AccountActivity.java
index 8f0ae77..a413d82 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/AccountActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/AccountActivity.java
@@ -215,7 +215,7 @@ public class AccountActivity extends AppCompatActivity {
AlertDialog.Builder builderSingle = new AlertDialog.Builder(AccountActivity.this);
builderSingle.setTitle(getString(R.string.list_of_accounts));
- if( accounts != null) {
+ if (accounts != null) {
final OwnAccountsAdapter accountsListAdapter = new OwnAccountsAdapter(AccountActivity.this, accounts);
final Account[] accountArray = new Account[accounts.size()];
int i = 0;
diff --git a/app/src/main/java/app/fedilab/fedilabtube/AllPlaylistsActivity.java b/app/src/main/java/app/fedilab/fedilabtube/AllPlaylistsActivity.java
index e04ccf9..2c84ff9 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/AllPlaylistsActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/AllPlaylistsActivity.java
@@ -354,7 +354,7 @@ public class AllPlaylistsActivity extends AppCompatActivity {
@Override
public void onItemSelected(AdapterView parent, View view, int position, long id) {
idChannel = channelId[position];
- if( position > 0 ) {
+ if (position > 0) {
selectedChannel = myChannels.get(position - 1);
}
}
diff --git a/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java b/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java
index 8665854..335a813 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/MainActivity.java
@@ -98,12 +98,12 @@ public class MainActivity extends AppCompatActivity {
new Thread(() -> {
try {
Token token = new RetrofitPeertubeAPI(MainActivity.this).manageToken(oauthParams);
- if( token == null) {
+ if (token == null) {
runOnUiThread(() -> Helper.logoutCurrentUser(MainActivity.this, account));
return;
}
UserMe userMe = new RetrofitPeertubeAPI(MainActivity.this, instance, token.getAccess_token()).verifyCredentials();
- if( userMe != null && userMe.getAccount() != null) {
+ if (userMe != null && userMe.getAccount() != null) {
new AccountDAO(MainActivity.this, db).updateAccount(userMe.getAccount());
SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString(Helper.PREF_KEY_ID, account.getId());
@@ -113,7 +113,7 @@ public class MainActivity extends AppCompatActivity {
Set videoLanguageServerSet = new TreeSet<>(videoLanguageServer);
videoLanguageServerSet.addAll(videoLanguageServer);
Set videoLanguageLocal = sharedpreferences.getStringSet(getString(R.string.set_video_language_choice), null);
- if( videoLanguageServerSet.size() > 0 && videoLanguageLocal != null) {
+ if (videoLanguageServerSet.size() > 0 && videoLanguageLocal != null) {
videoLanguageServer.addAll(videoLanguageLocal);
}
editor.putStringSet(getString(R.string.set_video_language_choice), videoLanguageServerSet);
diff --git a/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java b/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
index 2045682..ad389b5 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
@@ -86,7 +86,9 @@ import com.google.android.exoplayer2.util.Util;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import app.fedilab.fedilabtube.client.APIResponse;
@@ -154,7 +156,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
private List captions;
private TextView no_action_text;
private String max_id;
- private RecyclerView lv_comments;
+ private RecyclerView lv_comments;
private boolean flag_loading;
private List comments;
@@ -197,7 +199,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
String token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
- if( Helper.isLoggedIn(PeertubeActivity.this)) {
+ if (Helper.isLoggedIn(PeertubeActivity.this)) {
Account account = new AccountDAO(PeertubeActivity.this, db).getAccountByToken(token);
Helper.loadGiF(PeertubeActivity.this, account.getAvatar() != null ? account.getAvatar().getPath() : null, my_pp);
}
@@ -255,7 +257,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
getWindow().setAttributes(attrs);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
peertube_information_container.setVisibility(View.GONE);
- setRequestedOrientation (ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
} else {
WindowManager.LayoutParams attrs = getWindow().getAttributes();
attrs.flags &= ~WindowManager.LayoutParams.FLAG_FULLSCREEN;
@@ -303,7 +305,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
if (firstVisibleItem + visibleItemCount == totalItemCount) {
if (!flag_loading) {
CommentVM commentViewModel = new ViewModelProvider(PeertubeActivity.this).get(CommentVM.class);
- commentViewModel.getThread(videoId, max_id).observe(PeertubeActivity.this, apiresponse ->manageVIewComment(apiresponse));
+ commentViewModel.getThread(videoId, max_id).observe(PeertubeActivity.this, apiresponse -> manageVIewComment(apiresponse));
}
}
}
@@ -363,11 +365,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
peertube_playlist.setVisibility(View.VISIBLE);
peertube_bookmark.setVisibility(View.GONE);
- List videoIds = new ArrayList<>();
- videoIds.add(videoId);
- if (Helper.isLoggedIn(PeertubeActivity.this)) {
- playlistsViewModel.videoExists(videoIds).observe(PeertubeActivity.this, this::manageVIewVideosExist);
- }
TimelineVM feedsViewModel = new ViewModelProvider(PeertubeActivity.this).get(TimelineVM.class);
feedsViewModel.getVideo(videoId).observe(PeertubeActivity.this, this::manageVIewVideo);
CaptionsVM captionsViewModel = new ViewModelProvider(PeertubeActivity.this).get(CaptionsVM.class);
@@ -513,7 +510,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
peertube = apiResponse.getPeertubes().get(0);
-
add_comment_read.setOnClickListener(v -> {
if (isLoggedIn(PeertubeActivity.this)) {
add_comment_read.setVisibility(View.GONE);
@@ -545,7 +541,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
peertube_playlist.setOnClickListener(v -> {
- if (playlists != null && peertube.getId() != null) {
+ if (playlists != null && videoId != null) {
PopupMenu popup = new PopupMenu(PeertubeActivity.this, peertube_playlist);
for (Playlist playlist : playlists) {
@@ -586,7 +582,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
playlistForVideo.remove(playlist.getId());
} else {
item1.setTitle("✔ " + playlist.getDisplayName());
- playlistsViewModel.manage(PlaylistsVM.action.ADD_VIDEOS, playlist, peertube.getId()).observe(PeertubeActivity.this, apiResponse3 -> manageVIewPlaylists(PlaylistsVM.action.ADD_VIDEOS, apiResponse3));
+ playlistsViewModel.manage(PlaylistsVM.action.ADD_VIDEOS, playlist, videoId).observe(PeertubeActivity.this, apiResponse3 -> manageVIewPlaylists(PlaylistsVM.action.ADD_VIDEOS, apiResponse3));
playlistForVideo.add(playlist.getId());
}
return false;
@@ -846,7 +842,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
}
-
@Override
public void onDestroy() {
super.onDestroy();
@@ -931,7 +926,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
final ArrayAdapter arrayAdapter = new ArrayAdapter<>(PeertubeActivity.this, android.R.layout.select_dialog_item);
for (File file : peertube.getFiles()) {
if (file.getResolutions() != null) {
- if( file.getResolutions().getLabel().compareTo("0p") != 0) {
+ if (file.getResolutions().getLabel().compareTo("0p") != 0) {
arrayAdapter.add(file.getResolutions().getLabel());
}
}
@@ -1026,10 +1021,10 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
fullScreenButton.setOnClickListener(v -> {
if (!fullScreenMode) {
openFullscreenDialog();
- setRequestedOrientation (ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
- }else {
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+ } else {
closeFullscreenDialog();
- setRequestedOrientation (ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
Handler handler = new Handler();
handler.postDelayed(() -> setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR), 2000);
@@ -1074,19 +1069,23 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
}
public void manageVIewPlaylists(PlaylistsVM.action actionType, APIResponse apiResponse) {
-
if (actionType == GET_PLAYLISTS && apiResponse != null) {
playlists = apiResponse.getPlaylists();
+ playlistsViewModel.videoExists(videoId).observe(PeertubeActivity.this, this::manageVIewVideosExist);
}
}
public void manageVIewVideosExist(APIResponse apiResponse) {
- playlistForVideo = new ArrayList<>();
- if( apiResponse.getError() == null && apiResponse.getVideoExistPlaylist() != null) {
-
- List videoIds = apiResponse.getVideoExistPlaylist();
- for(PlaylistExist.VideoId videoId: videoIds) {
- playlistForVideo.add(videoId.getPlaylistId());
+ if (apiResponse.getError() == null && apiResponse.getVideoExistPlaylist() != null) {
+ Map> videoIds = apiResponse.getVideoExistPlaylist();
+ Iterator>> it = videoIds.entrySet().iterator();
+ while (it.hasNext()) {
+ Map.Entry> pair = it.next();
+ List playlistExistVideo = pair.getValue();
+ for (PlaylistExist playlistExist : playlistExistVideo) {
+ playlistForVideo.add(playlistExist.getPlaylistId());
+ }
+ it.remove();
}
}
}
diff --git a/app/src/main/java/app/fedilab/fedilabtube/PeertubeEditUploadActivity.java b/app/src/main/java/app/fedilab/fedilabtube/PeertubeEditUploadActivity.java
index 5a2901f..0f321cc 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/PeertubeEditUploadActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/PeertubeEditUploadActivity.java
@@ -671,7 +671,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
set_upload_submit.setEnabled(true);
}
- @SuppressWarnings("unused")
+ @SuppressWarnings({"unused", "RedundantSuppression"})
public void manageVIewPostActions(RetrofitPeertubeAPI.ActionType statusAction, APIResponse apiResponse) {
Intent intent = new Intent(PeertubeEditUploadActivity.this, MainActivity.class);
intent.putExtra(Helper.INTENT_ACTION, Helper.RELOAD_MYVIDEOS);
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/APIResponse.java b/app/src/main/java/app/fedilab/fedilabtube/client/APIResponse.java
index 3899c18..72a330a 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/APIResponse.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/APIResponse.java
@@ -29,7 +29,7 @@ import app.fedilab.fedilabtube.client.data.VideoData;
import app.fedilab.fedilabtube.client.data.VideoPlaylistData.VideoPlaylist;
import app.fedilab.fedilabtube.client.entities.Error;
import app.fedilab.fedilabtube.client.entities.OverviewVideo;
-import app.fedilab.fedilabtube.client.entities.PlaylistExist.VideoId;
+import app.fedilab.fedilabtube.client.entities.PlaylistExist;
import app.fedilab.fedilabtube.client.entities.Rating;
@SuppressWarnings({"unused", "RedundantSuppression"})
@@ -41,7 +41,7 @@ public class APIResponse {
private String actionReturn = null;
private Rating rating;
private OverviewVideo overviewVideo = null;
- private List videoExistPlaylist = null;
+ private Map> videoExistPlaylist = null;
private List peertubes = null;
private List comments = null;
private List muted;
@@ -240,11 +240,11 @@ public class APIResponse {
this.videoPlaylist = videoPlaylist;
}
- public List getVideoExistPlaylist() {
+ public Map> getVideoExistPlaylist() {
return videoExistPlaylist;
}
- public void setVideoExistPlaylist(List videoExistPlaylist) {
+ public void setVideoExistPlaylist(Map> videoExistPlaylist) {
this.videoExistPlaylist = videoExistPlaylist;
}
}
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/PeertubeService.java b/app/src/main/java/app/fedilab/fedilabtube/client/PeertubeService.java
index c580543..9ceaf71 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/PeertubeService.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/PeertubeService.java
@@ -55,7 +55,7 @@ import retrofit2.http.Path;
import retrofit2.http.Query;
import retrofit2.http.QueryMap;
-
+@SuppressWarnings({"unused", "RedundantSuppression"})
public interface PeertubeService {
@GET("instances")
Call getInstances(@QueryMap Map params, @Query("nsfwPolicy[]") String nsfwPolicy, @Query("categoriesOr[]") List categories, @Query("languagesOr[]") List languages);
@@ -238,7 +238,7 @@ public interface PeertubeService {
Call getVideosPlayList(@Header("Authorization") String credentials, @Path("id") String id);
@GET("users/me/video-playlists/videos-exist")
- Call getVideoExistsInPlaylist(@Header("Authorization") String credentials, @Query("videoIds") List videoIds);
+ Call>> getVideoExistsInPlaylist(@Header("Authorization") String credentials, @Query("videoIds") String videoIds);
@Multipart
@POST("video-playlists")
@@ -264,7 +264,7 @@ public interface PeertubeService {
@FormUrlEncoded
@POST("video-playlists/{id}/videos")
- Call addVideoInPlaylist(@Header("Authorization") String credentials, @Path("id") String id, @Field("videoId") String videoId);
+ Call addVideoInPlaylist(@Header("Authorization") String credentials, @Path("id") String id, @Field("videoId") String videoId);
@DELETE("video-playlists/{id}")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java b/app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java
index 111c267..ba91d96 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java
@@ -78,6 +78,7 @@ import retrofit2.Response;
import retrofit2.Retrofit;
import retrofit2.converter.gson.GsonConverterFactory;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class RetrofitPeertubeAPI {
private String finalUrl;
@@ -1080,14 +1081,14 @@ public class RetrofitPeertubeAPI {
* @param videoIds List ids of videos
* @return APIResponse
*/
- public APIResponse getVideosExist(List videoIds) {
+ public APIResponse getVideosExist(String videoIds) {
PeertubeService peertubeService = init();
APIResponse apiResponse = new APIResponse();
try {
- Call videoExistsInPlaylist = peertubeService.getVideoExistsInPlaylist(getToken(), videoIds);
- Response response = videoExistsInPlaylist.execute();
+ Call>> videoExistsInPlaylist = peertubeService.getVideoExistsInPlaylist(getToken(), videoIds);
+ Response>> response = videoExistsInPlaylist.execute();
if (response.isSuccessful() && response.body() != null) {
- apiResponse.setVideoExistPlaylist(response.body().getVideoId());
+ apiResponse.setVideoExistPlaylist(response.body());
} else {
setError(apiResponse, response.code(), response.errorBody());
}
@@ -1131,7 +1132,7 @@ public class RetrofitPeertubeAPI {
} else {
setError(apiResponse, response.code(), response.errorBody());
}
- } else if (type == PlaylistsVM.action.GET_LIST_VIDEOS) {
+ } else if (type == PlaylistsVM.action.GET_LIST_VIDEOS) {
Call videosPlayList = peertubeService.getVideosPlayList(getToken(), playlistId);
Response response = videosPlayList.execute();
if (response.isSuccessful() && response.body() != null) {
@@ -1148,10 +1149,10 @@ public class RetrofitPeertubeAPI {
setError(apiResponse, response.code(), response.errorBody());
}
} else if (type == PlaylistsVM.action.ADD_VIDEOS) {
- Call stringCall = peertubeService.addVideoInPlaylist(getToken(), playlistId, videoId);
- Response response = stringCall.execute();
- if (response.isSuccessful()) {
- apiResponse.setActionReturn(response.body());
+ Call stringCall = peertubeService.addVideoInPlaylist(getToken(), playlistId, videoId);
+ Response response = stringCall.execute();
+ if (response.isSuccessful() && response.body() != null) {
+ apiResponse.setActionReturn(response.body().getVideoPlaylistElement().getId());
} else {
setError(apiResponse, response.code(), response.errorBody());
}
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/data/AccountData.java b/app/src/main/java/app/fedilab/fedilabtube/client/data/AccountData.java
index 5b664c8..129a29e 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/data/AccountData.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/data/AccountData.java
@@ -25,7 +25,7 @@ import java.util.List;
import app.fedilab.fedilabtube.client.entities.Avatar;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class AccountData {
@SerializedName("total")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/data/BlockData.java b/app/src/main/java/app/fedilab/fedilabtube/client/data/BlockData.java
index fdaca83..fe50926 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/data/BlockData.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/data/BlockData.java
@@ -19,6 +19,7 @@ import com.google.gson.annotations.SerializedName;
import java.util.Date;
import java.util.List;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class BlockData {
@SerializedName("total")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/data/CaptionData.java b/app/src/main/java/app/fedilab/fedilabtube/client/data/CaptionData.java
index e10b5a6..0c21c9f 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/data/CaptionData.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/data/CaptionData.java
@@ -20,7 +20,7 @@ import java.util.List;
import app.fedilab.fedilabtube.client.entities.ItemStr;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class CaptionData {
@SerializedName("total")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/data/ChannelData.java b/app/src/main/java/app/fedilab/fedilabtube/client/data/ChannelData.java
index 9846101..228d543 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/data/ChannelData.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/data/ChannelData.java
@@ -27,7 +27,7 @@ import app.fedilab.fedilabtube.client.entities.Avatar;
import app.fedilab.fedilabtube.client.entities.ItemStr;
import app.fedilab.fedilabtube.client.entities.ViewsPerDay;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class ChannelData {
@SerializedName("total")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/data/CommentData.java b/app/src/main/java/app/fedilab/fedilabtube/client/data/CommentData.java
index 8867c0c..6d93dea 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/data/CommentData.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/data/CommentData.java
@@ -19,7 +19,7 @@ import com.google.gson.annotations.SerializedName;
import java.util.Date;
import java.util.List;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class CommentData {
@SerializedName("total")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/data/InstanceData.java b/app/src/main/java/app/fedilab/fedilabtube/client/data/InstanceData.java
index 1069ef4..69c4fb7 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/data/InstanceData.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/data/InstanceData.java
@@ -7,7 +7,7 @@ import com.google.gson.annotations.SerializedName;
import java.util.Date;
import java.util.List;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class InstanceData {
@SerializedName("total")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/data/NotificationData.java b/app/src/main/java/app/fedilab/fedilabtube/client/data/NotificationData.java
index aeb5879..3e181ac 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/data/NotificationData.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/data/NotificationData.java
@@ -23,7 +23,7 @@ import app.fedilab.fedilabtube.client.entities.VideoBlacklist;
*
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see . */
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class NotificationData {
@SerializedName("total")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/data/PlaylistData.java b/app/src/main/java/app/fedilab/fedilabtube/client/data/PlaylistData.java
index 25ae469..0e205cd 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/data/PlaylistData.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/data/PlaylistData.java
@@ -24,7 +24,7 @@ import java.util.List;
import app.fedilab.fedilabtube.client.entities.Item;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class PlaylistData {
@SerializedName("total")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/data/VideoData.java b/app/src/main/java/app/fedilab/fedilabtube/client/data/VideoData.java
index eaabeda..08a6827 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/data/VideoData.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/data/VideoData.java
@@ -34,7 +34,7 @@ import app.fedilab.fedilabtube.client.entities.StreamingPlaylists;
import app.fedilab.fedilabtube.helper.Helper;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class VideoData {
@SerializedName("total")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/data/VideoPlaylistData.java b/app/src/main/java/app/fedilab/fedilabtube/client/data/VideoPlaylistData.java
index 55e3327..4f21e13 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/data/VideoPlaylistData.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/data/VideoPlaylistData.java
@@ -20,7 +20,7 @@ import com.google.gson.annotations.SerializedName;
import java.util.List;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class VideoPlaylistData {
@SerializedName("total")
@@ -120,6 +120,19 @@ public class VideoPlaylistData {
}
}
+ public static class PlaylistElement {
+ @SerializedName("videoPlaylistElement")
+ private VideoPlaylistCreationItem videoPlaylistElement;
+
+ public VideoPlaylistCreationItem getVideoPlaylistElement() {
+ return videoPlaylistElement;
+ }
+
+ public void setVideoPlaylistElement(VideoPlaylistCreationItem videoPlaylistElement) {
+ this.videoPlaylistElement = videoPlaylistElement;
+ }
+ }
+
public static class VideoPlaylistCreationItem {
@SerializedName("id")
String id;
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/AccountCreation.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/AccountCreation.java
index 4ab5830..aefaa31 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/AccountCreation.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/AccountCreation.java
@@ -14,7 +14,7 @@ package app.fedilab.fedilabtube.client.entities;
*
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see . */
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class AccountCreation {
private String username;
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Actor.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Actor.java
index 80dff05..5ddf54f 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Actor.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Actor.java
@@ -16,6 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
import com.google.gson.annotations.SerializedName;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class Actor {
@SerializedName("type")
private String type;
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/ActorFollow.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/ActorFollow.java
index 181a171..71702f4 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/ActorFollow.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/ActorFollow.java
@@ -16,7 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
import com.google.gson.annotations.SerializedName;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class ActorFollow {
@SerializedName("id")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Avatar.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Avatar.java
index f837e24..d48436b 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Avatar.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Avatar.java
@@ -21,7 +21,7 @@ import java.util.Date;
*
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see . */
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class Avatar implements Parcelable {
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/CaptionsParams.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/CaptionsParams.java
index bc774e2..1d3aad8 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/CaptionsParams.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/CaptionsParams.java
@@ -16,7 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
import com.google.gson.annotations.SerializedName;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class CaptionsParams {
@SerializedName("captionLanguage")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/ChannelParams.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/ChannelParams.java
index 19ea5f3..263df0e 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/ChannelParams.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/ChannelParams.java
@@ -16,7 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
import com.google.gson.annotations.SerializedName;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class ChannelParams {
@SerializedName("displayName")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Error.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Error.java
index ab8f0a6..bd6a8e4 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Error.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Error.java
@@ -22,6 +22,7 @@ import android.widget.Toast;
import app.fedilab.fedilabtube.R;
import es.dmoral.toasty.Toasty;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class Error extends Throwable {
private String error = null;
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/File.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/File.java
index dbf6f43..2d0b50d 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/File.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/File.java
@@ -3,7 +3,7 @@ package app.fedilab.fedilabtube.client.entities;
import com.google.gson.annotations.SerializedName;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class File {
@SerializedName("fileDownloadUrl")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/InstanceParams.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/InstanceParams.java
index ffbfc8b..f42dffc 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/InstanceParams.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/InstanceParams.java
@@ -16,6 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
import java.util.List;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class InstanceParams {
private boolean healthy = true;
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Item.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Item.java
index 13024d3..34a84d0 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Item.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Item.java
@@ -19,6 +19,7 @@ import android.os.Parcelable;
import com.google.gson.annotations.SerializedName;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class Item implements Parcelable {
public static final Parcelable.Creator- CREATOR = new Parcelable.Creator
- () {
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/ItemStr.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/ItemStr.java
index 3c90734..5283a3e 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/ItemStr.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/ItemStr.java
@@ -19,7 +19,7 @@ import android.os.Parcelable;
import com.google.gson.annotations.SerializedName;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class ItemStr implements Parcelable {
public static final Creator CREATOR = new Creator() {
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/NotificationSettings.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/NotificationSettings.java
index 0102561..a76b6f4 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/NotificationSettings.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/NotificationSettings.java
@@ -16,6 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
import com.google.gson.annotations.SerializedName;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class NotificationSettings {
@SerializedName("abuseAsModerator")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Oauth.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Oauth.java
index 79fb1eb..14e32e6 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Oauth.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Oauth.java
@@ -16,6 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
import com.google.gson.annotations.SerializedName;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class Oauth {
@SerializedName("client_id")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/OauthParams.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/OauthParams.java
index 238687a..86431bb 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/OauthParams.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/OauthParams.java
@@ -16,6 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
import com.google.gson.annotations.SerializedName;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class OauthParams {
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/OverviewVideo.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/OverviewVideo.java
index bc5291b..c7d0aeb 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/OverviewVideo.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/OverviewVideo.java
@@ -21,7 +21,7 @@ import java.util.List;
import app.fedilab.fedilabtube.client.data.ChannelData.Channel;
import app.fedilab.fedilabtube.client.data.VideoData.Video;
-@SuppressWarnings({"unused"})
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class OverviewVideo {
@SerializedName("categories")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/PeertubeInformation.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/PeertubeInformation.java
index 518d8eb..97be7d8 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/PeertubeInformation.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/PeertubeInformation.java
@@ -16,7 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
import java.util.Map;
-
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class PeertubeInformation {
private Map categories;
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/PlaylistExist.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/PlaylistExist.java
index 43f3efd..46c079c 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/PlaylistExist.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/PlaylistExist.java
@@ -16,61 +16,48 @@ package app.fedilab.fedilabtube.client.entities;
import com.google.gson.annotations.SerializedName;
-import java.util.List;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class PlaylistExist {
- @SerializedName("videoId")
- private List videoId;
+ @SerializedName("playlistElementId")
+ private String playlistElementId;
+ @SerializedName("playlistId")
+ private String playlistId;
+ @SerializedName("startTimestamp")
+ private long startTimestamp;
+ @SerializedName("stopTimestamp")
+ private long stopTimestamp;
- public List getVideoId() {
- return videoId;
+ public String getPlaylistElementId() {
+ return playlistElementId;
}
- public void setVideoId(List videoId) {
- this.videoId = videoId;
+ public void setPlaylistElementId(String playlistElementId) {
+ this.playlistElementId = playlistElementId;
}
- public static class VideoId {
- @SerializedName("playlistElementId")
- private String playlistElementId;
- @SerializedName("playlistId")
- private String playlistId;
- @SerializedName("startTimestamp")
- private long startTimestamp;
- @SerializedName("stopTimestamp")
- private long stopTimestamp;
+ public String getPlaylistId() {
+ return playlistId;
+ }
- public String getPlaylistElementId() {
- return playlistElementId;
- }
+ public void setPlaylistId(String playlistId) {
+ this.playlistId = playlistId;
+ }
- public void setPlaylistElementId(String playlistElementId) {
- this.playlistElementId = playlistElementId;
- }
+ public long getStartTimestamp() {
+ return startTimestamp;
+ }
- public String getPlaylistId() {
- return playlistId;
- }
+ public void setStartTimestamp(long startTimestamp) {
+ this.startTimestamp = startTimestamp;
+ }
- public void setPlaylistId(String playlistId) {
- this.playlistId = playlistId;
- }
+ public long getStopTimestamp() {
+ return stopTimestamp;
+ }
- public long getStartTimestamp() {
- return startTimestamp;
- }
-
- public void setStartTimestamp(long startTimestamp) {
- this.startTimestamp = startTimestamp;
- }
-
- public long getStopTimestamp() {
- return stopTimestamp;
- }
-
- public void setStopTimestamp(long stopTimestamp) {
- this.stopTimestamp = stopTimestamp;
- }
+ public void setStopTimestamp(long stopTimestamp) {
+ this.stopTimestamp = stopTimestamp;
}
}
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/PlaylistParams.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/PlaylistParams.java
index a4d3a26..358f663 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/PlaylistParams.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/PlaylistParams.java
@@ -17,6 +17,7 @@ package app.fedilab.fedilabtube.client.entities;
import com.google.gson.annotations.SerializedName;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class PlaylistParams {
@SerializedName("displayName")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Rating.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Rating.java
index e6b0fbf..12e9f06 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Rating.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Rating.java
@@ -16,7 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
import com.google.gson.annotations.SerializedName;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class Rating {
@SerializedName("videoId")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Report.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Report.java
index 0fe8378..5b7968a 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Report.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Report.java
@@ -18,7 +18,7 @@ import java.util.List;
*
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see . */
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class Report {
@SerializedName("reason")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/StreamingPlaylists.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/StreamingPlaylists.java
index 890b50c..f3ea3e2 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/StreamingPlaylists.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/StreamingPlaylists.java
@@ -18,7 +18,7 @@ import com.google.gson.annotations.SerializedName;
import java.util.List;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class StreamingPlaylists {
@SerializedName("id")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Token.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Token.java
index c910b98..e163c1d 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Token.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Token.java
@@ -16,6 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
import com.google.gson.annotations.SerializedName;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class Token {
@SerializedName("access_token")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/UserMe.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/UserMe.java
index 7432618..2609d7e 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/UserMe.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/UserMe.java
@@ -22,6 +22,7 @@ import java.util.List;
import app.fedilab.fedilabtube.client.data.AccountData.Account;
import app.fedilab.fedilabtube.client.data.ChannelData;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class UserMe {
@SerializedName("account")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoAbuse.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoAbuse.java
index 654f094..577126e 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoAbuse.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoAbuse.java
@@ -18,6 +18,7 @@ import com.google.gson.annotations.SerializedName;
import app.fedilab.fedilabtube.client.data.VideoData;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class VideoAbuse {
@SerializedName("id")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoBlacklist.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoBlacklist.java
index bc89d6d..ef41a8b 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoBlacklist.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoBlacklist.java
@@ -18,6 +18,7 @@ import com.google.gson.annotations.SerializedName;
import app.fedilab.fedilabtube.client.data.VideoData;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class VideoBlacklist {
@SerializedName("id")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoParams.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoParams.java
index 93f03c1..45fbb02 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoParams.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/VideoParams.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.Date;
import java.util.List;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class VideoParams {
@SerializedName("channelId")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/ViewsPerDay.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/ViewsPerDay.java
index 5819e12..d1c372c 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/ViewsPerDay.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/ViewsPerDay.java
@@ -18,6 +18,7 @@ import com.google.gson.annotations.SerializedName;
import java.util.Date;
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class ViewsPerDay {
@SerializedName("date")
diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/WellKnownNodeinfo.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/WellKnownNodeinfo.java
index 12afa3f..2a8f981 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/WellKnownNodeinfo.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/WellKnownNodeinfo.java
@@ -17,7 +17,7 @@ package app.fedilab.fedilabtube.client.entities;
import com.google.gson.annotations.SerializedName;
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
public class WellKnownNodeinfo {
@SerializedName("reel")
private String reel;
diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java
index 5ded4eb..f720c8c 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java
@@ -124,7 +124,7 @@ public class PeertubeAdapter extends RecyclerView.Adapter {
Intent intent = new Intent(context, PeertubeActivity.class);
Bundle b = new Bundle();
- b.putString("video_id", video.getUuid());
+ b.putString("video_id", video.getId());
intent.putExtras(b);
context.startActivity(intent);
});
@@ -140,7 +140,7 @@ public class PeertubeAdapter extends RecyclerView.Adapter {
Intent intent = new Intent(context, PeertubeActivity.class);
Bundle b = new Bundle();
- b.putString("video_id", video.getUuid());
+ b.putString("video_id", video.getId());
intent.putExtras(b);
context.startActivity(intent);
});
diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeNotificationsListAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeNotificationsListAdapter.java
index 428745e..c90dd53 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeNotificationsListAdapter.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeNotificationsListAdapter.java
@@ -108,7 +108,7 @@ public class PeertubeNotificationsListAdapter extends RecyclerView.Adapter= Build.VERSION_CODES.N)
holder.peertube_notif_message.setText(Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY));
diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java
index f2f7f79..d8a560d 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java
@@ -156,6 +156,7 @@ public class PlaylistAdapter extends BaseAdapter {
return convertView;
}
+ @SuppressWarnings({"unused", "RedundantSuppression"})
public void manageVIewPlaylists(PlaylistsVM.action actionType, APIResponse apiResponse) {
}
diff --git a/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayNotificationsFragment.java b/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayNotificationsFragment.java
index 84c7b7c..25f570d 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayNotificationsFragment.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayNotificationsFragment.java
@@ -44,6 +44,13 @@ import es.dmoral.toasty.Toasty;
public class DisplayNotificationsFragment extends Fragment {
+ //Peertube notification type
+ public static int NEW_VIDEO_FROM_SUBSCRIPTION = 1;
+ public static int BLACKLIST_ON_MY_VIDEO = 4;
+ public static int UNBLACKLIST_ON_MY_VIDEO = 5;
+ public static int MY_VIDEO_PUBLISHED = 6;
+ public static int MY_VIDEO_IMPORT_SUCCESS = 7;
+ public static int MY_VIDEO_IMPORT_ERROR = 8;
private boolean flag_loading;
private Context context;
private PeertubeNotificationsListAdapter peertubeNotificationsListAdapter;
@@ -56,16 +63,6 @@ public class DisplayNotificationsFragment extends Fragment {
private RecyclerView lv_notifications;
private View rootView;
- //Peertube notification type
- public static int NEW_VIDEO_FROM_SUBSCRIPTION = 1;
- public static int NEW_REPORT = 3;
- public static int BLACKLIST_ON_MY_VIDEO = 4;
- public static int UNBLACKLIST_ON_MY_VIDEO = 5;
- public static int MY_VIDEO_PUBLISHED = 6;
- public static int MY_VIDEO_IMPORT_SUCCESS = 7;
- public static int MY_VIDEO_IMPORT_ERROR = 8;
-
-
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
diff --git a/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayPlaylistsFragment.java b/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayPlaylistsFragment.java
index 0e0b72e..23c89c2 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayPlaylistsFragment.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayPlaylistsFragment.java
@@ -17,7 +17,6 @@ package app.fedilab.fedilabtube.fragment;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
-import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
@@ -61,12 +60,10 @@ import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist;
import app.fedilab.fedilabtube.client.entities.Item;
import app.fedilab.fedilabtube.client.entities.PlaylistParams;
import app.fedilab.fedilabtube.drawer.PlaylistAdapter;
-import app.fedilab.fedilabtube.helper.Helper;
import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
import es.dmoral.toasty.Toasty;
-import static android.content.Context.MODE_PRIVATE;
import static app.fedilab.fedilabtube.MainActivity.peertubeInformation;
import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.MY_CHANNELS;
@@ -132,8 +129,6 @@ public class DisplayPlaylistsFragment extends Fragment {
set_upload_channel = dialogView.findViewById(R.id.set_upload_channel);
set_upload_privacy = dialogView.findViewById(R.id.set_upload_privacy);
- final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
- final String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
ChannelsVM viewModelC = new ViewModelProvider(this).get(ChannelsVM.class);
viewModelC.get(MY_CHANNELS, null).observe(DisplayPlaylistsFragment.this.requireActivity(), this::manageVIewChannels);
diff --git a/app/src/main/java/app/fedilab/fedilabtube/fragment/SettingsFragment.java b/app/src/main/java/app/fedilab/fedilabtube/fragment/SettingsFragment.java
index 6024827..540b096 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/fragment/SettingsFragment.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/fragment/SettingsFragment.java
@@ -109,8 +109,8 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
SeekBarPreference set_video_cache_choice = findPreference(getString(R.string.set_video_cache_choice));
assert set_video_cache_choice != null;
final int progress = set_video_cache_choice.getValue();
- set_video_cache_choice.setSummary(getActivity().getString(R.string.video_cache_value, progress*10));
- editor.putInt(Helper.SET_VIDEO_CACHE, progress*10);
+ set_video_cache_choice.setSummary(getActivity().getString(R.string.video_cache_value, progress * 10));
+ editor.putInt(Helper.SET_VIDEO_CACHE, progress * 10);
}
if (key.compareTo(getString(R.string.set_video_minimize_choice)) == 0) {
SwitchPreference set_video_minimize_choice = findPreference(getString(R.string.set_video_minimize_choice));
@@ -171,7 +171,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
SeekBarPreference set_video_cache_choice = findPreference(getString(R.string.set_video_cache_choice));
int video_cache = sharedpref.getInt(Helper.SET_VIDEO_CACHE, Helper.DEFAULT_VIDEO_CACHE_MB);
assert set_video_cache_choice != null;
- set_video_cache_choice.setValue(video_cache/10);
+ set_video_cache_choice.setValue(video_cache / 10);
boolean minimized = sharedpref.getBoolean(getString(R.string.set_video_minimize_choice), true);
SwitchPreference set_video_minimize_choice = findPreference(getString(R.string.set_video_minimize_choice));
diff --git a/app/src/main/java/app/fedilab/fedilabtube/helper/CustomQuoteSpan.java b/app/src/main/java/app/fedilab/fedilabtube/helper/CustomQuoteSpan.java
deleted file mode 100644
index 96da0ce..0000000
--- a/app/src/main/java/app/fedilab/fedilabtube/helper/CustomQuoteSpan.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package app.fedilab.fedilabtube.helper;
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program 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.
- *
- * TubeLab 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 TubeLab; if not,
- * see . */
-
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.text.Layout;
-import android.text.style.LeadingMarginSpan;
-import android.text.style.LineBackgroundSpan;
-
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Original work from @heath-borders: https://stackoverflow.com/a/29114976/3197259
- */
-public class CustomQuoteSpan implements LeadingMarginSpan, LineBackgroundSpan {
- private final int backgroundColor;
- private final int stripeColor;
- private final float stripeWidth;
- private final float gap;
-
- public CustomQuoteSpan(int backgroundColor, int stripeColor, float stripeWidth, float gap) {
- this.backgroundColor = backgroundColor;
- this.stripeColor = stripeColor;
- this.stripeWidth = stripeWidth;
- this.gap = gap;
- }
-
- @Override
- public int getLeadingMargin(boolean first) {
- return (int) (stripeWidth + gap);
- }
-
- @Override
- public void drawLeadingMargin(Canvas c, Paint p, int x, int dir, int top, int baseline, int bottom,
- CharSequence text, int start, int end, boolean first, Layout layout) {
- Paint.Style style = p.getStyle();
- int paintColor = p.getColor();
-
- p.setStyle(Paint.Style.FILL);
- p.setColor(stripeColor);
-
- c.drawRect(x, top, x + dir * stripeWidth, bottom, p);
-
- p.setStyle(style);
- p.setColor(paintColor);
- }
-
- @Override
- public void drawBackground(@NotNull Canvas c, @NotNull Paint p, int left, int right, int top, int baseline, int bottom, @NotNull CharSequence text, int start, int end, int lnum) {
- int paintColor = p.getColor();
- p.setColor(backgroundColor);
- c.drawRect(left, top, right, bottom, p);
- p.setColor(paintColor);
- }
-}
diff --git a/app/src/main/java/app/fedilab/fedilabtube/helper/FileNameCleaner.java b/app/src/main/java/app/fedilab/fedilabtube/helper/FileNameCleaner.java
deleted file mode 100644
index 7cfa66e..0000000
--- a/app/src/main/java/app/fedilab/fedilabtube/helper/FileNameCleaner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package app.fedilab.fedilabtube.helper;
-/* Copyright 2020 Thomas Schneider
- *
- * This file is a part of TubeLab
- *
- * This program 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.
- *
- * TubeLab 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 TubeLab; if not,
- * see . */
-
-import java.util.Arrays;
-
-/**
- * Work from https://stackoverflow.com/a/26420820
- */
-
-public class FileNameCleaner {
- private final static int[] illegalChars = {34, 60, 62, 124, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 58, 42, 63, 92, 47};
-
- static {
- Arrays.sort(illegalChars);
- }
-
- public static String cleanFileName(String badFileName) {
- StringBuilder cleanName = new StringBuilder();
- int len = badFileName.codePointCount(0, badFileName.length());
- for (int i = 0; i < len; i++) {
- int c = badFileName.codePointAt(i);
- if (Arrays.binarySearch(illegalChars, c) < 0) {
- cleanName.appendCodePoint(c);
- }
- }
- return cleanName.toString();
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/fedilabtube/helper/FullScreenMediaController.java b/app/src/main/java/app/fedilab/fedilabtube/helper/FullScreenMediaController.java
index 61d9381..b7569ce 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/helper/FullScreenMediaController.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/helper/FullScreenMediaController.java
@@ -45,7 +45,7 @@ public class FullScreenMediaController extends MediaController {
this.context = context;
}
- @SuppressWarnings("unused")
+ @SuppressWarnings({"unused", "RedundantSuppression"})
public FullScreenMediaController(Context context, Video peertube) {
super(context);
this.peertube = peertube;
@@ -104,7 +104,7 @@ public class FullScreenMediaController extends MediaController {
});
}
- @SuppressWarnings("unused")
+ @SuppressWarnings({"unused", "RedundantSuppression"})
public void setResolutionVal(String resolutionVal) {
this.resolutionVal = resolutionVal;
if (resolution != null)
diff --git a/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java b/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java
index 7bf4e61..8a23444 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java
@@ -26,7 +26,6 @@ import android.graphics.Bitmap;
import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
-import android.os.Bundle;
import android.os.Environment;
import android.util.DisplayMetrics;
import android.util.TypedValue;
@@ -40,7 +39,6 @@ import android.widget.ImageView;
import android.widget.Toast;
import androidx.appcompat.app.AlertDialog;
-import androidx.browser.customtabs.CustomTabsIntent;
import androidx.core.content.ContextCompat;
import com.bumptech.glide.Glide;
@@ -49,12 +47,10 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import java.text.DateFormat;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Locale;
-import java.util.TimeZone;
import java.util.regex.Pattern;
import app.fedilab.fedilabtube.BuildConfig;
@@ -82,51 +78,34 @@ public class Helper {
public static final int QUALITY_HIGH = 0;
public static final int QUALITY_MEDIUM = 1;
public static final int QUALITY_LOW = 2;
- public static final int VIDEO_MODE_TORRENT = 3;
public static final int ADD_USER_INTENT = 5;
- public static final int VIDEO_UPLOADED_INTENT = 6;
- public static final String VIDEO_UPLOAD_ID = "VIDEO_UPLOAD_ID";
public static final String SET_SHARE_DETAILS = "set_share_details";
public static final int DEFAULT_VIDEO_CACHE_MB = 100;
+ @SuppressWarnings({"unused", "RedundantSuppression"})
public static final String TAG = "mastodon_etalab";
public static final String ID = "id";
public static final String CLIENT_ID = "client_id";
public static final String CLIENT_SECRET = "client_secret";
- public static final String SCOPES = "scopes";
- public static final String WEBSITE = "website";
public static final String WEBSITE_VALUE = "https://fedilab.app";
public static final String CLIENT_NAME_VALUE = "TubeLab";
public static final String OAUTH_SCOPES_PEERTUBE = "openid profile";
public static final String PREF_KEY_OAUTH_TOKEN = "oauth_token";
- public static final String REDIRECT_URIS = "redirect_uris";
-
- public static final Pattern hashtagPattern = Pattern.compile("(#[\\w_A-zÀ-ÿ]+)");
public static final Pattern redirectPattern = Pattern.compile("externalAuthToken=(\\w+)&username=([\\w.-]+)");
public static final String SET_VIDEO_CACHE = "set_video_cache";
//Proxy
public static final String SET_PROXY_ENABLED = "set_proxy_enabled";
- public static final String SET_PROXY_TYPE = "set_proxy_type";
public static final String SET_PROXY_HOST = "set_proxy_host";
public static final String SET_PROXY_PORT = "set_proxy_port";
- public static final String SET_PROXY_LOGIN = "set_proxy_login";
- public static final String SET_PROXY_PASSWORD = "set_proxy_password";
public static final String INTENT_ACTION = "intent_action";
public static final String PREF_KEY_ID = "userID";
public static final String PREF_KEY_NAME = "my_user_name";
- public static final String PREF_IS_MODERATOR = "is_moderator";
- public static final String PREF_IS_ADMINISTRATOR = "is_administrator";
public static final String PREF_INSTANCE = "instance";
- public static final String REDIRECT_CONTENT = "urn:ietf:wg:oauth:2.0:oob";
public static final int EXTERNAL_STORAGE_REQUEST_CODE = 84;
public static final String SET_VIDEOS_PER_PAGE = "set_videos_per_page";
public static final String VIDEO_ID = "video_id_update";
- public static final String CLIENT_NAME = "client_name";
public static final String APP_PREFS = "app_prefs";
public static final int VIDEOS_PER_PAGE = 40;
- public static final String SET_VIDEO_NSFW = "set_video_nsfw";
- public static final String SET_EMBEDDED_BROWSER = "set_embedded_browser";
- public static final String SET_CUSTOM_TABS = "set_custom_tabs";
public static final String INTENT_ADD_UPLOADED_MEDIA = "intent_add_uploaded_media";
public static final String RECEIVE_ACTION = "receive_action";
public static final String SET_UNFOLLOW_VALIDATION = "set_unfollow_validation";
@@ -268,42 +247,6 @@ public class Helper {
}
}
- public static String instanceWithProtocol(Context context) {
- return "https://" + getLiveInstance(context);
- }
-
- /**
- * Convert String date from Mastodon
- *
- * @param date String
- * @return Date
- */
- public static Date mstStringToDate(String date) throws ParseException {
- if (date == null)
- return null;
-
- String STRING_DATE_FORMAT;
- Locale local = Locale.getDefault();
- if (!date.contains("+")) {
- STRING_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
- } else { //GNU date format
- STRING_DATE_FORMAT = "EEE MMM dd HH:mm:ss ZZZZZ yyyy";
- local = Locale.ENGLISH;
- }
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat(STRING_DATE_FORMAT, local);
- simpleDateFormat.setTimeZone(TimeZone.getTimeZone("gmt"));
- simpleDateFormat.setLenient(true);
- try {
- return simpleDateFormat.parse(date);
- } catch (Exception e) {
- String newdate = date.split("\\+")[0].trim();
- simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", local);
- simpleDateFormat.setTimeZone(TimeZone.getTimeZone("gmt"));
- simpleDateFormat.setLenient(true);
- return simpleDateFormat.parse(newdate);
- }
- }
-
/**
* Convert a date in String -> format yyyy-MM-dd HH:mm:ss
*
@@ -386,7 +329,7 @@ public class Helper {
SimpleDateFormat df = (SimpleDateFormat) DateFormat.getDateInstance(DateFormat.LONG, Locale.getDefault());
df.applyPattern(df.toPattern().replaceAll("[^\\p{Alpha}]*y+[^\\p{Alpha}]*", ""));
return df.format(dateToot);
- }catch (Exception e) {
+ } catch (Exception e) {
return format;
}
} else if (days > 0)
@@ -402,17 +345,6 @@ public class Helper {
}
}
- /**
- * Convert a date in String -> format yyyy-MM-dd HH:mm:ss
- *
- * @param date Date
- * @return String
- */
- public static String shortDateToString(Date date) {
- SimpleDateFormat df = (SimpleDateFormat) DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
- return df.format(date);
- }
-
public static String withSuffix(long count) {
if (count < 1000) return "" + count;
@@ -471,50 +403,6 @@ public class Helper {
}
}
- /**
- * Manage URLs to open (built-in or external app)
- *
- * @param context Context
- * @param url String url to open
- */
- public static void openBrowser(Context context, String url) {
- SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
- boolean embedded_browser = sharedpreferences.getBoolean(Helper.SET_EMBEDDED_BROWSER, true);
- if (embedded_browser) {
- Intent intent = new Intent(context, WebviewActivity.class);
- Bundle b = new Bundle();
- String finalUrl = url;
- if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://"))
- finalUrl = "http://" + url;
- b.putString("url", finalUrl);
- intent.putExtras(b);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(intent);
- } else {
- boolean custom_tabs = sharedpreferences.getBoolean(Helper.SET_CUSTOM_TABS, true);
- if (custom_tabs) {
- CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
- CustomTabsIntent customTabsIntent = builder.build();
- builder.setToolbarColor(ContextCompat.getColor(context, getColorPrimary()));
- try {
- customTabsIntent.launchUrl(context, Uri.parse(url));
- } catch (Exception ignored) {
- Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
- }
- } else {
- Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.setData(Uri.parse(url));
- try {
- context.startActivity(intent);
- } catch (Exception e) {
- Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
- }
-
- }
- }
- }
-
@SuppressLint("SetJavaScriptEnabled")
public static CustomWebview initializeWebview(Activity activity, int webviewId, View rootView) {
@@ -678,9 +566,6 @@ public class Helper {
return BuildConfig.full_instances ? R.color.colorAccent_full : R.color.colorAccent;
}
- public static int getColorPrimary() {
- return BuildConfig.full_instances ? R.color.colorPrimary_full : R.color.colorPrimary;
- }
public static boolean isOwner(Context context, Account account) {
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
@@ -699,18 +584,18 @@ public class Helper {
* @param files List
* @return File
*/
- public static File defaultFile(Context context, List files){
+ public static File defaultFile(Context context, List files) {
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
int video_quality = sharedpreferences.getInt(Helper.SET_QUALITY_MODE, Helper.QUALITY_HIGH);
- if( video_quality == QUALITY_HIGH) {
+ if (video_quality == QUALITY_HIGH) {
return files.get(0);
- }else if( video_quality == QUALITY_LOW) {
- return files.get(files.size() -1);
- }else{
- if( files.size() < 3) {
- return files.get(files.size() -1);
- }else{
- int middle = files.size()/2 -1;
+ } else if (video_quality == QUALITY_LOW) {
+ return files.get(files.size() - 1);
+ } else {
+ if (files.size() < 3) {
+ return files.get(files.size() - 1);
+ } else {
+ int middle = files.size() / 2 - 1;
return files.get(middle);
}
}
diff --git a/app/src/main/java/app/fedilab/fedilabtube/sqlite/AccountDAO.java b/app/src/main/java/app/fedilab/fedilabtube/sqlite/AccountDAO.java
index 61bffbc..f641ccf 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/sqlite/AccountDAO.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/sqlite/AccountDAO.java
@@ -300,7 +300,7 @@ public class AccountDAO {
account.setClient_secret(c.getString(c.getColumnIndex(Sqlite.COL_CLIENT_SECRET)));
account.setRefresh_token(c.getString(c.getColumnIndex(Sqlite.COL_REFRESH_TOKEN)));
//Close the cursor
- c.close();
+ c.close();
//User is returned
return account;
@@ -348,5 +348,4 @@ public class AccountDAO {
}
-
}
diff --git a/app/src/main/java/app/fedilab/fedilabtube/viewmodel/CaptionsVM.java b/app/src/main/java/app/fedilab/fedilabtube/viewmodel/CaptionsVM.java
index ef32a9d..c4761be 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/viewmodel/CaptionsVM.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/viewmodel/CaptionsVM.java
@@ -41,12 +41,6 @@ public class CaptionsVM extends AndroidViewModel {
return apiResponseMutableLiveData;
}
- public LiveData loadCaption(String url) {
- apiResponseMutableLiveData = new MutableLiveData<>();
- load(url);
- return apiResponseMutableLiveData;
- }
-
private void loadCaptions(String videoId) {
Context _mContext = getApplication().getApplicationContext();
new Thread(() -> {
@@ -61,20 +55,4 @@ public class CaptionsVM extends AndroidViewModel {
}
}).start();
}
-
- private void load(String url) {
- Context _mContext = getApplication().getApplicationContext();
- new Thread(() -> {
- try {
- RetrofitPeertubeAPI peertubeAPI = new RetrofitPeertubeAPI(_mContext);
- APIResponse apiResponse = peertubeAPI.getCaptionContent(url);
- Handler mainHandler = new Handler(Looper.getMainLooper());
- Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
- mainHandler.post(myRunnable);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }).start();
- }
-
}
diff --git a/app/src/main/java/app/fedilab/fedilabtube/viewmodel/PlaylistsVM.java b/app/src/main/java/app/fedilab/fedilabtube/viewmodel/PlaylistsVM.java
index 34661b8..339979a 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/viewmodel/PlaylistsVM.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/viewmodel/PlaylistsVM.java
@@ -26,15 +26,12 @@ import androidx.lifecycle.AndroidViewModel;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
-import java.io.File;
import java.util.ArrayList;
-import java.util.List;
import app.fedilab.fedilabtube.client.APIResponse;
import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
import app.fedilab.fedilabtube.client.data.AccountData.Account;
import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist;
-import app.fedilab.fedilabtube.client.entities.PlaylistParams;
import app.fedilab.fedilabtube.helper.Helper;
import app.fedilab.fedilabtube.sqlite.AccountDAO;
import app.fedilab.fedilabtube.sqlite.Sqlite;
@@ -53,13 +50,13 @@ public class PlaylistsVM extends AndroidViewModel {
return apiResponseMutableLiveData;
}
- public LiveData videoExists(List videoIds) {
+ public LiveData videoExists(String videoIds) {
apiResponseMutableLiveData = new MutableLiveData<>();
checkVideosExist(videoIds);
return apiResponseMutableLiveData;
}
- private void checkVideosExist(List videoIds) {
+ private void checkVideosExist(String videoIds) {
Context _mContext = getApplication().getApplicationContext();
new Thread(() -> {
APIResponse apiResponse = new RetrofitPeertubeAPI(_mContext).getVideosExist(videoIds);
diff --git a/app/src/main/res/layout/activity_all_playlist.xml b/app/src/main/res/layout/activity_all_playlist.xml
index 3318606..d00da8c 100644
--- a/app/src/main/res/layout/activity_all_playlist.xml
+++ b/app/src/main/res/layout/activity_all_playlist.xml
@@ -62,10 +62,12 @@
android:gravity="center"
android:visibility="gone">
-
+ android:layout_gravity="center"
+ app:SpinKit_Color="?colorAccent" />
-
+
diff --git a/app/src/main/res/layout/activity_instance_picker.xml b/app/src/main/res/layout/activity_instance_picker.xml
index 692e607..b25b429 100644
--- a/app/src/main/res/layout/activity_instance_picker.xml
+++ b/app/src/main/res/layout/activity_instance_picker.xml
@@ -118,10 +118,12 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/filters_container">
-
+ android:layout_gravity="center"
+ app:SpinKit_Color="?colorAccent" />
-
+ android:layout_gravity="center" />
diff --git a/app/src/main/res/layout/activity_playlists.xml b/app/src/main/res/layout/activity_playlists.xml
index 8805665..2090847 100644
--- a/app/src/main/res/layout/activity_playlists.xml
+++ b/app/src/main/res/layout/activity_playlists.xml
@@ -65,10 +65,12 @@
android:gravity="center"
android:visibility="gone">
-
+ android:layout_gravity="center"
+ app:SpinKit_Color="?colorAccent" />
-
+
diff --git a/app/src/main/res/layout/fragment_overview.xml b/app/src/main/res/layout/fragment_overview.xml
index 1438a45..9fe94e4 100644
--- a/app/src/main/res/layout/fragment_overview.xml
+++ b/app/src/main/res/layout/fragment_overview.xml
@@ -71,10 +71,12 @@
android:gravity="center"
android:visibility="gone">
-
+ android:layout_gravity="center"
+ app:SpinKit_Color="?colorAccent" />
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_playlists.xml b/app/src/main/res/layout/fragment_playlists.xml
index 7579d2b..5725815 100644
--- a/app/src/main/res/layout/fragment_playlists.xml
+++ b/app/src/main/res/layout/fragment_playlists.xml
@@ -51,10 +51,12 @@
android:gravity="center"
android:visibility="gone">
-
+ android:layout_gravity="center"
+ app:SpinKit_Color="?colorAccent" />
-
+
-
+ android:layout_gravity="center"
+ app:SpinKit_Color="?colorAccent" />
-
+
diff --git a/app/src/main/res/layout/fragment_video.xml b/app/src/main/res/layout/fragment_video.xml
index b49335a..484ec24 100644
--- a/app/src/main/res/layout/fragment_video.xml
+++ b/app/src/main/res/layout/fragment_video.xml
@@ -100,10 +100,12 @@
android:gravity="center"
android:visibility="gone">
-
+ android:layout_gravity="center"
+ app:SpinKit_Color="?colorAccent" />
-
+
\ No newline at end of file