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/PeertubeService.java b/app/src/main/java/app/fedilab/fedilabtube/client/PeertubeService.java index 750a34c..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); 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 d02fcfa..0732b4c 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; 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 46d0502..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") 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 02422f1..abad9cf 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 @@ -17,7 +17,7 @@ package app.fedilab.fedilabtube.client.entities; import java.util.LinkedHashMap; import java.util.Map; - +@SuppressWarnings({"unused", "RedundantSuppression"}) public class PeertubeInformation { 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/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 94f5846..25f570d 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayNotificationsFragment.java +++ b/app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayNotificationsFragment.java @@ -46,7 +46,6 @@ public class DisplayNotificationsFragment extends Fragment { //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; 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/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 69d622f..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 * @@ -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); 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(); - } - }