kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 07:50:31 +05:30
Code Issues Projects Releases Wiki Activity

fix errors and warnings

Browse Source
This commit is contained in:
Bnyro 2022-09-08 18:41:57 +02:00
parent 24e8882317
commit 93ceef71cc
13 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/release/output-metadata.json
View File

@ -11,10 +11,23 @@
"type": "UNIVERSAL",
"filters": [],
"attributes": [],
"versionCode": 17,
"versionName": "0.5.0",
"versionCode": 18,
"versionName": "0.5.1",
"outputFile": "app-universal-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 18,
"versionName": "0.5.1",
"outputFile": "app-x86_64-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
@ -24,8 +37,8 @@
}
],
"attributes": [],
"versionCode": 17,
"versionName": "0.5.0",
"versionCode": 18,
"versionName": "0.5.1",
"outputFile": "app-armeabi-v7a-release.apk"
},
{
@ -37,8 +50,8 @@
}
],
"attributes": [],
"versionCode": 17,
"versionName": "0.5.0",
"versionCode": 18,
"versionName": "0.5.1",
"outputFile": "app-x86-release.apk"
},
{
@ -50,22 +63,9 @@
}
],
"attributes": [],
"versionCode": 17,
"versionName": "0.5.0",
"versionCode": 18,
"versionName": "0.5.1",
"outputFile": "app-arm64-v8a-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 17,
"versionName": "0.5.0",
"outputFile": "app-x86_64-release.apk"
}
],
"elementType": "File"

12
app/src/main/java/com/github/libretube/activities/AboutActivity.kt
View File

@ -8,13 +8,13 @@ import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.text.Html
import com.github.libretube.DONATE_URL
import com.github.libretube.GITHUB_URL
import com.github.libretube.LICENSE_URL
import com.github.libretube.PIPED_GITHUB_URL
import com.github.libretube.constants.DONATE_URL
import com.github.libretube.constants.GITHUB_URL
import com.github.libretube.constants.LICENSE_URL
import com.github.libretube.constants.PIPED_GITHUB_URL
import com.github.libretube.R
import com.github.libretube.WEBLATE_URL
import com.github.libretube.WEBSITE_URL
import com.github.libretube.constants.WEBLATE_URL
import com.github.libretube.constants.WEBSITE_URL
import com.github.libretube.databinding.ActivityAboutBinding
import com.github.libretube.extensions.BaseActivity
import com.github.libretube.extensions.getStyledSnackBar

10
app/src/main/java/com/github/libretube/activities/CommunityActivity.kt
View File

@ -3,11 +3,11 @@ package com.github.libretube.activities
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import com.github.libretube.DISCORD_URL
import com.github.libretube.MATRIX_URL
import com.github.libretube.REDDIT_URL
import com.github.libretube.TELEGRAM_URL
import com.github.libretube.TWITTER_URL
import com.github.libretube.constants.DISCORD_URL
import com.github.libretube.constants.MATRIX_URL
import com.github.libretube.constants.REDDIT_URL
import com.github.libretube.constants.TELEGRAM_URL
import com.github.libretube.constants.TWITTER_URL
import com.github.libretube.databinding.ActivityCommunityBinding
import com.github.libretube.extensions.BaseActivity

2
app/src/main/java/com/github/libretube/constants/Constants.kt
View File

@ -1,4 +1,4 @@
package com.github.libretube
package com.github.libretube.constants
/**
* API link for the update checker

2
app/src/main/java/com/github/libretube/db/DatabaseHolder.kt
View File

@ -2,7 +2,7 @@ package com.github.libretube.db
import android.content.Context
import androidx.room.Room
import com.github.libretube.DATABASE_NAME
import com.github.libretube.constants.DATABASE_NAME
object DatabaseHolder {
lateinit var db: AppDatabase

4
app/src/main/java/com/github/libretube/dialogs/ShareDialog.kt
View File

@ -4,9 +4,9 @@ import android.app.Dialog
import android.content.Intent
import android.os.Bundle
import androidx.fragment.app.DialogFragment
import com.github.libretube.PIPED_FRONTEND_URL
import com.github.libretube.constants.PIPED_FRONTEND_URL
import com.github.libretube.R
import com.github.libretube.YOUTUBE_FRONTEND_URL
import com.github.libretube.constants.YOUTUBE_FRONTEND_URL
import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.databinding.DialogShareBinding
import com.github.libretube.db.DatabaseHolder

2
app/src/main/java/com/github/libretube/dialogs/VideoOptionsDialog.kt
View File

@ -8,7 +8,7 @@ import android.widget.ArrayAdapter
import android.widget.Toast
import androidx.fragment.app.DialogFragment
import com.github.libretube.Globals
import com.github.libretube.PLAYER_NOTIFICATION_ID
import com.github.libretube.constants.PLAYER_NOTIFICATION_ID
import com.github.libretube.R
import com.github.libretube.util.BackgroundHelper
import com.github.libretube.util.PreferenceHelper

4
app/src/main/java/com/github/libretube/services/BackgroundMode.kt
View File

@ -11,9 +11,9 @@ import android.os.IBinder
import android.os.Looper
import android.widget.Toast
import com.fasterxml.jackson.databind.ObjectMapper
import com.github.libretube.BACKGROUND_CHANNEL_ID
import com.github.libretube.constants.BACKGROUND_CHANNEL_ID
import com.github.libretube.Globals
import com.github.libretube.PLAYER_NOTIFICATION_ID
import com.github.libretube.constants.PLAYER_NOTIFICATION_ID
import com.github.libretube.R
import com.github.libretube.api.RetrofitInstance
import com.github.libretube.constants.PreferenceKeys

2
app/src/main/java/com/github/libretube/services/ClosingService.kt
View File

@ -6,7 +6,7 @@ import android.content.Context
import android.content.Intent
import android.os.IBinder
import androidx.annotation.Nullable
import com.github.libretube.PLAYER_NOTIFICATION_ID
import com.github.libretube.constants.PLAYER_NOTIFICATION_ID
class ClosingService : Service() {

20
app/src/main/java/com/github/libretube/services/DownloadService.kt
View File

@ -17,10 +17,10 @@ import android.os.IBinder
import android.util.Log
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
import com.github.libretube.DOWNLOAD_CHANNEL_ID
import com.github.libretube.DOWNLOAD_FAILURE_NOTIFICATION_ID
import com.github.libretube.DOWNLOAD_PENDING_NOTIFICATION_ID
import com.github.libretube.DOWNLOAD_SUCCESS_NOTIFICATION_ID
import com.github.libretube.constants.DOWNLOAD_CHANNEL_ID
import com.github.libretube.constants.DOWNLOAD_FAILURE_NOTIFICATION_ID
import com.github.libretube.constants.DOWNLOAD_PENDING_NOTIFICATION_ID
import com.github.libretube.constants.DOWNLOAD_SUCCESS_NOTIFICATION_ID
import com.github.libretube.Globals
import com.github.libretube.R
import com.github.libretube.constants.PreferenceKeys
@ -180,8 +180,7 @@ class DownloadService : Service() {
}
private fun downloadNotification(intent: Intent) {
var pendingIntent: PendingIntent? = null
pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_MUTABLE)
} else {
PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT)
@ -234,7 +233,14 @@ class DownloadService : Service() {
Globals.IS_DOWNLOAD_RUNNING = false
Log.d(TAG(), "dl finished!")
stopForeground(true)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
stopForeground(STOP_FOREGROUND_REMOVE)
} else {
@Suppress("DEPRECATION")
stopForeground(true)
}
stopService(Intent(this@DownloadService, DownloadService::class.java))
super.onDestroy()
}

4
app/src/main/java/com/github/libretube/update/UpdateChecker.kt
View File

@ -1,7 +1,7 @@
package com.github.libretube.update
import com.fasterxml.jackson.databind.ObjectMapper
import com.github.libretube.GITHUB_API_URL
import com.github.libretube.constants.GITHUB_API_URL
import com.github.libretube.extensions.await
import java.net.URL
@ -9,7 +9,7 @@ object UpdateChecker {
fun getLatestReleaseInfo(): UpdateInfo? {
var versionInfo: UpdateInfo? = null
// run http request as thread to make it async
val thread = Thread {
Thread {
// otherwise crashes without internet
versionInfo = getUpdateInfo()
try {

4
app/src/main/java/com/github/libretube/util/NotificationHelper.kt
View File

@ -11,8 +11,8 @@ import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.NetworkType
import androidx.work.PeriodicWorkRequest
import androidx.work.WorkManager
import com.github.libretube.NOTIFICATION_WORK_NAME
import com.github.libretube.PUSH_CHANNEL_ID
import com.github.libretube.constants.NOTIFICATION_WORK_NAME
import com.github.libretube.constants.PUSH_CHANNEL_ID
import com.github.libretube.R
import com.github.libretube.activities.MainActivity
import com.github.libretube.api.RetrofitInstance

4
app/src/main/java/com/github/libretube/util/NowPlayingNotification.kt
View File

@ -7,8 +7,8 @@ import android.content.Intent
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.support.v4.media.session.MediaSessionCompat
import com.github.libretube.BACKGROUND_CHANNEL_ID
import com.github.libretube.PLAYER_NOTIFICATION_ID
import com.github.libretube.constants.BACKGROUND_CHANNEL_ID
import com.github.libretube.constants.PLAYER_NOTIFICATION_ID
import com.github.libretube.activities.MainActivity
import com.github.libretube.extensions.await
import com.github.libretube.obj.Streams