Merge pull request #3817 from Isira-Seneviratne/Use_Java_8_APIs

Use Java 8 APIs.

app/build.gradle

@@ -65,6 +65,9 @@ android {
     }
 
     compileOptions {
+        // Flag to enable support for the new language APIs
+        coreLibraryDesugaringEnabled true
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
         encoding 'utf-8'
@@ -144,6 +147,8 @@ afterEvaluate {
 }
 
 dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     implementation "frankiesardo:icepick:${icepickVersion}"

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

@@ -19,6 +19,7 @@ import org.schabi.newpipe.util.ShareUtils;
 
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Comparator;
 
 /**
  * Fragment containing the software licenses.
@@ -64,7 +65,7 @@ public class LicenseFragment extends Fragment {
             }
         }
         // Sort components by name
-        Arrays.sort(softwareComponents, (o1, o2) -> o1.getName().compareTo(o2.getName()));
+        Arrays.sort(softwareComponents, Comparator.comparing(SoftwareComponent::getName));
     }
 
     @Nullable

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistLocalItem.java

@@ -5,6 +5,7 @@ import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 public interface PlaylistLocalItem extends LocalItem {
@@ -18,15 +19,8 @@ public interface PlaylistLocalItem extends LocalItem {
         items.addAll(localPlaylists);
         items.addAll(remotePlaylists);
 
-        Collections.sort(items, (left, right) -> {
+        Collections.sort(items, Comparator.comparing(PlaylistLocalItem::getOrderingName,
-            final String on1 = left.getOrderingName();
+                Comparator.nullsLast(String.CASE_INSENSITIVE_ORDER)));
-            final String on2 = right.getOrderingName();
-            if (on1 == null) {
-                return on2 == null ? 0 : 1;
-            } else {
-                return on2 == null ? -1 : on1.compareToIgnoreCase(on2);
-            }
-        });
 
         return items;
     }

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

@@ -50,7 +50,6 @@ import org.schabi.newpipe.util.ShareUtils;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -495,13 +494,12 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
 
             // handling ContentNotSupportedException not to show the error but an appropriate string
             // so that crashes won't be sent uselessly and the user will understand what happened
-            for (Iterator<Throwable> it = errors.iterator(); it.hasNext();) {
+            errors.removeIf(throwable -> {
-                final Throwable throwable = it.next();
                 if (throwable instanceof ContentNotSupportedException) {
                     showContentNotSupported();
-                    it.remove();
-                }
                 }
+                return throwable instanceof ContentNotSupportedException;
+            });
 
             if (!errors.isEmpty()) {
                 showSnackBarError(errors, UserAction.REQUESTED_CHANNEL,

app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java

@@ -61,7 +61,6 @@ import org.schabi.newpipe.util.ServiceHelper;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
@@ -758,16 +757,9 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
                         }
 
                         // Remove duplicates
-                        final Iterator<SuggestionItem> iterator = networkResult.iterator();
+                        networkResult.removeIf(networkItem ->
-                        while (iterator.hasNext() && localResult.size() > 0) {
+                                localResult.stream().anyMatch(localItem ->
-                            final SuggestionItem next = iterator.next();
+                                        localItem.query.equals(networkItem.query)));
-                            for (final SuggestionItem item : localResult) {
-                                if (item.query.equals(next.query)) {
-                                    iterator.remove();
-                                    break;
-                                }
-                            }
-                        }
 
                         if (networkResult.size() > 0) {
                             result.addAll(networkResult);

app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java

@@ -43,6 +43,7 @@ import org.schabi.newpipe.util.ThemeHelper;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import icepick.State;
@@ -68,18 +69,19 @@ public class StatisticsPlaylistFragment
     private HistoryRecordManager recordManager;
 
     private List<StreamStatisticsEntry> processResult(final List<StreamStatisticsEntry> results) {
+        final Comparator<StreamStatisticsEntry> comparator;
         switch (sortMode) {
             case LAST_PLAYED:
-                Collections.sort(results, (left, right) ->
+                comparator = Comparator.comparing(StreamStatisticsEntry::getLatestAccessDate);
-                        right.getLatestAccessDate().compareTo(left.getLatestAccessDate()));
+                break;
-                return results;
             case MOST_PLAYED:
-                Collections.sort(results, (left, right) ->
+                comparator = Comparator.comparingLong(StreamStatisticsEntry::getWatchCount);
-                        Long.compare(right.getWatchCount(), left.getWatchCount()));
+                break;
-                return results;
             default:
                 return null;
         }
+        Collections.sort(results, comparator.reversed());
+        return results;
     }
 
     ///////////////////////////////////////////////////////////////////////////

app/src/main/java/org/schabi/newpipe/util/ListHelper.java

@@ -18,6 +18,7 @@ import org.schabi.newpipe.extractor.stream.VideoStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 
@@ -265,10 +266,8 @@ public final class ListHelper {
      */
     private static void sortStreamList(final List<VideoStream> videoStreams,
                                        final boolean ascendingOrder) {
-        Collections.sort(videoStreams, (o1, o2) -> {
+        final Comparator<VideoStream> comparator = ListHelper::compareVideoStreamResolution;
-            final int result = compareVideoStreamResolution(o1, o2);
+        Collections.sort(videoStreams, ascendingOrder ? comparator : comparator.reversed());
-            return result == 0 ? 0 : (ascendingOrder ? result : -result);
-        });
     }
 
     /**

app/src/main/java/us/shandian/giga/get/Mission.java

@@ -35,6 +35,10 @@ public abstract class Mission implements Serializable {
      */
     public StoredFileHelper storage;
 
+    public long getTimestamp() {
+        return timestamp;
+    }
+
     /**
      * Delete the downloaded file
      *

app/src/main/java/us/shandian/giga/service/DownloadManager.java

@@ -12,7 +12,8 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
+import java.util.Comparator;
+import java.util.List;
 
 import us.shandian.giga.get.DownloadMission;
 import us.shandian.giga.get.FinishedMission;
@@ -198,7 +199,7 @@ public class DownloadManager {
         }
 
         if (mMissionsPending.size() > 1)
-            Collections.sort(mMissionsPending, (mission1, mission2) -> Long.compare(mission1.timestamp, mission2.timestamp));
+            Collections.sort(mMissionsPending, Comparator.comparingLong(Mission::getTimestamp));
     }
 
     /**
@@ -563,14 +564,10 @@ public class DownloadManager {
             synchronized (DownloadManager.this) {
                 ArrayList<Mission> pending = new ArrayList<>(mMissionsPending);
                 ArrayList<Mission> finished = new ArrayList<>(mMissionsFinished);
-                ArrayList<Mission> remove = new ArrayList<>(hidden);
+                List<Mission> remove = new ArrayList<>(hidden);
 
                 // hide missions (if required)
-                Iterator<Mission> iterator = remove.iterator();
+                remove.removeIf(mission -> pending.remove(mission) || finished.remove(mission));
-                while (iterator.hasNext()) {
-                    Mission mission = iterator.next();
-                    if (pending.remove(mission) || finished.remove(mission)) iterator.remove();
-                }
 
                 int fakeTotal = pending.size();
                 if (fakeTotal > 0) fakeTotal++;

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

checkstyle-suppressions.xml

@@ -13,7 +13,7 @@
 
   <suppress checks="FinalParameters"
       files="ListHelper.java"
-      lines="282,314"/>
+      lines="281,313"/>
 
   <!-- org.schabi.newpipe.streams -->
   <suppress checks="LineLength"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri May 01 19:39:41 CEST 2020
+#Sat Oct 17 06:10:46 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip