This repository has been archived by the owner on Oct 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 248
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/dev' into localization
# Conflicts: # app/src/main/java/app/revanced/integrations/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java # app/src/main/java/app/revanced/integrations/utils/Utils.java
- Loading branch information
Showing
24 changed files
with
690 additions
and
197 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
app/src/main/java/app/revanced/integrations/patches/DisableFullscreenAmbientModePatch.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package app.revanced.integrations.patches; | ||
|
|
||
| import app.revanced.integrations.settings.SettingsEnum; | ||
|
|
||
| /** @noinspection unused*/ | ||
| public final class DisableFullscreenAmbientModePatch { | ||
| public static boolean enableFullScreenAmbientMode() { | ||
| return !SettingsEnum.DISABLE_FULLSCREEN_AMBIENT_MODE.getBoolean(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
app/src/main/java/app/revanced/integrations/patches/DisableSuggestedVideoEndScreenPatch.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package app.revanced.integrations.patches; | ||
|
|
||
| import android.annotation.SuppressLint; | ||
| import android.view.View; | ||
| import android.view.ViewGroup; | ||
| import android.widget.ImageView; | ||
| import app.revanced.integrations.settings.SettingsEnum; | ||
|
|
||
| /** @noinspection unused*/ | ||
| public final class DisableSuggestedVideoEndScreenPatch { | ||
| @SuppressLint("StaticFieldLeak") | ||
| private static View lastView; | ||
|
|
||
| public static void closeEndScreen(final ImageView imageView) { | ||
| if (!SettingsEnum.DISABLE_SUGGESTED_VIDEO_END_SCREEN.getBoolean()) return; | ||
|
|
||
| // Get the view which can be listened to for layout changes. | ||
| final var parent = imageView.getParent().getParent(); | ||
|
|
||
| // Prevent adding the listener multiple times. | ||
| if (lastView == parent) return; | ||
|
|
||
| lastView = (ViewGroup)parent; | ||
| lastView.addOnLayoutChangeListener((view, i, i1, i2, i3, i4, i5, i6, i7) -> imageView.performClick()); | ||
| } | ||
| } |
9 changes: 9 additions & 0 deletions
9
app/src/main/java/app/revanced/integrations/patches/EnableOldSeekbarThumbnailsPatch.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package app.revanced.integrations.patches; | ||
|
|
||
| import app.revanced.integrations.settings.SettingsEnum; | ||
|
|
||
| public final class EnableOldSeekbarThumbnailsPatch { | ||
| public static boolean enableOldSeekbarThumbnails() { | ||
| return !SettingsEnum.ENABLE_OLD_SEEKBAR_THUMBNAILS.getBoolean(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
152 changes: 152 additions & 0 deletions
152
app/src/main/java/app/revanced/integrations/patches/announcements/AnnouncementsPatch.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| package app.revanced.integrations.patches.announcements; | ||
|
|
||
| import android.app.Activity; | ||
| import android.os.Build; | ||
| import android.text.Html; | ||
| import android.text.method.LinkMovementMethod; | ||
| import android.widget.TextView; | ||
| import androidx.annotation.RequiresApi; | ||
| import app.revanced.integrations.patches.announcements.requests.AnnouncementsRoutes; | ||
| import app.revanced.integrations.requests.Requester; | ||
| import app.revanced.integrations.settings.SettingsEnum; | ||
| import app.revanced.integrations.utils.LogHelper; | ||
| import app.revanced.integrations.utils.Utils; | ||
|
|
||
| import org.json.JSONObject; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.HttpURLConnection; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.security.MessageDigest; | ||
| import java.util.UUID; | ||
|
|
||
| import static android.text.Html.FROM_HTML_MODE_COMPACT; | ||
| import static app.revanced.integrations.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENT; | ||
|
|
||
| public final class AnnouncementsPatch { | ||
| private final static String CONSUMER = getOrSetConsumer(); | ||
|
|
||
| private AnnouncementsPatch() { | ||
| } | ||
|
|
||
| @RequiresApi(api = Build.VERSION_CODES.O) | ||
| public static void showAnnouncement(final Activity context) { | ||
| if (!SettingsEnum.ANNOUNCEMENTS.getBoolean()) return; | ||
|
|
||
| Utils.runOnBackgroundThread(() -> { | ||
| try { | ||
| HttpURLConnection connection = AnnouncementsRoutes.getAnnouncementsConnectionFromRoute(GET_LATEST_ANNOUNCEMENT, CONSUMER); | ||
|
|
||
| LogHelper.printDebug(() -> "Get latest announcement route connection url: " + connection.getURL().toString()); | ||
|
|
||
| try { | ||
| // Do not show the announcement if the request failed. | ||
| if (connection.getResponseCode() != 200) { | ||
| if (SettingsEnum.ANNOUNCEMENT_LAST_HASH.getString().isEmpty()) return; | ||
|
|
||
| SettingsEnum.ANNOUNCEMENT_LAST_HASH.saveValue(""); | ||
| Utils.showToastLong("Failed to get announcement"); | ||
|
|
||
| return; | ||
| } | ||
| } catch (IOException ex) { | ||
| final var message = "Failed connecting to announcements provider"; | ||
|
|
||
| LogHelper.printException(() -> message, ex); | ||
| return; | ||
| } | ||
|
|
||
| var jsonString = Requester.parseInputStreamAndClose(connection.getInputStream(), false); | ||
|
|
||
| // Do not show the announcement if it is older or the same as the last one. | ||
| final byte[] hashBytes = MessageDigest.getInstance("SHA-256").digest(jsonString.getBytes(StandardCharsets.UTF_8)); | ||
| final var hash = java.util.Base64.getEncoder().encodeToString(hashBytes); | ||
| if (hash.equals(SettingsEnum.ANNOUNCEMENT_LAST_HASH.getString())) return; | ||
|
|
||
| // Parse the announcement. Fall-back to raw string if it fails. | ||
| String title; | ||
| String message; | ||
| Level level = Level.INFO; | ||
| try { | ||
| final var announcement = new JSONObject(jsonString); | ||
|
|
||
| title = announcement.getString("title"); | ||
| message = announcement.getJSONObject("content").getString("message"); | ||
|
|
||
| if (!announcement.isNull("level")) level = Level.fromInt(announcement.getInt("level")); | ||
| } catch (Throwable ex) { | ||
| LogHelper.printException(() -> "Failed to parse announcement. Fall-backing to raw string", ex); | ||
|
|
||
| title = "Announcement"; | ||
| message = jsonString; | ||
| } | ||
|
|
||
| final var finalTitle = title; | ||
| final var finalMessage = Html.fromHtml(message, FROM_HTML_MODE_COMPACT); | ||
| final Level finalLevel = level; | ||
|
|
||
| Utils.runOnMainThread(() -> { | ||
| // Show the announcement. | ||
| var alertDialog = new android.app.AlertDialog.Builder(context) | ||
| .setTitle(finalTitle) | ||
| .setMessage(finalMessage) | ||
| .setIcon(finalLevel.icon) | ||
| .setPositiveButton("Ok", (dialog, which) -> { | ||
| SettingsEnum.ANNOUNCEMENT_LAST_HASH.saveValue(hash); | ||
| dialog.dismiss(); | ||
| }).setNegativeButton("Dismiss", (dialog, which) -> { | ||
| dialog.dismiss(); | ||
| }) | ||
| .setCancelable(false) | ||
| .show(); | ||
|
|
||
| // Make links clickable. | ||
| ((TextView)alertDialog.findViewById(android.R.id.message)) | ||
| .setMovementMethod(LinkMovementMethod.getInstance()); | ||
| }); | ||
| } catch (Exception e) { | ||
| final var message = "Failed to get announcement"; | ||
|
|
||
| LogHelper.printException(() -> message, e); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Clears the last announcement hash if it is not empty. | ||
| * | ||
| * @return true if the last announcement hash was empty. | ||
| */ | ||
| private static boolean emptyLastAnnouncementHash() { | ||
| if (SettingsEnum.ANNOUNCEMENT_LAST_HASH.getString().isEmpty()) return true; | ||
| SettingsEnum.ANNOUNCEMENT_LAST_HASH.saveValue(""); | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| private static String getOrSetConsumer() { | ||
| final var consumer = SettingsEnum.ANNOUNCEMENT_CONSUMER.getString(); | ||
| if (!consumer.isEmpty()) return consumer; | ||
|
|
||
| final var uuid = UUID.randomUUID().toString(); | ||
| SettingsEnum.ANNOUNCEMENT_CONSUMER.saveValue(uuid); | ||
| return uuid; | ||
| } | ||
|
|
||
| // TODO: Use better icons. | ||
| private enum Level { | ||
| INFO(android.R.drawable.ic_dialog_info), | ||
| WARNING(android.R.drawable.ic_dialog_alert), | ||
| SEVERE(android.R.drawable.ic_dialog_alert); | ||
|
|
||
| public final int icon; | ||
|
|
||
| Level(int icon) { | ||
| this.icon = icon; | ||
| } | ||
|
|
||
| public static Level fromInt(int value) { | ||
| return values()[Math.min(value, values().length - 1)]; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.