Browse Source

Fix the Handler empty constructor deprecation

merge-requests/1614/head
Nicolas Pomepuy 4 years ago
parent
commit
fff7e64f98
  1. 17
      application/donations/src/main/java/org/videolan/vlc/donations/util/IabHelper.kt
  2. 3
      application/television/src/main/java/org/videolan/television/ui/audioplayer/AudioPlayerActivity.kt
  3. 3
      application/tools/src/main/java/org/videolan/tools/WeakHandler.kt
  4. 3
      application/vlc-android/src/org/videolan/vlc/gui/HistoryAdapter.kt
  5. 3
      application/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserAdapter.kt
  6. 3
      application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt
  7. 3
      application/vlc-android/src/org/videolan/vlc/gui/audio/PlaylistAdapter.kt
  8. 3
      application/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.kt
  9. 3
      application/vlc-android/src/org/videolan/vlc/gui/dialogs/adapters/TrackAdapter.kt
  10. 3
      application/vlc-android/src/org/videolan/vlc/gui/helpers/BookmarkAdapter.kt
  11. 3
      application/vlc-android/src/org/videolan/vlc/gui/network/MRLAdapter.kt
  12. 3
      application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerResizeDelegate.kt
  13. 3
      application/vlc-android/src/org/videolan/vlc/gui/video/VideoStatsDelegate.kt
  14. 3
      application/vlc-android/src/org/videolan/vlc/gui/video/VideoTouchDelegate.kt
  15. 3
      application/vlc-android/src/org/videolan/vlc/gui/video/benchmark/BenchActivity.kt

17
application/donations/src/main/java/org/videolan/vlc/donations/util/IabHelper.kt

@ -21,10 +21,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.IntentSender.SendIntentException import android.content.IntentSender.SendIntentException
import android.content.ServiceConnection import android.content.ServiceConnection
import android.os.Bundle import android.os.*
import android.os.Handler
import android.os.IBinder
import android.os.RemoteException
import android.text.TextUtils import android.text.TextUtils
import android.util.Log import android.util.Log
import com.android.vending.billing.IInAppBillingService import com.android.vending.billing.IInAppBillingService
@ -522,11 +519,11 @@ class IabHelper(ctx: Context, base64PublicKey: String?) {
*/ */
fun queryInventoryAsync(querySkuDetails: Boolean, moreSkus: List<String?>?, fun queryInventoryAsync(querySkuDetails: Boolean, moreSkus: List<String?>?,
listener: QueryInventoryFinishedListener?) { listener: QueryInventoryFinishedListener?) {
val handler = Handler() val handler = Handler(Looper.getMainLooper())
checkNotDisposed() checkNotDisposed()
checkSetupDone("queryInventory") checkSetupDone("queryInventory")
flagStartAsync("refresh inventory") flagStartAsync("refresh inventory")
Thread(Runnable { Thread {
var result = IabResult(BILLING_RESPONSE_RESULT_OK, "Inventory refresh successful.") var result = IabResult(BILLING_RESPONSE_RESULT_OK, "Inventory refresh successful.")
var inv: Inventory? = null var inv: Inventory? = null
try { try {
@ -540,7 +537,7 @@ class IabHelper(ctx: Context, base64PublicKey: String?) {
if (!mDisposed && listener != null) { if (!mDisposed && listener != null) {
handler.post { listener.onQueryInventoryFinished(result_f, inv_f) } handler.post { listener.onQueryInventoryFinished(result_f, inv_f) }
} }
}).start() }.start()
} }
fun queryInventoryAsync(listener: QueryInventoryFinishedListener?) { fun queryInventoryAsync(listener: QueryInventoryFinishedListener?) {
@ -814,9 +811,9 @@ class IabHelper(ctx: Context, base64PublicKey: String?) {
fun consumeAsyncInternal(purchases: List<Purchase>, fun consumeAsyncInternal(purchases: List<Purchase>,
singleListener: ((purchase: Purchase?, result: IabResult?)-> Unit)?, singleListener: ((purchase: Purchase?, result: IabResult?)-> Unit)?,
multiListener: OnConsumeMultiFinishedListener?) { multiListener: OnConsumeMultiFinishedListener?) {
val handler = Handler() val handler = Handler(Looper.getMainLooper())
flagStartAsync("consume") flagStartAsync("consume")
Thread(Runnable { Thread {
val results: MutableList<IabResult> = ArrayList() val results: MutableList<IabResult> = ArrayList()
for (purchase in purchases) { for (purchase in purchases) {
try { try {
@ -833,7 +830,7 @@ class IabHelper(ctx: Context, base64PublicKey: String?) {
if (!mDisposed && multiListener != null) { if (!mDisposed && multiListener != null) {
handler.post { multiListener.onConsumeMultiFinished(purchases, results) } handler.post { multiListener.onConsumeMultiFinished(purchases, results) }
} }
}).start() }.start()
} }
fun logDebug(msg: String?) { fun logDebug(msg: String?) {

3
application/television/src/main/java/org/videolan/television/ui/audioplayer/AudioPlayerActivity.kt

@ -26,6 +26,7 @@ import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.support.v4.media.session.PlaybackStateCompat import android.support.v4.media.session.PlaybackStateCompat
import android.text.format.DateFormat import android.text.format.DateFormat
import android.view.* import android.view.*
@ -66,7 +67,7 @@ class AudioPlayerActivity : BaseTvActivity(),KeycodeListener {
private lateinit var binding: TvAudioPlayerBinding private lateinit var binding: TvAudioPlayerBinding
private lateinit var adapter: PlaylistAdapter private lateinit var adapter: PlaylistAdapter
private val handler = Handler() private val handler = Handler(Looper.getMainLooper())
private var lastMove: Long = 0 private var lastMove: Long = 0
private var shuffling = false private var shuffling = false
private var currentCoverArt: String? = null private var currentCoverArt: String? = null

3
application/tools/src/main/java/org/videolan/tools/WeakHandler.kt

@ -21,10 +21,11 @@
package org.videolan.tools package org.videolan.tools
import android.os.Handler import android.os.Handler
import android.os.Looper
import java.lang.ref.WeakReference import java.lang.ref.WeakReference
abstract class WeakHandler<T>(owner: T) : Handler() { abstract class WeakHandler<T>(owner: T) : Handler(Looper.getMainLooper()) {
private val mOwner: WeakReference<T> = WeakReference(owner) private val mOwner: WeakReference<T> = WeakReference(owner)
val owner: T? val owner: T?

3
application/vlc-android/src/org/videolan/vlc/gui/HistoryAdapter.kt

@ -20,6 +20,7 @@
package org.videolan.vlc.gui package org.videolan.vlc.gui
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -51,7 +52,7 @@ class HistoryAdapter(private val inCards: Boolean = false, private val listEvent
val updateEvt : LiveData<Unit> = MutableLiveData() val updateEvt : LiveData<Unit> = MutableLiveData()
private lateinit var layoutInflater: LayoutInflater private lateinit var layoutInflater: LayoutInflater
var multiSelectHelper: MultiSelectHelper<MediaWrapper> = MultiSelectHelper(this, UPDATE_SELECTION) var multiSelectHelper: MultiSelectHelper<MediaWrapper> = MultiSelectHelper(this, UPDATE_SELECTION)
private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler() } private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler(Looper.getMainLooper()) }
inner class ViewHolder(binding: ViewDataBinding) : SelectorViewHolder<ViewDataBinding>(binding), MarqueeViewHolder { inner class ViewHolder(binding: ViewDataBinding) : SelectorViewHolder<ViewDataBinding>(binding), MarqueeViewHolder {

3
application/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserAdapter.kt

@ -28,6 +28,7 @@ import android.content.Context
import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.BitmapDrawable
import android.os.Build import android.os.Build
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.MotionEvent import android.view.MotionEvent
import android.view.View import android.view.View
@ -89,7 +90,7 @@ open class AudioBrowserAdapter @JvmOverloads constructor(
private var focusNext = -1 private var focusNext = -1
private var focusListener: FocusListener? = null private var focusListener: FocusListener? = null
lateinit var inflater: LayoutInflater lateinit var inflater: LayoutInflater
private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler() } private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler(Looper.getMainLooper()) }
var stopReorder = false var stopReorder = false
protected fun inflaterInitialized() = ::inflater.isInitialized protected fun inflaterInitialized() = ::inflater.isInitialized

3
application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt

@ -25,6 +25,7 @@ import android.content.Intent
import android.content.SharedPreferences import android.content.SharedPreferences
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.os.Vibrator import android.os.Vibrator
import android.support.v4.media.session.PlaybackStateCompat import android.support.v4.media.session.PlaybackStateCompat
import android.text.Editable import android.text.Editable
@ -97,7 +98,7 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, IAudioPlay
private lateinit var binding: AudioPlayerBinding private lateinit var binding: AudioPlayerBinding
private lateinit var playlistAdapter: PlaylistAdapter private lateinit var playlistAdapter: PlaylistAdapter
private lateinit var settings: SharedPreferences private lateinit var settings: SharedPreferences
private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler() } private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler(Looper.getMainLooper()) }
lateinit var playlistModel: PlaylistModel lateinit var playlistModel: PlaylistModel
lateinit var bookmarkModel: BookmarkModel lateinit var bookmarkModel: BookmarkModel
private lateinit var optionsDelegate: PlayerOptionsDelegate private lateinit var optionsDelegate: PlayerOptionsDelegate

3
application/vlc-android/src/org/videolan/vlc/gui/audio/PlaylistAdapter.kt

@ -29,6 +29,7 @@ import android.graphics.Typeface
import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.BitmapDrawable
import android.os.Build import android.os.Build
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.os.Message import android.os.Message
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
@ -71,7 +72,7 @@ class PlaylistAdapter(private val player: IPlayer) : DiffUtilAdapter<MediaWrappe
private var defaultCoverAudio: BitmapDrawable private var defaultCoverAudio: BitmapDrawable
private var model: PlaylistModel? = null private var model: PlaylistModel? = null
private var currentPlayingVisu: MiniVisualizer? = null private var currentPlayingVisu: MiniVisualizer? = null
private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler() } private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler(Looper.getMainLooper()) }
init { init {
val ctx = when (player) { val ctx = when (player) {

3
application/vlc-android/src/org/videolan/vlc/gui/browser/BaseBrowserAdapter.kt

@ -26,6 +26,7 @@ import android.annotation.TargetApi
import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.BitmapDrawable
import android.os.Build import android.os.Build
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -72,7 +73,7 @@ open class BaseBrowserAdapter(val browserContainer: BrowserContainer<MediaLibrar
internal var mediaCount = 0 internal var mediaCount = 0
private var networkRoot = false private var networkRoot = false
private var specialIcons = false private var specialIcons = false
private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler() } private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler(Looper.getMainLooper()) }
val diffCallback = BrowserDiffCallback() val diffCallback = BrowserDiffCallback()

3
application/vlc-android/src/org/videolan/vlc/gui/dialogs/adapters/TrackAdapter.kt

@ -25,6 +25,7 @@
package org.videolan.vlc.gui.dialogs.adapters package org.videolan.vlc.gui.dialogs.adapters
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
@ -36,7 +37,7 @@ import org.videolan.vlc.gui.helpers.enableMarqueeEffect
class TrackAdapter(private val tracks: Array<VlcTrack>, var selectedTrack: VlcTrack?, val trackTypePrefix:String) : RecyclerView.Adapter<TrackAdapter.ViewHolder>() { class TrackAdapter(private val tracks: Array<VlcTrack>, var selectedTrack: VlcTrack?, val trackTypePrefix:String) : RecyclerView.Adapter<TrackAdapter.ViewHolder>() {
lateinit var trackSelectedListener: (VlcTrack) -> Unit lateinit var trackSelectedListener: (VlcTrack) -> Unit
private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler() } private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler(Looper.getMainLooper()) }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val inflater = LayoutInflater.from(parent.context) val inflater = LayoutInflater.from(parent.context)

3
application/vlc-android/src/org/videolan/vlc/gui/helpers/BookmarkAdapter.kt

@ -27,6 +27,7 @@ package org.videolan.vlc.gui.helpers
import android.annotation.TargetApi import android.annotation.TargetApi
import android.os.Build import android.os.Build
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -42,7 +43,7 @@ import org.videolan.vlc.gui.DiffUtilAdapter
class BookmarkAdapter(val bookmarkManager: IBookmarkManager) : class BookmarkAdapter(val bookmarkManager: IBookmarkManager) :
DiffUtilAdapter<Bookmark, BookmarkAdapter.ViewHolder>() { DiffUtilAdapter<Bookmark, BookmarkAdapter.ViewHolder>() {
private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler() } private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler(Looper.getMainLooper()) }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val v = LayoutInflater.from(parent.context) val v = LayoutInflater.from(parent.context)

3
application/vlc-android/src/org/videolan/vlc/gui/network/MRLAdapter.kt

@ -22,6 +22,7 @@ package org.videolan.vlc.gui.network
import android.net.Uri import android.net.Uri
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -44,7 +45,7 @@ private const val TYPE_DUMMY = 2
internal class MRLAdapter(private val eventActor: SendChannel<MrlAction>, private val inCards: Boolean = false) : DiffUtilAdapter<MediaWrapper, RecyclerView.ViewHolder>() { internal class MRLAdapter(private val eventActor: SendChannel<MrlAction>, private val inCards: Boolean = false) : DiffUtilAdapter<MediaWrapper, RecyclerView.ViewHolder>() {
private var dummyClickListener: (() -> Unit)? = null private var dummyClickListener: (() -> Unit)? = null
private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler() } private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler(Looper.getMainLooper()) }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
val inflater = LayoutInflater.from(parent.context) val inflater = LayoutInflater.from(parent.context)

3
application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerResizeDelegate.kt

@ -25,6 +25,7 @@
package org.videolan.vlc.gui.video package org.videolan.vlc.gui.video
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -200,7 +201,7 @@ class SizeAdapter : RecyclerView.Adapter<SizeAdapter.ViewHolder>() {
notifyItemChanged(field) notifyItemChanged(field)
} }
lateinit var sizeSelectedListener: (MediaPlayer.ScaleType) -> Unit lateinit var sizeSelectedListener: (MediaPlayer.ScaleType) -> Unit
private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler() } private val handler by lazy(LazyThreadSafetyMode.NONE) { Handler(Looper.getMainLooper()) }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val inflater = LayoutInflater.from(parent.context) val inflater = LayoutInflater.from(parent.context)

3
application/vlc-android/src/org/videolan/vlc/gui/video/VideoStatsDelegate.kt

@ -27,6 +27,7 @@ package org.videolan.vlc.gui.video
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.net.Uri import android.net.Uri
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.util.Log import android.util.Log
import android.view.MotionEvent import android.view.MotionEvent
import android.view.View import android.view.View
@ -53,7 +54,7 @@ class VideoStatsDelegate(private val player: VideoPlayerActivity, val scrolling:
lateinit var container: ConstraintLayout lateinit var container: ConstraintLayout
private var lastMediaUri: Uri? = null private var lastMediaUri: Uri? = null
private var started = false private var started = false
private val plotHandler: Handler = Handler() private val plotHandler: Handler = Handler(Looper.getMainLooper())
private val firstTimecode = System.currentTimeMillis() private val firstTimecode = System.currentTimeMillis()
lateinit var binding: PlayerHudBinding lateinit var binding: PlayerHudBinding
private lateinit var constraintSet: ConstraintSet private lateinit var constraintSet: ConstraintSet

3
application/vlc-android/src/org/videolan/vlc/gui/video/VideoTouchDelegate.kt

@ -6,6 +6,7 @@ import android.animation.ObjectAnimator
import android.content.res.Configuration import android.content.res.Configuration
import android.media.AudioManager import android.media.AudioManager
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.provider.Settings import android.provider.Settings
import android.util.DisplayMetrics import android.util.DisplayMetrics
import android.util.Log import android.util.Log
@ -61,7 +62,7 @@ class VideoTouchDelegate(private val player: VideoPlayerActivity,
private val resizeDelegate: VideoPlayerResizeDelegate private val resizeDelegate: VideoPlayerResizeDelegate
get() = player.resizeDelegate get() = player.resizeDelegate
var handler = Handler() var handler = Handler(Looper.getMainLooper())
var numberOfTaps = 0 var numberOfTaps = 0
var lastTapTimeMs: Long = 0 var lastTapTimeMs: Long = 0

3
application/vlc-android/src/org/videolan/vlc/gui/video/benchmark/BenchActivity.kt

@ -29,6 +29,7 @@ import android.content.IntentFilter
import android.content.pm.ActivityInfo import android.content.pm.ActivityInfo
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.support.v4.media.session.PlaybackStateCompat import android.support.v4.media.session.PlaybackStateCompat
import android.util.Log import android.util.Log
import android.view.View import android.view.View
@ -67,7 +68,7 @@ import java.io.*
class BenchActivity : ShallowVideoPlayer() { class BenchActivity : ShallowVideoPlayer() {
private lateinit var timeOut: Runnable private lateinit var timeOut: Runnable
private val timeoutHandler: Handler = Handler() private val timeoutHandler: Handler = Handler(Looper.getMainLooper())
private var screenshotsTimestamp: List<Long>? = null private var screenshotsTimestamp: List<Long>? = null
private var isScreenshot = false private var isScreenshot = false
private var screenshotCount = 0 private var screenshotCount = 0

Loading…
Cancel
Save