From 5d88c8fa43483a66378fe5f72c53119a6cd02eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20M=C3=A9tais?= Date: Thu, 25 Aug 2016 13:16:38 +0200 Subject: [PATCH] Remove checks for FroYo and GingerBread --- .../org/videolan/libvlc/util/AndroidUtil.java | 7 --- .../videolan/libvlc/util/HWDecoderUtil.java | 18 +++---- .../src/org/videolan/libvlc/util/VLCUtil.java | 5 +- .../src/org/videolan/vlc/PlaybackService.java | 47 +++------------- .../vlc/gui/AudioPlayerContainerActivity.java | 2 +- .../org/videolan/vlc/gui/MainActivity.java | 24 ++++----- .../videolan/vlc/gui/audio/AudioPlayer.java | 2 +- .../vlc/gui/dialogs/VlcLoginDialog.java | 5 +- .../videolan/vlc/gui/helpers/AudioUtil.java | 2 +- .../vlc/gui/preferences/Advanced.java | 5 +- .../gui/preferences/PreferencesFragment.java | 4 +- .../tv/audioplayer/AudioPlayerActivity.java | 2 +- .../vlc/gui/tv/preferences/Advanced.java | 2 +- .../tv/preferences/PreferencesFragment.java | 2 +- .../vlc/gui/video/VideoListAdapter.java | 2 +- .../vlc/gui/video/VideoPlayerActivity.java | 54 +++++++------------ .../videolan/vlc/util/CustomDirectories.java | 4 +- .../org/videolan/vlc/util/Permissions.java | 6 +-- .../src/org/videolan/vlc/util/Util.java | 11 ---- .../src/org/videolan/vlc/util/VLCOptions.java | 6 +-- 20 files changed, 61 insertions(+), 149 deletions(-) diff --git a/libvlc/src/org/videolan/libvlc/util/AndroidUtil.java b/libvlc/src/org/videolan/libvlc/util/AndroidUtil.java index e29c033b7..a8d046ca9 100644 --- a/libvlc/src/org/videolan/libvlc/util/AndroidUtil.java +++ b/libvlc/src/org/videolan/libvlc/util/AndroidUtil.java @@ -26,13 +26,6 @@ import android.os.Build; import java.io.File; public class AndroidUtil { - public static boolean isFroyoOrLater() { - return android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.FROYO; - } - - public static boolean isGingerbreadOrLater() { - return android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD; - } public static boolean isHoneycombOrLater() { return android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB; diff --git a/libvlc/src/org/videolan/libvlc/util/HWDecoderUtil.java b/libvlc/src/org/videolan/libvlc/util/HWDecoderUtil.java index 9e2bdef85..68c0f5b80 100644 --- a/libvlc/src/org/videolan/libvlc/util/HWDecoderUtil.java +++ b/libvlc/src/org/videolan/libvlc/util/HWDecoderUtil.java @@ -28,8 +28,6 @@ import java.util.HashMap; */ public class HWDecoderUtil { - public static final boolean HAS_SUBTITLES_SURFACE = AndroidUtil.isGingerbreadOrLater(); - public enum Decoder { UNKNOWN, NONE, OMX, MEDIACODEC, ALL } @@ -162,18 +160,14 @@ public class HWDecoderUtil { * (By default, returns ALL, i.e AudioTrack + OpenSles) */ public static AudioOutput getAudioOutputFromDevice() { - if (!AndroidUtil.isGingerbreadOrLater()) { - return AudioOutput.AUDIOTRACK; - } else { - for (AudioOutputBySOC aoutBySOC : sAudioOutputBySOCList) { - final String prop = getSystemPropertyCached(aoutBySOC.key); - if (prop != null) { - if (prop.contains(aoutBySOC.value)) - return aoutBySOC.aout; - } + for (AudioOutputBySOC aoutBySOC : sAudioOutputBySOCList) { + final String prop = getSystemPropertyCached(aoutBySOC.key); + if (prop != null) { + if (prop.contains(aoutBySOC.value)) + return aoutBySOC.aout; } - return AudioOutput.ALL; } + return AudioOutput.ALL; } private static String getSystemPropertyCached(String key) { diff --git a/libvlc/src/org/videolan/libvlc/util/VLCUtil.java b/libvlc/src/org/videolan/libvlc/util/VLCUtil.java index 6208ec00e..faf565008 100644 --- a/libvlc/src/org/videolan/libvlc/util/VLCUtil.java +++ b/libvlc/src/org/videolan/libvlc/util/VLCUtil.java @@ -321,10 +321,7 @@ public class VLCUtil { libraryPaths = property.split(":"); } else { libraryPaths = new String[1]; - if (AndroidUtil.isGingerbreadOrLater()) - libraryPaths[0] = applicationInfo.nativeLibraryDir; - else - libraryPaths[0] = applicationInfo.dataDir + "/lib"; + libraryPaths[0] = applicationInfo.nativeLibraryDir; } if (libraryPaths[0] == null) { Log.e(TAG, "can't find library path"); diff --git a/vlc-android/src/org/videolan/vlc/PlaybackService.java b/vlc-android/src/org/videolan/vlc/PlaybackService.java index f6eae4e84..72de1be64 100644 --- a/vlc-android/src/org/videolan/vlc/PlaybackService.java +++ b/vlc-android/src/org/videolan/vlc/PlaybackService.java @@ -207,10 +207,6 @@ public class PlaybackService extends Service implements IVLCVout.Callback { return mp; } - private static boolean readPhoneState() { - return !AndroidUtil.isFroyoOrLater(); - } - @Override public void onCreate() { super.onCreate(); @@ -261,7 +257,7 @@ public class PlaybackService extends Service implements IVLCVout.Callback { boolean stealRemoteControl = mSettings.getBoolean("enable_steal_remote_control", false); - if (!AndroidUtil.isFroyoOrLater() || stealRemoteControl) { + if (stealRemoteControl) { /* Backward compatibility for API 7 */ filter = new IntentFilter(); if (stealRemoteControl) @@ -270,12 +266,6 @@ public class PlaybackService extends Service implements IVLCVout.Callback { mRemoteControlClientReceiver = new RemoteControlClientReceiver(); registerReceiver(mRemoteControlClientReceiver, filter); } - - if (readPhoneState()) { - initPhoneListener(); - TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); - tm.listen(mPhoneStateListener, mPhoneEvents); - } } @Override @@ -315,11 +305,6 @@ public class PlaybackService extends Service implements IVLCVout.Callback { mRemoteControlClientReceiver = null; } mMediaPlayer.release(); - - if (readPhoneState()) { - TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); - tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE); - } } @Override @@ -338,8 +323,7 @@ public class PlaybackService extends Service implements IVLCVout.Callback { return mMediaPlayer.getVLCVout(); } - private final OnAudioFocusChangeListener mAudioFocusListener = AndroidUtil.isFroyoOrLater() ? - createOnAudioFocusChangeListener() : null; + private final OnAudioFocusChangeListener mAudioFocusListener = createOnAudioFocusChangeListener(); @TargetApi(Build.VERSION_CODES.FROYO) private OnAudioFocusChangeListener createOnAudioFocusChangeListener() { @@ -1354,7 +1338,7 @@ public class PlaybackService extends Service implements IVLCVout.Callback { SharedPreferences.Editor editor = mSettings.edit(); editor.putInt(audio ? "position_in_audio_list" : "position_in_media_list", 0); editor.putLong(audio ? "position_in_song" : "position_in_media", 0); - Util.commitPreferences(editor); + editor.apply(); } private synchronized void saveCurrentMedia() { @@ -1365,7 +1349,7 @@ public class PlaybackService extends Service implements IVLCVout.Callback { } SharedPreferences.Editor editor = mSettings.edit(); editor.putString(audio ? "current_song" : "current_media", mMediaList.getMRL(Math.max(mCurrentIndex, 0))); - Util.commitPreferences(editor); + editor.apply(); } private synchronized void saveMediaList() { @@ -1381,7 +1365,7 @@ public class PlaybackService extends Service implements IVLCVout.Callback { //We save a concatenated String because putStringSet is APIv11. SharedPreferences.Editor editor = mSettings.edit(); editor.putString(audio ? "audio_list" : "media_list", locations.toString().trim()); - Util.commitPreferences(editor); + editor.apply(); } private synchronized void savePosition(){ @@ -1401,7 +1385,7 @@ public class PlaybackService extends Service implements IVLCVout.Callback { editor.putBoolean(PreferencesActivity.VIDEO_PAUSED, !isPlaying()); editor.putFloat(PreferencesActivity.VIDEO_SPEED, getRate()); } - Util.commitPreferences(editor); + editor.apply(); } private boolean validateLocation(String location) @@ -1949,7 +1933,7 @@ public class PlaybackService extends Service implements IVLCVout.Callback { public void setRate(float rate, boolean save) { mMediaPlayer.setRate(rate); if (save && mSettings.getBoolean(PreferencesActivity.KEY_AUDIO_PLAYBACK_SPEED_PERSIST, true)) - Util.commitPreferences(mSettings.edit().putFloat(PreferencesActivity.KEY_AUDIO_PLAYBACK_RATE, rate)); + mSettings.edit().putFloat(PreferencesActivity.KEY_AUDIO_PLAYBACK_RATE, rate).apply(); } @MainThread @@ -2218,21 +2202,4 @@ public class PlaybackService extends Service implements IVLCVout.Callback { startService(context); } } - - int mPhoneEvents = PhoneStateListener.LISTEN_CALL_STATE; - PhoneStateListener mPhoneStateListener; - - private void initPhoneListener() { - mPhoneStateListener = new PhoneStateListener(){ - @Override - public void onCallStateChanged(int state, String incomingNumber) { - if (!mMediaPlayer.isPlaying() || !hasCurrentMedia()) - return; - if (state == TelephonyManager.CALL_STATE_RINGING || state == TelephonyManager.CALL_STATE_OFFHOOK) - pause(); - else if (state == TelephonyManager.CALL_STATE_IDLE) - play(); - } - }; - } } diff --git a/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java b/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java index 8aea3700c..c5e2102b5 100644 --- a/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java +++ b/vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.java @@ -205,7 +205,7 @@ public class AudioPlayerContainerActivity extends AppCompatActivity implements P removeTipViewIfDisplayed(); SharedPreferences.Editor editor = mSettings.edit(); editor.putBoolean(settingKey, true); - Util.commitPreferences(editor); + editor.apply(); } }); } diff --git a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java index 03bb50cef..245da9367 100644 --- a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java +++ b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java @@ -67,7 +67,6 @@ import org.videolan.libvlc.util.AndroidUtil; import org.videolan.vlc.BuildConfig; import org.videolan.vlc.PlaybackService; import org.videolan.vlc.R; -import org.videolan.vlc.StartActivity; import org.videolan.vlc.VLCApplication; import org.videolan.vlc.extensions.ExtensionListing; import org.videolan.vlc.extensions.ExtensionManagerService; @@ -159,7 +158,7 @@ public class MainActivity extends AudioPlayerContainerActivity implements Filter if (mFirstRun) { Editor editor = mSettings.edit(); editor.putInt(PREF_FIRST_RUN, mVersionNumber); - Util.commitPreferences(editor); + editor.apply(); } Permissions.checkReadStoragePermission(this, false); @@ -414,7 +413,7 @@ public class MainActivity extends AudioPlayerContainerActivity implements Filter /* Save the tab status in pref */ SharedPreferences.Editor editor = mSettings.edit(); editor.putInt("fragment_id", mCurrentFragmentId); - Util.commitPreferences(editor); + editor.apply(); } protected void onSaveInstanceState(Bundle outState) { @@ -533,17 +532,14 @@ public class MainActivity extends AudioPlayerContainerActivity implements Filter MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.media_library, menu); - if (AndroidUtil.isFroyoOrLater()) { - SearchManager searchManager = - (SearchManager) VLCApplication.getAppContext().getSystemService(Context.SEARCH_SERVICE); - mSearchView = (SearchView) MenuItemCompat.getActionView(menu.findItem(R.id.ml_menu_search)); - mSearchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName())); - mSearchView.setQueryHint(getString(R.string.search_hint)); - SearchSuggestionsAdapter searchSuggestionsAdapter = new SearchSuggestionsAdapter(this, null); - searchSuggestionsAdapter.setFilterQueryProvider(this); - mSearchView.setSuggestionsAdapter(searchSuggestionsAdapter); - } else - menu.findItem(R.id.ml_menu_search).setVisible(false); + SearchManager searchManager = + (SearchManager) VLCApplication.getAppContext().getSystemService(Context.SEARCH_SERVICE); + mSearchView = (SearchView) MenuItemCompat.getActionView(menu.findItem(R.id.ml_menu_search)); + mSearchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName())); + mSearchView.setQueryHint(getString(R.string.search_hint)); + SearchSuggestionsAdapter searchSuggestionsAdapter = new SearchSuggestionsAdapter(this, null); + searchSuggestionsAdapter.setFilterQueryProvider(this); + mSearchView.setSuggestionsAdapter(searchSuggestionsAdapter); return super.onCreateOptionsMenu(menu); } diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java index 52126abef..daa3d16b2 100644 --- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java +++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java @@ -316,7 +316,7 @@ public class AudioPlayer extends PlaybackServiceFragment implements PlaybackServ if (mService.hasMedia() && !mService.isVideoPlaying()) { SharedPreferences mSettings= PreferenceManager.getDefaultSharedPreferences(getActivity()); if (isResumed() && mSettings.getBoolean(PreferencesActivity.VIDEO_RESTORE, false)){ - Util.commitPreferences(mSettings.edit().putBoolean(PreferencesActivity.VIDEO_RESTORE, false)); + mSettings.edit().putBoolean(PreferencesActivity.VIDEO_RESTORE, false).apply(); mService.switchToVideo(); return; } else diff --git a/vlc-android/src/org/videolan/vlc/gui/dialogs/VlcLoginDialog.java b/vlc-android/src/org/videolan/vlc/gui/dialogs/VlcLoginDialog.java index 12ee33d82..19b54f422 100644 --- a/vlc-android/src/org/videolan/vlc/gui/dialogs/VlcLoginDialog.java +++ b/vlc-android/src/org/videolan/vlc/gui/dialogs/VlcLoginDialog.java @@ -39,7 +39,6 @@ import org.videolan.vlc.databinding.VlcLoginDialogBinding; import org.videolan.vlc.gui.helpers.UiTools; import org.videolan.vlc.gui.preferences.PreferencesActivity; import org.videolan.vlc.util.AndroidDevices; -import org.videolan.vlc.util.Util; public class VlcLoginDialog extends VlcDialog implements View.OnFocusChangeListener { @@ -69,9 +68,7 @@ public class VlcLoginDialog extends VlcDialog