build: fix release
Apparently AGP throws a fit when you don't suppress warnings for cryptography classes that aren't even used. Great.
This commit is contained in:
parent
c86970470f
commit
5244a2b858
5 changed files with 34 additions and 8 deletions
|
@ -2,6 +2,9 @@
|
||||||
|
|
||||||
## dev
|
## dev
|
||||||
|
|
||||||
|
#### What's New
|
||||||
|
- **Playlists.** The long-awaited feature has arrived, with more functionality coming soon.
|
||||||
|
|
||||||
#### What's Improved
|
#### What's Improved
|
||||||
- Sorting now handles numbers of arbitrary length
|
- Sorting now handles numbers of arbitrary length
|
||||||
- Punctuation is now ignored in sorting with intelligent sort names disabled
|
- Punctuation is now ignored in sorting with intelligent sort names disabled
|
||||||
|
|
11
app/proguard-rules.pro
vendored
11
app/proguard-rules.pro
vendored
|
@ -23,3 +23,14 @@
|
||||||
# Obsfucation is what proprietary software does to keep the user unaware of it's abuses.
|
# Obsfucation is what proprietary software does to keep the user unaware of it's abuses.
|
||||||
# Also it's easier to fix issues if the stack trace symbols remain unmangled.
|
# Also it's easier to fix issues if the stack trace symbols remain unmangled.
|
||||||
-dontobfuscate
|
-dontobfuscate
|
||||||
|
|
||||||
|
# Make AGP shut up about classes that aren't even used.
|
||||||
|
-dontwarn org.bouncycastle.jsse.BCSSLParameters
|
||||||
|
-dontwarn org.bouncycastle.jsse.BCSSLSocket
|
||||||
|
-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
|
||||||
|
-dontwarn org.conscrypt.Conscrypt$Version
|
||||||
|
-dontwarn org.conscrypt.Conscrypt
|
||||||
|
-dontwarn org.conscrypt.ConscryptHostnameVerifier
|
||||||
|
-dontwarn org.openjsse.javax.net.ssl.SSLParameters
|
||||||
|
-dontwarn org.openjsse.javax.net.ssl.SSLSocket
|
||||||
|
-dontwarn org.openjsse.net.ssl.OpenJSSE
|
|
@ -23,6 +23,7 @@ import org.oxycblt.auxio.music.Music
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Raw playlist information persisted to [UserMusicDatabase].
|
* Raw playlist information persisted to [UserMusicDatabase].
|
||||||
|
*
|
||||||
* @author Alexander Capehart (OxygenCobalt)
|
* @author Alexander Capehart (OxygenCobalt)
|
||||||
*/
|
*/
|
||||||
data class RawPlaylist(
|
data class RawPlaylist(
|
||||||
|
@ -36,19 +37,21 @@ data class RawPlaylist(
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* UID and name information corresponding to a [RawPlaylist] entry.
|
* UID and name information corresponding to a [RawPlaylist] entry.
|
||||||
|
*
|
||||||
* @author Alexander Capehart (OxygenCobalt)
|
* @author Alexander Capehart (OxygenCobalt)
|
||||||
*/
|
*/
|
||||||
@Entity data class PlaylistInfo(@PrimaryKey val playlistUid: Music.UID, val name: String)
|
@Entity data class PlaylistInfo(@PrimaryKey val playlistUid: Music.UID, val name: String)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Song information corresponding to a [RawPlaylist] entry.
|
* Song information corresponding to a [RawPlaylist] entry.
|
||||||
|
*
|
||||||
* @author Alexander Capehart (OxygenCobalt)
|
* @author Alexander Capehart (OxygenCobalt)
|
||||||
*/
|
*/
|
||||||
@Entity data class PlaylistSong(@PrimaryKey val songUid: Music.UID)
|
@Entity data class PlaylistSong(@PrimaryKey val songUid: Music.UID)
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Links individual songs to a playlist entry.
|
* Links individual songs to a playlist entry.
|
||||||
|
*
|
||||||
* @author Alexander Capehart (OxygenCobalt)
|
* @author Alexander Capehart (OxygenCobalt)
|
||||||
*/
|
*/
|
||||||
@Entity
|
@Entity
|
||||||
|
|
|
@ -23,6 +23,7 @@ import org.oxycblt.auxio.music.Music
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allows persistence of all user-created music information.
|
* Allows persistence of all user-created music information.
|
||||||
|
*
|
||||||
* @author Alexander Capehart (OxygenCobalt)
|
* @author Alexander Capehart (OxygenCobalt)
|
||||||
*/
|
*/
|
||||||
@Database(
|
@Database(
|
||||||
|
@ -39,12 +40,14 @@ abstract class UserMusicDatabase : RoomDatabase() {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The DAO for persisted playlist information.
|
* The DAO for persisted playlist information.
|
||||||
|
*
|
||||||
* @author Alexander Capehart (OxygenCobalt)
|
* @author Alexander Capehart (OxygenCobalt)
|
||||||
*/
|
*/
|
||||||
@Dao
|
@Dao
|
||||||
interface PlaylistDao {
|
interface PlaylistDao {
|
||||||
/**
|
/**
|
||||||
* Read out all playlists stored in the database.
|
* Read out all playlists stored in the database.
|
||||||
|
*
|
||||||
* @return A list of [RawPlaylist] representing each playlist stored.
|
* @return A list of [RawPlaylist] representing each playlist stored.
|
||||||
*/
|
*/
|
||||||
@Transaction
|
@Transaction
|
||||||
|
@ -53,6 +56,7 @@ interface PlaylistDao {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new playlist.
|
* Create a new playlist.
|
||||||
|
*
|
||||||
* @param rawPlaylist The [RawPlaylist] to create.
|
* @param rawPlaylist The [RawPlaylist] to create.
|
||||||
*/
|
*/
|
||||||
@Transaction
|
@Transaction
|
||||||
|
@ -68,6 +72,7 @@ interface PlaylistDao {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Replace the currently-stored [PlaylistInfo] for a playlist entry.
|
* Replace the currently-stored [PlaylistInfo] for a playlist entry.
|
||||||
|
*
|
||||||
* @param playlistInfo The new [PlaylistInfo] to store.
|
* @param playlistInfo The new [PlaylistInfo] to store.
|
||||||
*/
|
*/
|
||||||
@Transaction
|
@Transaction
|
||||||
|
@ -78,6 +83,7 @@ interface PlaylistDao {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete a playlist entry's [PlaylistInfo] and [PlaylistSong].
|
* Delete a playlist entry's [PlaylistInfo] and [PlaylistSong].
|
||||||
|
*
|
||||||
* @param playlistUid The [Music.UID] of the playlist to delete.
|
* @param playlistUid The [Music.UID] of the playlist to delete.
|
||||||
*/
|
*/
|
||||||
@Transaction
|
@Transaction
|
||||||
|
@ -88,6 +94,7 @@ interface PlaylistDao {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Insert new song entries into a playlist.
|
* Insert new song entries into a playlist.
|
||||||
|
*
|
||||||
* @param playlistUid The [Music.UID] of the playlist to insert into.
|
* @param playlistUid The [Music.UID] of the playlist to insert into.
|
||||||
* @param songs The [PlaylistSong] representing each song to put into the playlist.
|
* @param songs The [PlaylistSong] representing each song to put into the playlist.
|
||||||
*/
|
*/
|
||||||
|
@ -100,8 +107,10 @@ interface PlaylistDao {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Replace the currently-stored [Song]s of the current playlist entry.
|
* Replace the currently-stored [Song]s of the current playlist entry.
|
||||||
|
*
|
||||||
* @param playlistUid The [Music.UID] of the playlist to update.
|
* @param playlistUid The [Music.UID] of the playlist to update.
|
||||||
* @param songs The [PlaylistSong] representing the new list of songs to be placed in the playlist.
|
* @param songs The [PlaylistSong] representing the new list of songs to be placed in the
|
||||||
|
* playlist.
|
||||||
*/
|
*/
|
||||||
@Transaction
|
@Transaction
|
||||||
suspend fun replacePlaylistSongs(playlistUid: Music.UID, songs: List<PlaylistSong>) {
|
suspend fun replacePlaylistSongs(playlistUid: Music.UID, songs: List<PlaylistSong>) {
|
||||||
|
|
|
@ -58,23 +58,23 @@ open class FakeMusicRepository : MusicRepository {
|
||||||
throw NotImplementedError()
|
throw NotImplementedError()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun createPlaylist(name: String, songs: List<Song>) {
|
override suspend fun createPlaylist(name: String, songs: List<Song>) {
|
||||||
throw NotImplementedError()
|
throw NotImplementedError()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun renamePlaylist(playlist: Playlist, name: String) {
|
override suspend fun renamePlaylist(playlist: Playlist, name: String) {
|
||||||
throw NotImplementedError()
|
throw NotImplementedError()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun deletePlaylist(playlist: Playlist) {
|
override suspend fun deletePlaylist(playlist: Playlist) {
|
||||||
throw NotImplementedError()
|
throw NotImplementedError()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun addToPlaylist(songs: List<Song>, playlist: Playlist) {
|
override suspend fun addToPlaylist(songs: List<Song>, playlist: Playlist) {
|
||||||
throw NotImplementedError()
|
throw NotImplementedError()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun rewritePlaylist(playlist: Playlist, songs: List<Song>) {
|
override suspend fun rewritePlaylist(playlist: Playlist, songs: List<Song>) {
|
||||||
throw NotImplementedError()
|
throw NotImplementedError()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue