Merge pull request #3909 from TacoTheDank/deprecations-and-cleanup

Deprecations and cleanup

app/build.gradle

@@ -84,7 +84,7 @@ ext {
  checkstyleVersion = '8.32'
  stethoVersion = '1.5.1'
  leakCanaryVersion = '2.2'
- exoPlayerVersion = '2.11.6'
+ exoPlayerVersion = '2.11.8'
  androidxLifecycleVersion = '2.2.0'
  androidxRoomVersion = '2.2.5'
  groupieVersion = '2.8.0'
@@ -139,7 +139,7 @@ afterEvaluate {
 }
 
 dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
  implementation "frankiesardo:icepick:${icepickVersion}"
  kapt "frankiesardo:icepick-processor:${icepickVersion}"
@@ -169,7 +169,7 @@ dependencies {
  implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
  implementation "org.jsoup:jsoup:1.13.1"
 
- implementation "com.squareup.okhttp3:okhttp:3.12.11"
+ implementation "com.squareup.okhttp3:okhttp:3.12.12"
 
  implementation "com.google.android.exoplayer:exoplayer:${exoPlayerVersion}"
  implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerVersion}"
@@ -187,7 +187,6 @@ dependencies {
 
  implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
  implementation "androidx.lifecycle:lifecycle-viewmodel:${androidxLifecycleVersion}"
- implementation "androidx.lifecycle:lifecycle-extensions:${androidxLifecycleVersion}"
 
  implementation "androidx.room:room-runtime:${androidxRoomVersion}"
  implementation "androidx.room:room-rxjava2:${androidxRoomVersion}"

app/src/androidTest/java/org/schabi/newpipe/report/ErrorInfoTest.java

@@ -2,9 +2,9 @@
 
 import android.os.Parcel;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 
-import androidx.test.runner.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.schabi.newpipe.R;

app/src/main/java/androidx/fragment/app/FragmentStatePagerAdapterMenuWorkaround.java

@@ -300,8 +300,8 @@ public void restoreState(@Nullable final Parcelable state, @Nullable final Class
  mSavedState.clear();
  mFragments.clear();
  if (fss != null) {
- for (int i = 0; i < fss.length; i++) {
- mSavedState.add((Fragment.SavedState) fss[i]);
+ for (final Parcelable parcelable : fss) {
+ mSavedState.add((Fragment.SavedState) parcelable);
  }
  }
  final Iterable<String> keys = bundle.keySet();

app/src/main/java/org/schabi/newpipe/App.java

@@ -220,7 +220,7 @@ protected void initACRA() {
  }
 
  public void initNotificationChannel() {
- if (Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.O) {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
  return;
  }
 

app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java

@@ -11,7 +11,7 @@
 import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import android.util.Log;
 
 import androidx.core.app.NotificationCompat;

app/src/main/java/org/schabi/newpipe/DownloaderImpl.java

@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -114,8 +114,8 @@ private static void enableModernTLS(final OkHttpClient.Builder builder) {
  // Necessary because some servers (e.g. Framatube.org)
  // don't support the old cipher suites.
  // https:/square/okhttp/issues/4053#issuecomment-402579554
- final List<CipherSuite> cipherSuites = new ArrayList<>();
- cipherSuites.addAll(ConnectionSpec.MODERN_TLS.cipherSuites());
+ final List<CipherSuite> cipherSuites =
+  new ArrayList<>(ConnectionSpec.MODERN_TLS.cipherSuites());
  cipherSuites.add(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA);
  cipherSuites.add(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA);
  final ConnectionSpec legacyTLS = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)

app/src/main/java/org/schabi/newpipe/ExitActivity.java

@@ -42,7 +42,7 @@ public static void exitAndRemoveFromRecentApps(final Activity activity) {
  protected void onCreate(final Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
 
- if (Build.VERSION.SDK_INT >= 21) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
  finishAndRemoveTask();
  } else {
  finish();

app/src/main/java/org/schabi/newpipe/ImageDownloader.java

@@ -4,7 +4,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 
 import com.nostra13.universalimageloader.core.download.BaseImageDownloader;
 

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -27,7 +27,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import android.util.Log;
 
 import android.view.KeyEvent;

app/src/main/java/org/schabi/newpipe/PanicResponderActivity.java

@@ -40,7 +40,7 @@ protected void onCreate(final Bundle savedInstanceState) {
  ExitActivity.exitAndRemoveFromRecentApps(this);
  }
 
- if (Build.VERSION.SDK_INT >= 21) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
  finishAndRemoveTask();
  } else {
  finish();

app/src/main/java/org/schabi/newpipe/RouterActivity.java

@@ -8,7 +8,7 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -492,12 +492,8 @@ private void openDownloadDialog() {
  downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);
  downloadDialog.show(fm, "downloadDialog");
  fm.executePendingTransactions();
- downloadDialog.getDialog().setOnDismissListener(dialog -> {
- finish();
- });
- }, (@NonNull Throwable throwable) -> {
- onError();
- });
+ downloadDialog.getDialog().setOnDismissListener(dialog -> finish());
+ }, (@NonNull Throwable throwable) -> onError());
  }
 
  @Override
@@ -572,7 +568,7 @@ protected String[] getUris(final String sharedText) {
  }
  }
  }
- return result.toArray(new String[result.size()]);
+ return result.toArray(new String[0]);
  }
 
  private static class AdapterChoiceItem {

app/src/main/java/org/schabi/newpipe/about/AboutActivity.java

@@ -167,7 +167,7 @@ public View onCreateView(final LayoutInflater inflater, final ViewGroup containe
  */
  public class SectionsPagerAdapter extends FragmentPagerAdapter {
  public SectionsPagerAdapter(final FragmentManager fm) {
- super(fm);
+ super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
  }
 
  @Override

app/src/main/java/org/schabi/newpipe/database/BasicDAO.java

@@ -14,13 +14,13 @@
 @Dao
 public interface BasicDAO<Entity> {
  /* Inserts */
- @Insert(onConflict = OnConflictStrategy.FAIL)
+ @Insert(onConflict = OnConflictStrategy.ABORT)
  long insert(Entity entity);
 
- @Insert(onConflict = OnConflictStrategy.FAIL)
+ @Insert(onConflict = OnConflictStrategy.ABORT)
  List<Long> insertAll(Entity... entities);
 
- @Insert(onConflict = OnConflictStrategy.FAIL)
+ @Insert(onConflict = OnConflictStrategy.ABORT)
  List<Long> insertAll(Collection<Entity> entities);
 
  /* Searches */

app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java

@@ -1,6 +1,5 @@
 package org.schabi.newpipe.download;
 
-import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
@@ -11,6 +10,7 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.FragmentTransaction;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.DeviceUtils;

app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java

@@ -10,7 +10,7 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
@@ -295,7 +295,7 @@ public void onViewCreated(@NonNull final View view, @Nullable final Bundle saved
  initToolbar(view.findViewById(R.id.toolbar));
  setupDownloadOptions();
 
- prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+ prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
 
  final int threads = prefs.getInt(getString(R.string.default_download_threads), 3);
  threadsCountTextView.setText(String.valueOf(threads));

app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java

@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -74,7 +74,7 @@ public void onCreate(final Bundle savedInstanceState) {
 
  youtubeRestrictedModeEnabledKey = getString(R.string.youtube_restricted_mode_enabled);
  previousYoutubeRestrictedModeEnabled =
- PreferenceManager.getDefaultSharedPreferences(getContext())
+ PreferenceManager.getDefaultSharedPreferences(requireContext())
  .getBoolean(youtubeRestrictedModeEnabledKey, false);
  }
 
@@ -105,7 +105,7 @@ public void onResume() {
  super.onResume();
 
  final boolean youtubeRestrictedModeEnabled =
- PreferenceManager.getDefaultSharedPreferences(getContext())
+ PreferenceManager.getDefaultSharedPreferences(requireContext())
  .getBoolean(youtubeRestrictedModeEnabledKey, false);
  if (previousYoutubeRestrictedModeEnabled != youtubeRestrictedModeEnabled) {
  previousYoutubeRestrictedModeEnabled = youtubeRestrictedModeEnabled;

app/src/main/java/org/schabi/newpipe/fragments/detail/TabAdaptor.java → app/src/main/java/org/schabi/newpipe/fragments/detail/TabAdapter.java

@@ -2,6 +2,7 @@
 
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -10,16 +11,20 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class TabAdaptor extends FragmentPagerAdapter {
+public class TabAdapter extends FragmentPagerAdapter {
  private final List<Fragment> mFragmentList = new ArrayList<>();
  private final List<String> mFragmentTitleList = new ArrayList<>();
  private final FragmentManager fragmentManager;
 
- public TabAdaptor(final FragmentManager fm) {
- super(fm);
+ public TabAdapter(final FragmentManager fm) {
+ // if changed to BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT => crash if enqueueing stream in
+ // the background and then clicking on it to open VideoDetailFragment:
+ // "Cannot setMaxLifecycle for Fragment not attached to FragmentManager"
+ super(fm, BEHAVIOR_SET_USER_VISIBLE_HINT);
  this.fragmentManager = fm;
  }
 
+ @NonNull
  @Override
  public Fragment getItem(final int position) {
  return mFragmentList.get(position);
@@ -57,7 +62,7 @@ public void updateItem(final String title, final Fragment fragment) {
  }
 
  @Override
- public int getItemPosition(final Object object) {
+ public int getItemPosition(@NonNull final Object object) {
  if (mFragmentList.contains(object)) {
  return mFragmentList.indexOf(object);
  } else {
@@ -82,7 +87,9 @@ public void notifyDataSetUpdate() {
  }
 
  @Override
- public void destroyItem(final ViewGroup container, final int position, final Object object) {
+ public void destroyItem(@NonNull final ViewGroup container,
+ final int position,
+ @NonNull final Object object) {
  fragmentManager.beginTransaction().remove((Fragment) object).commitNowAllowingStateLoss();
  }
 

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -16,9 +16,9 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
-import android.preference.PreferenceManager;
+import androidx.core.text.HtmlCompat;
+import androidx.preference.PreferenceManager;
 import android.provider.Settings;
-import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.util.Linkify;
@@ -244,7 +244,7 @@ public class VideoDetailFragment
 
  private AppBarLayout appBarLayout;
  private ViewPager viewPager;
- private TabAdaptor pageAdapter;
+ private TabAdapter pageAdapter;
  private TabLayout tabLayout;
  private FrameLayout relatedStreamsLayout;
 
@@ -427,7 +427,7 @@ public void onPause() {
  currentWorker.dispose();
  }
  saveCurrentAndRestoreDefaultBrightness();
- PreferenceManager.getDefaultSharedPreferences(getContext())
+ PreferenceManager.getDefaultSharedPreferences(requireContext())
  .edit()
  .putString(getString(R.string.stream_info_selected_tab_key),
  pageAdapter.getItemTitle(viewPager.getCurrentItem()))
@@ -553,7 +553,6 @@ protected void onRestoreInstanceState(@NonNull final Bundle savedState) {
 
  Serializable serializable = savedState.getSerializable(INFO_KEY);
  if (serializable instanceof StreamInfo) {
- //noinspection unchecked
  currentInfo = (StreamInfo) serializable;
  InfoCache.getInstance().putInfo(serviceId, url, currentInfo, InfoItem.InfoType.STREAM);
  }
@@ -673,7 +672,8 @@ public boolean onLongClick(final View v) {
  }
  break;
  case R.id.detail_title_root_layout:
- ShareUtils.copyToClipboard(getContext(), videoTitleTextView.getText().toString());
+ ShareUtils.copyToClipboard(requireContext(),
+ videoTitleTextView.getText().toString());
  break;
  }
 
@@ -752,7 +752,7 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
 
  appBarLayout = rootView.findViewById(R.id.appbarlayout);
  viewPager = rootView.findViewById(R.id.viewpager);
- pageAdapter = new TabAdaptor(getChildFragmentManager());
+ pageAdapter = new TabAdapter(getChildFragmentManager());
  viewPager.setAdapter(pageAdapter);
  tabLayout = rootView.findViewById(R.id.tablayout);
  tabLayout.setupWithViewPager(viewPager);
@@ -1106,7 +1106,7 @@ private void openBackgroundPlayer(final boolean append) {
  player.toggleFullscreen();
  }
 
- if (!useExternalAudioPlayer && android.os.Build.VERSION.SDK_INT >= 16) {
+ if (!useExternalAudioPlayer) {
  openNormalBackgroundPlayer(append);
  } else {
  startOnExternalPlayer(activity, currentInfo, audioStream);
@@ -1303,24 +1303,17 @@ private void prepareDescription(final Description description) {
 
  if (description.getType() == Description.HTML) {
  disposables.add(Single.just(description.getContent())
- .map((@NonNull String descriptionText) -> {
- final Spanned parsedDescription;
- if (Build.VERSION.SDK_INT >= 24) {
- parsedDescription = Html.fromHtml(descriptionText, 0);
- } else {
- //noinspection deprecation
- parsedDescription = Html.fromHtml(descriptionText);
- }
- return parsedDescription;
- })
+ .map((@NonNull final String descriptionText) ->
+ HtmlCompat.fromHtml(descriptionText,
+ HtmlCompat.FROM_HTML_MODE_LEGACY))
  .subscribeOn(Schedulers.computation())
  .observeOn(AndroidSchedulers.mainThread())
- .subscribe((@NonNull Spanned spanned) -> {
+ .subscribe((@NonNull final Spanned spanned) -> {
  videoDescriptionView.setText(spanned);
  videoDescriptionView.setVisibility(View.VISIBLE);
  }));
  } else if (description.getType() == Description.MARKDOWN) {
- final Markwon markwon = Markwon.builder(getContext())
+ final Markwon markwon = Markwon.builder(requireContext())
  .usePlugin(LinkifyPlugin.create())
  .build();
  markwon.setMarkdown(videoDescriptionView, description.getContent());