Skip to content

[video_player] Remove Android API 19 SSL handling #7876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 7 commits into from
Oct 18, 2024
Merged

[video_player] Remove Android API 19 SSL handling #7876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c71a5f9
Remove KitKat SSL code
stuartmorgan-g Oct 15, 2024
46910cb
Update minSdkVersion
stuartmorgan-g Oct 15, 2024
e141bf4
Version bump
stuartmorgan-g Oct 15, 2024
4366b2a
Re-bump version
stuartmorgan-g Oct 17, 2024
8d7de50
Merge branch 'main' into video-player-android-remove-19-ssl-handling
stuartmorgan-g Oct 17, 2024
eb54bf6
Remove unused headers
stuartmorgan-g Oct 17, 2024
0d83592
Bump minSdkVersion to 21; robolectric doesn't like 20, and we don't s…
stuartmorgan-g Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/video_player/video_player_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.7.14

* Removes SSL workaround for API 19, which is no longer supported.
*
## 2.7.13

* When `AndroidVideoPlayer` attempts to operate on a `textureId` that is not
Expand Down
2 changes: 1 addition & 1 deletion packages/video_player/video_player_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
compileSdk 34

defaultConfig {
minSdkVersion 19
minSdkVersion 21
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
lintOptions {
Expand Down
76 changes: 0 additions & 76 deletions ..._android/android/src/main/java/io/flutter/plugins/videoplayer/CustomSSLSocketFactory.java
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions ...layer_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
package io.flutter.plugins.videoplayer;

import android.content.Context;
import android.os.Build;
import android.util.LongSparseArray;
import androidx.annotation.NonNull;
import io.flutter.FlutterInjector;
Expand All @@ -22,9 +21,6 @@
import io.flutter.plugins.videoplayer.Messages.TextureMessage;
import io.flutter.plugins.videoplayer.Messages.VolumeMessage;
import io.flutter.view.TextureRegistry;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import javax.net.ssl.HttpsURLConnection;

/** Android platform implementation of the VideoPlayerPlugin. */
public class VideoPlayerPlugin implements FlutterPlugin, AndroidVideoPlayerApi {
Expand All @@ -38,19 +34,6 @@ public VideoPlayerPlugin() {}

@Override
public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
try {
HttpsURLConnection.setDefaultSSLSocketFactory(new CustomSSLSocketFactory());
} catch (KeyManagementException | NoSuchAlgorithmException e) {
Log.w(
TAG,
"Failed to enable TLSv1.1 and TLSv1.2 Protocols for API level 19 and below.\n"
+ "For more information about Socket Security, please consult the following link:\n"
+ "https://developer.android.com/reference/javax/net/ssl/SSLSocket",
e);
}
}

final FlutterInjector injector = FlutterInjector.instance();
this.flutterState =
new FlutterState(
Expand Down
2 changes: 1 addition & 1 deletion packages/video_player/video_player_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: video_player_android
description: Android implementation of the video_player plugin.
repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
version: 2.7.13
version: 2.7.14

environment:
sdk: ^3.5.0
Expand Down