baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 3 Wiki Activity

Merge pull request #237 from DevFactory/release/general-code-quality-fix-2

Browse source 
General code quality fix-2
This commit is contained in:
Christian Schabesberger 2016-03-13 22:30:24 +01:00
parent 03738aeb27 2f9142419a
commit 6a8c4a65c5
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java
View file

@ -110,7 +110,7 @@ public class YoutubeSearchEngineTest extends AndroidTestCase {
}
public void testIfSuggestionsAreReplied() {
assertEquals(suggestionReply.size() > 0, true);
assertEquals(!suggestionReply.isEmpty(), true);
}
public void testIfSuggestionsAreValid() {

2
app/src/main/java/org/schabi/newpipe/DownloadDialog.java
View file

@ -130,7 +130,7 @@ public class DownloadDialog extends DialogFragment {
private String createFileName(String fName) {
// from http://eng-przemelek.blogspot.de/2009/07/how-to-create-valid-file-name.html
List<String> forbiddenCharsPatterns = new ArrayList<String> ();
List<String> forbiddenCharsPatterns = new ArrayList<> ();
forbiddenCharsPatterns.add("[:]+"); // Mac OS, but it looks that also Windows XP
forbiddenCharsPatterns.add("[\\*\"/\\\\\\[\\]\\:\\;\\|\\=\\,]+"); // Windows
forbiddenCharsPatterns.add("[^\\w\\d\\.]+"); // last chance... only latin letters and digits

2
app/src/main/java/org/schabi/newpipe/extractor/StreamInfo.java
View file

@ -127,7 +127,7 @@ public class StreamInfo extends AbstractVideoInfo {
// also try to get streams from the dashMpd
if(streamInfo.dashMpdUrl != null && !streamInfo.dashMpdUrl.isEmpty()) {
if(streamInfo.audio_streams == null) {
streamInfo.audio_streams = new Vector<AudioStream>();
streamInfo.audio_streams = new Vector<>();
}
//todo: make this quick and dirty solution a real fallback
// same as the quick and dirty aboth

3
app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
View file

@ -569,9 +569,8 @@ public class YoutubeStreamExtractor extends StreamExtractor {
int hours = hoursString.isEmpty() ? 0 : Integer.parseInt(hoursString);
//don't trust BODMAS!
int ret = seconds + (60 * minutes) + (3600 * hours);
return seconds + (60 * minutes) + (3600 * hours);
//Log.d(TAG, "derived timestamp value:"+ret);
return ret;
//the ordering varies internationally
} catch (ParsingException e) {
throw new ParsingException("Could not get timestamp.", e);