Merge pull request #24 from KaustubhPatange/master

YouTube extraction not working.

YoutubeExtractor/app/src/main/java/com/naveed/ytextractor/model/YTMedia.java

@@ -16,27 +16,18 @@ public class YTMedia
 	double approxDurationMs;
 	int audioChannels;
 	int audioSampleRate;
-	String cipher;
+	String signatureCipher;
 	String audioQuality;
 	String url;
 	int fps;
-	boolean isVideo;
 
-
-	public boolean isVideo() {
-		return getMimeType().contains("video");
-	}
-
 	public void setFps(int fps) {
 		this.fps = fps;
 	}
 
 	public int getFps() {
 		return fps;
 	}
-
-
-
 
 	public void setItag(int itag)
 	{
@@ -178,14 +169,14 @@ public int getAudioSampleRate()
 		return audioSampleRate;
 	}
 
-	public void setCipher(String cipher)
+	public void setSignatureCipher(String signatureCipher)
 	{
-		this.cipher = cipher;
+		this.signatureCipher = signatureCipher;
 	}
 
-	public String getCipher()
+	public String getSignatureCipher()
 	{
-		return cipher;
+		return signatureCipher;
 	}
 
 	public void setAudioQuality(String audioQuality)
@@ -207,11 +198,11 @@ public String getUrl()
 	{
 		return url;
 	}
-	
+
 	public boolean useCipher(){
-		
-		return (cipher!=null && cipher.contains("s="));
-		
+
+		return (signatureCipher !=null && signatureCipher.contains("s="));
+
 	}
-	
+
 }

YoutubeExtractor/app/src/main/java/com/naveed/ytextractor/utils/Utils.java

@@ -3,6 +3,8 @@
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
+import android.util.Log;
+
 import com.naveed.ytextractor.model.YTMedia;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +36,7 @@ public static String extractVideoID(String Url) {
 
 	public static boolean isListContain(List<String> arraylist, String statement) {
 		for (String str : arraylist) {
-			if (statement.toLowerCase().contains(str)) {
+			if (statement != null && statement.toLowerCase().contains(str)) {
 				return true;
 			}
 		}