mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-23 16:40:32 +00:00
Merge pull request #321 from DevFactory/release/collection-interfaces-should-be-used-fix-1
Code quality fix - Declarations should use Java collection interfaces such as "List" rather than specific implementation.
This commit is contained in:
commit
d3d4e8c721
@ -11,7 +11,7 @@ import org.schabi.newpipe.Downloader;
|
|||||||
|
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.io.StringWriter;
|
import java.io.StringWriter;
|
||||||
import java.util.ArrayList;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by Christian Schabesberger on 29.12.15.
|
* Created by Christian Schabesberger on 29.12.15.
|
||||||
@ -35,7 +35,7 @@ import java.util.ArrayList;
|
|||||||
|
|
||||||
public class YoutubeSearchEngineTest extends AndroidTestCase {
|
public class YoutubeSearchEngineTest extends AndroidTestCase {
|
||||||
private SearchResult result;
|
private SearchResult result;
|
||||||
private ArrayList<String> suggestionReply;
|
private List<String> suggestionReply;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setUp() throws Exception{
|
public void setUp() throws Exception{
|
||||||
|
@ -10,6 +10,7 @@ import android.view.ViewGroup;
|
|||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by Madiyar on 23.02.2016.
|
* Created by Madiyar on 23.02.2016.
|
||||||
@ -59,7 +60,7 @@ public class SuggestionListAdapter extends CursorAdapter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void updateAdapter(ArrayList<String> suggestions) {
|
public void updateAdapter(List<String> suggestions) {
|
||||||
MatrixCursor cursor = new MatrixCursor(columns);
|
MatrixCursor cursor = new MatrixCursor(columns);
|
||||||
int i = 0;
|
int i = 0;
|
||||||
for (String s : suggestions) {
|
for (String s : suggestions) {
|
||||||
|
@ -25,7 +25,7 @@ import org.schabi.newpipe.extractor.ServiceList;
|
|||||||
import org.schabi.newpipe.extractor.StreamingService;
|
import org.schabi.newpipe.extractor.StreamingService;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.List;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -143,9 +143,9 @@ public class VideoItemListActivity extends AppCompatActivity
|
|||||||
|
|
||||||
private class SuggestionResultRunnable implements Runnable{
|
private class SuggestionResultRunnable implements Runnable{
|
||||||
|
|
||||||
private ArrayList<String>suggestions;
|
private List<String> suggestions;
|
||||||
|
|
||||||
private SuggestionResultRunnable(ArrayList<String> suggestions) {
|
private SuggestionResultRunnable(List<String> suggestions) {
|
||||||
this.suggestions = suggestions;
|
this.suggestions = suggestions;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -175,7 +175,7 @@ public class VideoItemListActivity extends AppCompatActivity
|
|||||||
String searchLanguageKey = context.getString(R.string.search_language_key);
|
String searchLanguageKey = context.getString(R.string.search_language_key);
|
||||||
String searchLanguage = sp.getString(searchLanguageKey,
|
String searchLanguage = sp.getString(searchLanguageKey,
|
||||||
getString(R.string.default_language_value));
|
getString(R.string.default_language_value));
|
||||||
ArrayList<String>suggestions = engine.suggestionList(query,searchLanguage,new Downloader());
|
List<String> suggestions = engine.suggestionList(query,searchLanguage,new Downloader());
|
||||||
h.post(new SuggestionResultRunnable(suggestions));
|
h.post(new SuggestionResultRunnable(suggestions));
|
||||||
} catch (ExtractionException e) {
|
} catch (ExtractionException e) {
|
||||||
ErrorActivity.reportError(h, VideoItemListActivity.this, e, null, findViewById(R.id.videoitem_list),
|
ErrorActivity.reportError(h, VideoItemListActivity.this, e, null, findViewById(R.id.videoitem_list),
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
package org.schabi.newpipe.extractor;
|
package org.schabi.newpipe.extractor;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Vector;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by Christian Schabesberger on 10.08.15.
|
* Created by Christian Schabesberger on 10.08.15.
|
||||||
@ -43,7 +41,7 @@ public abstract class SearchEngine {
|
|||||||
return collector;
|
return collector;
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract ArrayList<String> suggestionList(
|
public abstract List<String> suggestionList(
|
||||||
String query,String contentCountry, Downloader dl)
|
String query,String contentCountry, Downloader dl)
|
||||||
throws ExtractionException, IOException;
|
throws ExtractionException, IOException;
|
||||||
|
|
||||||
|
@ -22,6 +22,7 @@ import java.net.URLEncoder;
|
|||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import javax.xml.parsers.DocumentBuilder;
|
import javax.xml.parsers.DocumentBuilder;
|
||||||
import javax.xml.parsers.DocumentBuilderFactory;
|
import javax.xml.parsers.DocumentBuilderFactory;
|
||||||
@ -130,10 +131,10 @@ public class YoutubeSearchEngine extends SearchEngine {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ArrayList<String> suggestionList(String query, String contentCountry, Downloader dl)
|
public List<String> suggestionList(String query, String contentCountry, Downloader dl)
|
||||||
throws IOException, ParsingException {
|
throws IOException, ParsingException {
|
||||||
|
|
||||||
ArrayList<String> suggestions = new ArrayList<>();
|
List<String> suggestions = new ArrayList<>();
|
||||||
|
|
||||||
/* Cant use Uri.Bilder since it's android code.
|
/* Cant use Uri.Bilder since it's android code.
|
||||||
// Android code is baned from the extractor side.
|
// Android code is baned from the extractor side.
|
||||||
|
@ -12,6 +12,8 @@ import java.lang.ref.WeakReference;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
import us.shandian.giga.util.Utility;
|
import us.shandian.giga.util.Utility;
|
||||||
import static org.schabi.newpipe.BuildConfig.DEBUG;
|
import static org.schabi.newpipe.BuildConfig.DEBUG;
|
||||||
@ -39,8 +41,8 @@ public class DownloadMission
|
|||||||
public long done;
|
public long done;
|
||||||
public int threadCount = 3;
|
public int threadCount = 3;
|
||||||
public int finishCount;
|
public int finishCount;
|
||||||
public ArrayList<Long> threadPositions = new ArrayList<Long>();
|
public List<Long> threadPositions = new ArrayList<Long>();
|
||||||
public HashMap<Long, Boolean> blockState = new HashMap<Long, Boolean>();
|
public Map<Long, Boolean> blockState = new HashMap<Long, Boolean>();
|
||||||
public boolean running;
|
public boolean running;
|
||||||
public boolean finished;
|
public boolean finished;
|
||||||
public boolean fallback;
|
public boolean fallback;
|
||||||
|
Loading…
Reference in New Issue
Block a user