Browse Source

Cleanup calls to Build.VERSION* to remove old API

Fixes #1092
merge-requests/382/head
Nicolas Pomepuy 7 years ago
committed by Geoffrey Métais
parent
commit
88ed2e8218
  1. 1
      vlc-android/src/org/videolan/vlc/gui/HistoryFragment.kt
  2. 1
      vlc-android/src/org/videolan/vlc/gui/MainActivity.kt
  3. 1
      vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.kt
  4. 1
      vlc-android/src/org/videolan/vlc/gui/browser/MediaBrowserFragment.kt
  5. 1
      vlc-android/src/org/videolan/vlc/gui/helpers/BitmapCache.kt
  6. 1
      vlc-android/src/org/videolan/vlc/gui/preferences/hack/MultiSelectListPreferenceDialogFragmentCompat.kt
  7. 1
      vlc-android/src/org/videolan/vlc/gui/tv/TvUtil.kt
  8. 1
      vlc-android/src/org/videolan/vlc/gui/tv/preferences/BasePreferenceFragment.kt
  9. 1
      vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt
  10. 5
      vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt
  11. 1
      vlc-android/src/org/videolan/vlc/gui/view/FastScroller.kt
  12. 4
      vlc-android/src/org/videolan/vlc/gui/view/MiniVisualizer.kt
  13. 1
      vlc-android/src/org/videolan/vlc/gui/view/PopupLayout.kt
  14. 2
      vlc-android/src/org/videolan/vlc/gui/view/VerticalSeekBar.kt
  15. 1
      vlc-android/src/org/videolan/vlc/util/Permissions.kt
  16. 2
      vlc-android/src/org/videolan/vlc/util/VLCOptions.kt
  17. 1
      vlc-android/src/org/videolan/vlc/widget/VLCAppWidgetProvider.kt

1
vlc-android/src/org/videolan/vlc/gui/HistoryFragment.kt

@ -57,7 +57,6 @@ class HistoryFragment : MediaBrowserFragment<HistoryModel>(), IRefreshable, IHis
private lateinit var multiSelectHelper: MultiSelectHelper<AbstractMediaWrapper>
private val historyAdapter: HistoryAdapter = HistoryAdapter(this)
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.history_list, container, false)
}

1
vlc-android/src/org/videolan/vlc/gui/MainActivity.kt

@ -101,7 +101,6 @@ class MainActivity : ContentActivity(),
drawerToggle.syncState()
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
private fun prepareActionBar() {
supportActionBar?.run {
setDisplayHomeAsUpEnabled(true)

1
vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.kt

@ -230,7 +230,6 @@ open class PlaylistActivity : AudioPlayerContainerActivity(), IEventsHandler<Med
binding.fab.show()
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
fun startActionMode() {
actionMode = startSupportActionMode(this)
}

1
vlc-android/src/org/videolan/vlc/gui/browser/MediaBrowserFragment.kt

@ -301,7 +301,6 @@ abstract class MediaBrowserFragment<T : SortableModel> : Fragment(), ActionMode.
viewModel.sort(sort)
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
fun startActionMode() {
val activity = activity as AppCompatActivity? ?: return
actionMode = activity.startSupportActionMode(this)

1
vlc-android/src/org/videolan/vlc/gui/helpers/BitmapCache.kt

@ -30,7 +30,6 @@ import androidx.collection.LruCache
import org.videolan.vlc.BuildConfig
import org.videolan.vlc.util.readableSize
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
object BitmapCache {
private val mMemCache: LruCache<String, Bitmap>
private val TAG = "VLC/BitmapCache"

1
vlc-android/src/org/videolan/vlc/gui/preferences/hack/MultiSelectListPreferenceDialogFragmentCompat.kt

@ -10,7 +10,6 @@ import androidx.preference.Preference
import androidx.preference.PreferenceDialogFragmentCompat
import java.util.*
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
class MultiSelectListPreferenceDialogFragmentCompat : PreferenceDialogFragmentCompat(), DialogPreference.TargetFragment {
private val newValues = HashSet<String>()
private var preferenceChanged: Boolean = false

1
vlc-android/src/org/videolan/vlc/gui/tv/TvUtil.kt

@ -60,7 +60,6 @@ import org.videolan.vlc.viewmodels.browser.BrowserModel
@ExperimentalCoroutinesApi
@ObsoleteCoroutinesApi
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
object TvUtil {
private const val TAG = "VLC/TvUtil"

1
vlc-android/src/org/videolan/vlc/gui/tv/preferences/BasePreferenceFragment.kt

@ -40,7 +40,6 @@ abstract class BasePreferenceFragment : LeanbackPreferenceFragment() {
addPreferencesFromResource(getXml())
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
protected fun loadFragment(fragment: Fragment) {
activity.fragmentManager.beginTransaction().replace(R.id.fragment_placeholder, fragment)
.addToBackStack("main")

1
vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.kt

@ -299,7 +299,6 @@ class VideoGridFragment : MediaBrowserFragment<VideosViewModel>(), SwipeRefreshL
super.setFabPlayVisibility(!viewModel.isEmpty() && enable)
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
when (viewModel.groupingType) {
VideoGroupingType.NONE -> mode.menuInflater.inflate(R.menu.action_mode_video, menu)

5
vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt

@ -360,7 +360,6 @@ open class VideoPlayerActivity : AppCompatActivity(), IPlaybackSettingsControlle
get() = playlistContainer.visibility == View.VISIBLE
private val btReceiver = object : BroadcastReceiver() {
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
override fun onReceive(context: Context, intent: Intent?) {
if (intent == null) return
service?.let { service ->
@ -684,7 +683,6 @@ open class VideoPlayerActivity : AppCompatActivity(), IPlaybackSettingsControlle
}
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
override fun onStart() {
medialibrary.pauseBackgroundOperations()
super.onStart()
@ -837,7 +835,6 @@ open class VideoPlayerActivity : AppCompatActivity(), IPlaybackSettingsControlle
}
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
private fun stopPlayback() {
if (!playbackStarted) return
@ -886,7 +883,6 @@ open class VideoPlayerActivity : AppCompatActivity(), IPlaybackSettingsControlle
}
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
private fun cleanUI() {
rootView?.run { keepScreenOn = false }
@ -2183,7 +2179,6 @@ open class VideoPlayerActivity : AppCompatActivity(), IPlaybackSettingsControlle
window.decorView.systemUiVisibility = visibility
}
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private fun showTitle() {
if (isNavMenu) return

1
vlc-android/src/org/videolan/vlc/gui/view/FastScroller.kt

@ -125,7 +125,6 @@ class FastScroller : LinearLayout, Observer<HeadersIndex> {
initialize(context)
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
initialize(context)
}

4
vlc-android/src/org/videolan/vlc/gui/view/MiniVisualizer.kt

@ -81,7 +81,7 @@ class MiniVisualizer : LinearLayout {
animator.duration = 3000
animator.interpolator = LinearInterpolator()
animator.start()
} else if (Build.VERSION.SDK_INT < 19) {
} else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
if (!animator.isStarted) {
animator.start()
}
@ -94,7 +94,7 @@ class MiniVisualizer : LinearLayout {
fun stop() {
if (::animator.isInitialized && animator.isRunning && animator.isStarted) {
if (Build.VERSION.SDK_INT < 19) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
animator.end()
} else {
animator.pause()

1
vlc-android/src/org/videolan/vlc/gui/view/PopupLayout.kt

@ -89,7 +89,6 @@ class PopupLayout : RelativeLayout, ScaleGestureDetector.OnScaleGestureListener,
/*
* Update layout dimensions and apply layout params to window manager
*/
@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR2)
fun setViewSize(width: Int, height: Int) {
var width = width
var height = height

2
vlc-android/src/org/videolan/vlc/gui/view/VerticalSeekBar.kt

@ -28,7 +28,7 @@ class VerticalSeekBar : AppCompatSeekBar {
private fun initialize() {
//The custom drawable looks not great for kitkat. So we use the default one to mitigate the issue
if (Build.VERSION.SDK_INT >= 21) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
progressDrawable = ContextCompat.getDrawable(context, R.drawable.po_seekbar)
}
}

1
vlc-android/src/org/videolan/vlc/util/Permissions.kt

@ -69,7 +69,6 @@ object Permissions {
return !AndroidUtil.isMarshMallowOrLater || android.provider.Settings.System.canWrite(context)
}
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
fun canReadStorage(context: Context): Boolean {
return !AndroidUtil.isMarshMallowOrLater || ContextCompat.checkSelfPermission(context,
Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED

2
vlc-android/src/org/videolan/vlc/util/VLCOptions.kt

@ -60,7 +60,7 @@ object VLCOptions {
get() {
val context = VLCApplication.appContext
val pref = Settings.getInstance(context)
if (context != null && Build.VERSION.SDK_INT >= 21 && audiotrackSessionId == 0) {
if (context != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && audiotrackSessionId == 0) {
val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
audiotrackSessionId = audioManager.generateAudioSessionId()
}

1
vlc-android/src/org/videolan/vlc/widget/VLCAppWidgetProvider.kt

@ -134,7 +134,6 @@ abstract class VLCAppWidgetProvider : AppWidgetProvider() {
applyUpdate(context, views, partial)
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
private fun applyUpdate(context: Context, views: RemoteViews, partial: Boolean) {
val widget = ComponentName(context, this.javaClass)
val manager = AppWidgetManager.getInstance(context)

Loading…
Cancel
Save