shrink it down a bit and logical changes

Author: HaarigerHarald

.gitattributes

@@ -26,38 +26,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="text/plain"/>
             </intent-filter>
-            <intent-filter>
-            	<action android:name="android.intent.action.VIEW" />
-            	<category android:name="android.intent.category.DEFAULT" />
-            	<category android:name="android.intent.category.BROWSABLE" />
-           	 <data android:scheme="http"
-                android:host="youtube.com"
-                android:pathPattern=".*/watch.*"/>
-           	 <data android:scheme="http"
-                android:host="www.youtube.com"
-           	 	android:pathPattern=".*/watch.*"/>
-           	 <data android:scheme="http"
-                android:host="m.youtube.com"
-                android:pathPattern=".*/watch.*"/>
-           	 <data android:scheme="http"
-                android:host="www.m.youtube.com"
-           	 	android:pathPattern=".*/watch.*"/>
-           	 <data android:scheme="https"
-                android:host="youtube.com"
-                android:pathPattern=".*/watch.*"/>
-           	 <data android:scheme="https"
-                android:host="www.youtube.com"
-           	 	android:pathPattern=".*/watch.*"/>
-           	 <data android:scheme="https"
-                android:host="m.youtube.com"
-                android:pathPattern=".*/watch.*"/>
-           	 <data android:scheme="https"
-                android:host="www.m.youtube.com"
-           	 	android:pathPattern=".*/watch.*"/>
-           	 <data android:scheme="http"
-                android:host="youtu.be"
-           	 	android:pathPattern=".*/.*"/>
-        	</intent-filter>
 
         </activity>
     </application>

AndroidManifest.xml

@@ -1,7 +1,7 @@
-A small android based Youtube uri extractor.
+A small android based YouTube uri extractor.
 =======================================================
 
-These are the literal uris to the Youtube video or audio files, so you can stream or download them.
+These are the literal uris to the YouTube video or audio files, so you can stream or download them.
 It features an age verification circumvention and a signature deciphering method (mainly for vevo videos).
 
 I've made a little jar lib which should make integration super easy: [youtubeExtractor.jar](https://github.com/HaarigerHarald/android-youtubeExtractor/raw/master/bin/youtubeExtractor.jar)
@@ -17,18 +17,18 @@ It's basically build around an AsyncTask. Called from an Activity you can write
         public void onUrisAvailable(String videoId, String videoTitle, SparseArray<YtFile> ytFiles) {
             if(ytFiles!=null){
                 int itag = 22;
-                // itag is a Youtube format identifier, 22 for example is mp4 h264 1280x720
+                // itag is a YouTube format identifier, 22 for example is "mp4 h264 1280x720"
 
-                String downloadUrl = ytFiles.get(itag).url;
+                String downloadUrl = ytFiles.get(itag).getUrl();
                 // TODO: Do something cool with the "downloadUrl"...
             }
         }
     };
 
     ytEx.execute(youtubeLink);
 
-The important thing is the ytFiles SparseArray. Because Youtube videos are available in multiple formats we can choose one by
-calling ytFiles.get(itag). One ytFile contains the uri and its appropriate meta data like: mp4 1280x720 or m4a dash aac
+The important thing is the ytFiles SparseArray. Because YouTube videos are available in multiple formats we can choose one by
+calling ytFiles.get(itag). One ytFile contains the uri and its appropriate meta data like: "mp4 1280x720" or "m4a dash aac"
 
 For further infos have a look at the supplied sample YoutubeDownloader app. It uses the "Share" function in the official Youtube
 app to download Youtube videos. It doesn't have a launcher entry though so don't be irritated.
@@ -42,7 +42,7 @@ To try the app have a look at: [youtubeDownloader.apk](https://github.com/Haarig
 I'm using a useful lib for JavaScript execution, if you want to build your own lib from the sources head 
 over to: https://github.com/evgenyneu/js-evaluator-for-android
 
-Just to make it clear I'm not in any way related to Youtube!
+Just to make it clear I'm not in any way related to YouTube!
 
 
 

LICENSE.txt renamed to LICENSE

@@ -1,20 +1,7 @@
 <resources>
 
-    <!--
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
-        <!--
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        -->
-    </style>
-
-    <!-- Application theme. -->
-    <style name="AppTheme" parent="AppBaseTheme">
-        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    <style name="AppTheme" parent="android:Theme.Holo.Light">
+		
     </style>
 
 </resources>

README.md

@@ -8,7 +8,6 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.util.Log;
 import android.util.SparseArray;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -17,8 +16,8 @@
 import android.widget.ProgressBar;
 import android.widget.Toast;
 import at.huber.youtubeExtractor.R;
-import at.huber.youtubeExtractor.YtFile;
 import at.huber.youtubeExtractor.YouTubeUriExtractor;
+import at.huber.youtubeExtractor.YtFile;
 
 public class SampleDownloadActivity extends Activity {
 
@@ -29,30 +28,25 @@ public class SampleDownloadActivity extends Activity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		
 		setContentView(R.layout.activity_sample_download);
 		mainLayout=(LinearLayout)findViewById(R.id.main_layout);
 		mainProgressBar=(ProgressBar)findViewById(R.id.prgrBar);
 		activityContext=this;
 
 		//Check how it was started and if we can get the youtubelink somehow
-		if (savedInstanceState == null && ((Intent.ACTION_SEND.equals(getIntent().getAction()) && getIntent().getType() != null) || 
-				Intent.ACTION_VIEW.equals(getIntent().getAction()))) {
-			String youtubeLink=null;
-			if(Intent.ACTION_SEND.equals(getIntent().getAction()) && "text/plain".equals(getIntent().getType())){
-				youtubeLink=getIntent().getStringExtra(Intent.EXTRA_TEXT);
-			}else if(Intent.ACTION_VIEW.equals(getIntent().getAction())){
-				youtubeLink=getIntent().getDataString();
-			}
+		if (savedInstanceState == null && Intent.ACTION_SEND.equals(getIntent().getAction())
+				&& getIntent().getType() != null && "text/plain".equals(getIntent().getType())){
 
-			if (youtubeLink != null && (youtubeLink.contains("http://youtu.be/") || youtubeLink
-							.contains("youtube.com/watch?v="))){
-				//We have a valid link such as: http://youtu.be/xxxx or http://youtube.com/watch?v=xxxx
+			String youtubeLink=getIntent().getStringExtra(Intent.EXTRA_TEXT);
+
+			if (youtubeLink != null && (youtubeLink.contains("http://youtu.be/") || 
+					youtubeLink.contains("youtube.com/watch?v="))){
+				// We have a valid link such as: http://youtu.be/xxxx or
+				// http://youtube.com/watch?v=xxxx
 				getYoutubeDownloadUrl(youtubeLink);
 			}else{
 				Toast.makeText(this, R.string.error_no_yt_link, Toast.LENGTH_LONG).show();
-				if (youtubeLink != null){
-					Log.d("Link:", youtubeLink);
-				}
 				finish();
 			}
 		}else{
@@ -79,9 +73,9 @@ public void onUrisAvailable(String videoId, String videoTitle, SparseArray<YtFil
 					YtFile ytFile=ytFiles.get(itag);
 
 					//Ignore the google proprietary webm format
-					if(!ytFile.meta.ext.equalsIgnoreCase("webm")){
+					if(!ytFile.getMeta().getExt().equalsIgnoreCase("webm")){
 						//Just add videos in a decent format => height -1 = audio
-						if(ytFile.meta.height>0 && ytFile.meta.height<360){
+						if(ytFile.getMeta().getHeight()>0 && ytFile.getMeta().getHeight()<360){
 							continue;
 						}
 						addButtonToMainLayout(videoTitle, ytFile);
@@ -97,19 +91,19 @@ public void onUrisAvailable(String videoId, String videoTitle, SparseArray<YtFil
 	private void addButtonToMainLayout(final String videoTitle, final YtFile ytfile){
 		//Lets display some buttons to let the user choose the format he wants to download
 		Button btn=new Button(activityContext);
-		btn.setText(ytfile.meta.info);
+		btn.setText(ytfile.getMeta().getInfo());
 		btn.setOnClickListener(new OnClickListener() {
 
 			@Override
 			public void onClick(View v) {
 				String filename;
 				if (videoTitle.length() > 55){
-					filename=videoTitle.substring(0, 55) + "." + ytfile.meta.ext;
+					filename=videoTitle.substring(0, 55) + "." + ytfile.getMeta().getExt();
 				}else{
-					filename=videoTitle + "." + ytfile.meta.ext;
+					filename=videoTitle + "." + ytfile.getMeta().getExt();
 				}
 				filename=filename.replaceAll("\\\\|>|<|\"|\\||\\*|\\?|%|:", "");
-				downloadFromUrl(ytfile.url, videoTitle, filename);
+				downloadFromUrl(ytfile.getUrl(), videoTitle, filename);
 				finish();
 			}
 		});

bin/youtubeDownloader.apk

@@ -2,27 +2,43 @@
 
 public class Meta {
 
-	/**
+	int itag;
+	String ext;
+	String info;
+	int height;
+
+    Meta(int itag, String ext, String info, int height) {
+    	this.itag=itag;
+        this.info = info;
+        this.ext = ext;
+        this.height=height;
+    }
+    
+    /**
 	 * An identifier used by youtube for different formats.
 	 */
-	public int itag;
-	/**
-	 * The file extension and conainer format.
+    public int getItag(){
+    	return itag;
+    }
+    
+    /**
+	 * The file extension and conainer format like "mp4"
 	 */
-	public String ext;
+	public String getExt() {
+		return ext;
+	}
 	/**
-	 * General info about the meta data like dash 1280x720 or dash audio aac
+	 * General info about the meta data like "dash 1280x720" or "dash audio aac"
 	 */
-	public String info;
+	public String getInfo() {
+		return info;
+	}
+
 	/**
 	 * The height of the video stream or -1 for audio files.
 	 */
-	public int height;
-
-    Meta(int itag, String ext, String info, int height) {
-    	this.itag=itag;
-        this.info = info;
-        this.ext = ext;
-        this.height=height;
-    }
+	public int getHeight() {
+		return height;
+	}
+	
 }

bin/youtubeExtractor.jar

@@ -2,14 +2,25 @@
 
 public class YtFile {
 
-	public Meta meta;
-	/**
-	 * The url to download the file.
-	 */
-	public String url = "";
+	Meta meta;
+	String url = "";
 
     YtFile(Meta meta, String url) {
     	this.meta=meta;
         this.url = url;
     }
-}
+    
+    /**
+	 * The url to download the file.
+	 */
+    public String getUrl(){
+    	return url;
+    }
+    
+    /**
+     * Meta data for the specific file.
+     */
+    public	Meta getMeta(){
+    	return meta;
+    }
+}