Skip to content

Commit 9bc4349

Browse files
Merge pull request #74 from apivideo/feature/android_21_support
feat(java): add support from Android 21 (instead of 24)
2 parents daa78af + 6580430 commit 9bc4349

File tree

11 files changed

+36
-16
lines changed

11 files changed

+36
-16
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Changelog
22
All changes to this project will be documented in this file.
33

4+
## [1.3.2] - 2023-09-26
5+
- Extend Android minSdkVersion to 21
6+
47
## [1.3.1] - 2023-08-22
58
- Fix cancellation of upload workers for the WorkManager API
69

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Add this dependency to your project's POM:
4949
<dependency>
5050
<groupId>video.api</groupId>
5151
<artifactId>android-video-uploader</artifactId>
52-
<version>1.3.1</version>
52+
<version>1.3.2</version>
5353
<scope>compile</scope>
5454
</dependency>
5555
```
@@ -59,7 +59,7 @@ Add this dependency to your project's POM:
5959
Add this dependency to your project's build file:
6060

6161
```groovy
62-
implementation "video.api:android-video-uploader:1.3.1"
62+
implementation "video.api:android-video-uploader:1.3.2"
6363
```
6464

6565
### Others
@@ -72,7 +72,7 @@ mvn clean package
7272

7373
Then manually install the following JARs:
7474

75-
* `target/android-video-uploader-1.3.1.jar`
75+
* `target/android-video-uploader-1.3.2.jar`
7676
* `target/lib/*.jar`
7777

7878
## Code sample

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apply plugin: 'maven-publish'
55
apply plugin: 'kotlin-android'
66

77
group = 'video.api'
8-
version = '1.3.1'
8+
version = '1.3.2'
99

1010
buildscript {
1111
repositories {
@@ -36,7 +36,7 @@ if(hasProperty('target') && target == 'android') {
3636
compileSdkVersion 33
3737
buildToolsVersion '30.0.3'
3838
defaultConfig {
39-
minSdkVersion 24
39+
minSdkVersion 21
4040
targetSdkVersion 33
4141
multiDexEnabled true
4242

examples/service/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88

99
defaultConfig {
1010
applicationId "video.api.uploader.service.example"
11-
minSdk 24
11+
minSdk 21
1212
targetSdk 33
1313
versionCode 1
1414
versionName "1.0"

examples/service/src/main/java/video/api/uploader/service/example/ReadStorePermissionManager.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,21 @@ class ReadStorePermissionManager(
1616
} else {
1717
android.Manifest.permission.READ_EXTERNAL_STORAGE
1818
}
19+
1920
private val hasPermission: Boolean
20-
get() = activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
21+
get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
22+
activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
23+
} else {
24+
true
25+
}
2126

2227
fun requestPermission() {
2328
if (hasPermission) {
2429
onGranted()
2530
} else {
31+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
32+
throw IllegalStateException("Permission should be granted")
33+
}
2634
if (activity.shouldShowRequestPermissionRationale(requiredPermission)) {
2735
onShowPermissionRationale(requiredPermission) {
2836
requestPermission.launch(requiredPermission)
@@ -41,4 +49,4 @@ class ReadStorePermissionManager(
4149
onDenied()
4250
}
4351
}
44-
}
52+
}

examples/workmanager/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88

99
defaultConfig {
1010
applicationId "video.api.uploader.work.example"
11-
minSdkVersion 24
11+
minSdkVersion 21
1212
targetSdkVersion 33
1313
versionCode 1
1414
versionName "1.0"

examples/workmanager/src/main/java/video/api/uploader/work/example/ReadStorePermissionManager.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,21 @@ class ReadStorePermissionManager(
1616
} else {
1717
android.Manifest.permission.READ_EXTERNAL_STORAGE
1818
}
19+
1920
private val hasPermission: Boolean
20-
get() = activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
21+
get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
22+
activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
23+
} else {
24+
true
25+
}
2126

2227
fun requestPermission() {
2328
if (hasPermission) {
2429
onGranted()
2530
} else {
31+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
32+
throw IllegalStateException("Permission should be granted")
33+
}
2634
if (activity.shouldShowRequestPermissionRationale(requiredPermission)) {
2735
onShowPermissionRationale(requiredPermission) {
2836
requestPermission.launch(requiredPermission)
@@ -41,4 +49,4 @@ class ReadStorePermissionManager(
4149
onDenied()
4250
}
4351
}
44-
}
52+
}

maven-push.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ apply plugin: 'maven-publish'
1818
apply plugin: 'signing'
1919

2020
def isReleaseBuild() {
21-
return !"1.3.1".contains("SNAPSHOT")
21+
return !"1.3.2".contains("SNAPSHOT")
2222
}
2323

2424
def getReleaseRepositoryUrl() {
@@ -47,7 +47,7 @@ afterEvaluate { project ->
4747

4848
groupId = "video.api"
4949
artifactId = "android-video-uploader"
50-
version = "1.3.1"
50+
version = "1.3.2"
5151

5252
pom {
5353
name = "video.api:android-video-uploader"

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>android-video-uploader</artifactId>
66
<packaging>jar</packaging>
77
<name>${project.groupId}:${project.artifactId}</name>
8-
<version>1.3.1</version>
8+
<version>1.3.2</version>
99
<url>https://github.com/apivideo/api.video-android-uploader</url>
1010
<description>api.video Android API video uploader</description>
1111
<scm>

src/main/java/video/api/uploader/api/ApiClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private OkHttpClient initHttpClient(List<Interceptor> interceptors) {
118118
private void init() {
119119
verifyingSsl = true;
120120
json = new JSON();
121-
addDefaultHeader("AV-Origin-Client", "android-uploader:1.3.1");
121+
addDefaultHeader("AV-Origin-Client", "android-uploader:1.3.2");
122122
}
123123

124124
private boolean isValid(String regex, String field) {

0 commit comments

Comments
 (0)