Java language level + javadoc + xml

replace with <>
String builder

BUILD SUCCESSFUL in 4s
39 actionable tasks: 4 executed, 35 up-to-date

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

@@ -179,12 +179,16 @@ public class RouterActivity extends AppCompatActivity {
         if (selectedChoiceKey.equals(alwaysAskKey)) {
             final List<AdapterChoiceItem> choices = getChoicesForService(currentService, currentLinkType);
 
-            if (choices.size() == 1) {
-                handleChoice(choices.get(0).key);
-            } else if (choices.size() == 0) {
-                handleChoice(showInfoKey);
-            } else {
-                showDialog(choices);
+            switch (choices.size()) {
+                case 1:
+                    handleChoice(choices.get(0).key);
+                    break;
+                case 0:
+                    handleChoice(showInfoKey);
+                    break;
+                default:
+                    showDialog(choices);
+                    break;
             }
         } else if (selectedChoiceKey.equals(showInfoKey)) {
             handleChoice(showInfoKey);

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

@@ -77,18 +77,18 @@ public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {
             throw new NullPointerException("license is null");
         }
 
-        String licenseContent = "";
+        StringBuilder licenseContent = new StringBuilder();
         String webViewData;
         try {
             BufferedReader in = new BufferedReader(new InputStreamReader(context.getAssets().open(license.getFilename()), "UTF-8"));
             String str;
             while ((str = in.readLine()) != null) {
-                licenseContent += str;
+                licenseContent.append(str);
             }
             in.close();
 
             // split the HTML file and insert the stylesheet into the HEAD of the file
-            String[] insert = licenseContent.split("</head>");
+            String[] insert = licenseContent.toString().split("</head>");
             webViewData = insert[0] + "<style type=\"text/css\">"
                     + getLicenseStylesheet(context) + "</style></head>"
                     + insert[1];

app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java

@@ -144,12 +144,16 @@ public class SubscriptionsImportService extends BaseImportExportService {
         showToast(R.string.import_ongoing);
 
         Flowable<List<SubscriptionItem>> flowable = null;
-        if (currentMode == CHANNEL_URL_MODE) {
-            flowable = importFromChannelUrl();
-        } else if (currentMode == INPUT_STREAM_MODE) {
-            flowable = importFromInputStream();
-        } else if (currentMode == PREVIOUS_EXPORT_MODE) {
-            flowable = importFromPreviousExport();
+        switch (currentMode) {
+            case CHANNEL_URL_MODE:
+                flowable = importFromChannelUrl();
+                break;
+            case INPUT_STREAM_MODE:
+                flowable = importFromInputStream();
+                break;
+            case PREVIOUS_EXPORT_MODE:
+                flowable = importFromPreviousExport();
+                break;
         }
 
         if (flowable == null) {

app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java

@@ -274,15 +274,14 @@ public class ErrorActivity extends AppCompatActivity {
     }
 
     private String formErrorText(String[] el) {
-        String text = "";
+        StringBuilder text = new StringBuilder();
         if (el != null) {
             for (String e : el) {
-                text += "-------------------------------------\n"
-                        + e;
+                text.append("-------------------------------------\n").append(e);
             }
         }
-        text += "-------------------------------------";
-        return text;
+        text.append("-------------------------------------");
+        return text.toString();
     }
 
     /**

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

@@ -56,7 +56,6 @@ public class ZipHelper {
     /**
      * This will extract data from Zipfiles.
      * Caution this will override the original file.
-     * @param inZip The ZipOutputStream where the data is stored in
      * @param file The path of the file on the disk where the data should be extracted to.
      * @param name The path of the file inside the zip.
      * @return will return true if the file was found within the zip file

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

@@ -123,7 +123,7 @@ public class DownloadManagerImpl implements DownloadManager {
         Collections.sort(missions, new Comparator<DownloadMission>() {
             @Override
             public int compare(DownloadMission o1, DownloadMission o2) {
-                return Long.valueOf(o1.timestamp).compareTo(o2.timestamp);
+                return Long.compare(o1.timestamp, o2.timestamp);
             }
         });
     }

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

@@ -67,8 +67,8 @@ public class DownloadMission implements Serializable {
     public long done;
     public int threadCount = 3;
     public int finishCount;
-    private final List<Long> threadPositions = new ArrayList<Long>();
-    public final Map<Long, Boolean> blockState = new HashMap<Long, Boolean>();
+    private final List<Long> threadPositions = new ArrayList<>();
+    public final Map<Long, Boolean> blockState = new HashMap<>();
     public boolean running;
     public boolean finished;
     public boolean fallback;
@@ -77,7 +77,7 @@ public class DownloadMission implements Serializable {
 
     public transient boolean recovered;
 
-    private transient ArrayList<WeakReference<MissionListener>> mListeners = new ArrayList<WeakReference<MissionListener>>();
+    private transient ArrayList<WeakReference<MissionListener>> mListeners = new ArrayList<>();
     private transient boolean mWritingToFile;
 
     private static final int NO_IDENTIFIER = -1;
@@ -232,7 +232,7 @@ public class DownloadMission implements Serializable {
     public synchronized void addListener(MissionListener listener) {
         Handler handler = new Handler(Looper.getMainLooper());
         MissionListener.handlerStore.put(listener, handler);
-        mListeners.add(new WeakReference<MissionListener>(listener));
+        mListeners.add(new WeakReference<>(listener));
     }
 
     public synchronized void removeListener(MissionListener listener) {