From b9e8faac38825ce0a340655090875fe8371fe0f7 Mon Sep 17 00:00:00 2001 From: antonio Date: Thu, 16 Mar 2023 18:02:47 +0100 Subject: [PATCH] Extended the compatibility level starting from Android 7.0 (SDK 24) --- app/build.gradle | 8 ++++---- .../cappielloantonio/play/repository/QueueRepository.java | 6 +----- .../com/cappielloantonio/play/subsonic/models/Artist.kt | 4 ++-- .../com/cappielloantonio/play/subsonic/models/Bookmark.kt | 6 +++--- .../cappielloantonio/play/subsonic/models/Directory.kt | 4 ++-- .../com/cappielloantonio/play/subsonic/models/License.kt | 6 +++--- .../com/cappielloantonio/play/subsonic/models/Share.kt | 8 ++++---- .../com/cappielloantonio/play/subsonic/models/User.kt | 4 ++-- 8 files changed, 21 insertions(+), 25 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a0a9af7f..a95d5b67 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { defaultConfig { applicationId "com.cappielloantonio.playforsubsonic" - minSdkVersion 26 + minSdkVersion 24 targetSdkVersion 33 versionCode 4 versionName "3.1.0" @@ -66,8 +66,8 @@ dependencies { implementation "com.arthurivanets.adapster:adapster:1.0.13" // Glide - implementation 'com.github.bumptech.glide:glide:4.15.0' - implementation 'com.github.bumptech.glide:annotations:4.15.0' + implementation 'com.github.bumptech.glide:glide:4.15.1' + implementation 'com.github.bumptech.glide:annotations:4.15.1' // Media3 implementation 'androidx.media3:media3-session:1.0.0-rc02' @@ -76,7 +76,7 @@ dependencies { implementation 'androidx.media3:media3-ui:1.0.0-rc02' implementation 'androidx.media3:media3-cast:1.0.0-rc02' - annotationProcessor 'com.github.bumptech.glide:compiler:4.15.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1' annotationProcessor 'androidx.room:room-compiler:2.5.0' // Retrofit diff --git a/app/src/main/java/com/cappielloantonio/play/repository/QueueRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/QueueRepository.java index 63b57234..a9e6f729 100644 --- a/app/src/main/java/com/cappielloantonio/play/repository/QueueRepository.java +++ b/app/src/main/java/com/cappielloantonio/play/repository/QueueRepository.java @@ -1,7 +1,5 @@ package com.cappielloantonio.play.repository; -import android.util.Log; - import androidx.annotation.NonNull; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; @@ -15,9 +13,7 @@ import com.cappielloantonio.play.subsonic.base.ApiResponse; import com.cappielloantonio.play.subsonic.models.Child; import com.cappielloantonio.play.subsonic.models.PlayQueue; -import java.time.Instant; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -349,7 +345,7 @@ public class QueueRepository { @Override public void run() { - queueDao.setLastPlay(mediaId, Instant.now().toEpochMilli()); + queueDao.setLastPlay(mediaId, System.currentTimeMillis()); } } diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Artist.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Artist.kt index 5a396a4d..ca1c34fe 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Artist.kt +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Artist.kt @@ -1,11 +1,11 @@ package com.cappielloantonio.play.subsonic.models -import java.time.LocalDateTime +import java.util.* class Artist { var id: String? = null var name: String? = null - var starred: LocalDateTime? = null + var starred: Date? = null var userRating: Int? = null var averageRating: Double? = null } \ No newline at end of file diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Bookmark.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Bookmark.kt index 05ebfc64..3574d922 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Bookmark.kt +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Bookmark.kt @@ -1,12 +1,12 @@ package com.cappielloantonio.play.subsonic.models -import java.time.LocalDateTime +import java.util.* class Bookmark { var entry: Child? = null var position: Long = 0 var username: String? = null var comment: String? = null - var created: LocalDateTime? = null - var changed: LocalDateTime? = null + var created: Date? = null + var changed: Date? = null } \ No newline at end of file diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Directory.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Directory.kt index bcad0470..630c6754 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Directory.kt +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Directory.kt @@ -1,13 +1,13 @@ package com.cappielloantonio.play.subsonic.models -import java.time.LocalDateTime +import java.util.* class Directory { var children: List? = null var id: String? = null var parentId: String? = null var name: String? = null - var starred: LocalDateTime? = null + var starred: Date? = null var userRating: Int? = null var averageRating: Double? = null var playCount: Long? = null diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/License.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/License.kt index e16b199d..82e23f68 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/License.kt +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/License.kt @@ -1,10 +1,10 @@ package com.cappielloantonio.play.subsonic.models -import java.time.LocalDateTime +import java.util.* class License { var isValid = false var email: String? = null - var licenseExpires: LocalDateTime? = null - var trialExpires: LocalDateTime? = null + var licenseExpires: Date? = null + var trialExpires: Date? = null } \ No newline at end of file diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Share.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Share.kt index 2f1cc040..057c1770 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/Share.kt +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/Share.kt @@ -1,6 +1,6 @@ package com.cappielloantonio.play.subsonic.models -import java.time.LocalDateTime +import java.util.* class Share { var entries: List? = null @@ -8,8 +8,8 @@ class Share { var url: String? = null var description: String? = null var username: String? = null - var created: LocalDateTime? = null - var expires: LocalDateTime? = null - var lastVisited: LocalDateTime? = null + var created: Date? = null + var expires: Date? = null + var lastVisited: Date? = null var visitCount = 0 } \ No newline at end of file diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/models/User.kt b/app/src/main/java/com/cappielloantonio/play/subsonic/models/User.kt index 3dc9dc3a..9a40e5dc 100644 --- a/app/src/main/java/com/cappielloantonio/play/subsonic/models/User.kt +++ b/app/src/main/java/com/cappielloantonio/play/subsonic/models/User.kt @@ -1,6 +1,6 @@ package com.cappielloantonio.play.subsonic.models -import java.time.LocalDateTime +import java.util.* class User { var folders: List? = null @@ -20,5 +20,5 @@ class User { var isJukeboxRole = false var isShareRole = false var isVideoConversionRole = false - var avatarLastChanged: LocalDateTime? = null + var avatarLastChanged: Date? = null } \ No newline at end of file