From 0a050c2cedde9a76d5d5ae0f89e4bf5c4b328d44 Mon Sep 17 00:00:00 2001
From: Equip de Desenvolupadors de PBE <imanol@imanolbarba.net>
Date: Wed, 28 Nov 2012 15:57:34 +0000
Subject: [PATCH] Fin de la claseeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee

---
 AndroidManifest.xml                       |  1 +
 gen/com/upc/pbe/upcnews/R.java            | 23 ++++++++++++-----------
 res/layout/dirs.xml                       |  9 +++++++--
 res/layout/main_activity.xml              | 46 +++++++++++++++++++++++-----------------------
 res/values/strings.xml                    |  4 ++--
 src/com/upc/pbe/upcnews/Descarrega.java   |  4 +---
 src/com/upc/pbe/upcnews/Directoris.java   | 46 ++++++++++++++++++++++++++++++++++++----------
 src/com/upc/pbe/upcnews/MainActivity.java |  2 ++
 8 files changed, 84 insertions(+), 51 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a9a8ba7..fa2c682 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
+
     <application
         android:name=".UpcApp"
         android:icon="@drawable/ic_launcher"
diff --git a/gen/com/upc/pbe/upcnews/R.java b/gen/com/upc/pbe/upcnews/R.java
index 0ed4f8f..739adab 100644
--- a/gen/com/upc/pbe/upcnews/R.java
+++ b/gen/com/upc/pbe/upcnews/R.java
@@ -16,23 +16,24 @@ public final class R {
         public static final int ic_menu_name=0x7f020002;
     }
     public static final class id {
-        public static final int AbsoluteLayout1=0x7f080008;
-        public static final int ImageView01=0x7f08000d;
-        public static final int ImageView1=0x7f08000c;
+        public static final int AbsoluteLayout1=0x7f080009;
+        public static final int ImageView01=0x7f08000b;
+        public static final int ImageView1=0x7f08000a;
         public static final int LinearLayout1=0x7f080000;
-        public static final int button=0x7f08000a;
+        public static final int button=0x7f08000d;
         public static final int button1=0x7f080002;
         public static final int button2=0x7f080003;
         public static final int button3=0x7f080004;
         public static final int button4=0x7f080005;
-        public static final int itemhelp=0x7f080010;
-        public static final int itemprefs=0x7f08000f;
-        public static final int menu_settings=0x7f08000e;
-        public static final int textView1=0x7f080006;
-        public static final int textView2=0x7f080007;
-        public static final int textViewRoute=0x7f080009;
+        public static final int button5=0x7f080006;
+        public static final int itemhelp=0x7f080011;
+        public static final int itemprefs=0x7f080010;
+        public static final int menu_settings=0x7f08000f;
+        public static final int textView1=0x7f080007;
+        public static final int textView2=0x7f080008;
+        public static final int textViewRoute=0x7f08000c;
         public static final int textViewTitle=0x7f080001;
-        public static final int textViewXml=0x7f08000b;
+        public static final int textViewXml=0x7f08000e;
     }
     public static final class layout {
         public static final int dirs=0x7f030000;
diff --git a/res/layout/dirs.xml b/res/layout/dirs.xml
index 3fe3157..620d798 100644
--- a/res/layout/dirs.xml
+++ b/res/layout/dirs.xml
@@ -7,12 +7,11 @@
     android:orientation="vertical" >
 
     <!-- Vista en llista -->
-

+
     <TextView
         android:id="@+id/textViewTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="left"
         android:layout_marginLeft="14dp"
         android:text="@string/title"
         android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -41,4 +40,10 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="38dp" />
 
+    <Button
+        android:id="@+id/button5"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="38dp" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/main_activity.xml b/res/layout/main_activity.xml
index d6e798f..e2dceed 100644
--- a/res/layout/main_activity.xml
+++ b/res/layout/main_activity.xml
@@ -15,47 +15,47 @@
         android:text="@string/app_name"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
+    <ImageView
+        android:id="@+id/ImageView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="28dp"
+        android:layout_y="12dp"
+        android:src="@drawable/ic_launcher" />
+
+    <ImageView
+        android:id="@+id/ImageView01"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="223dp"
+        android:layout_y="14dp"
+        android:src="@drawable/ic_launcher" />
+
     <TextView
         android:id="@+id/textViewRoute"
         android:layout_width="250dp"
         android:layout_height="22dp"
-        android:layout_x="26dp"
-        android:layout_y="328dp"
+        android:layout_x="28dp"
+        android:layout_y="306dp"
         android:textSize="@android:dimen/thumbnail_height" />
 
     <Button
         android:id="@+id/button"
         android:layout_width="258dp"
         android:layout_height="wrap_content"
-        android:layout_x="24dp"
-        android:layout_y="352dp"
+        android:layout_x="26dp"
+        android:layout_y="333dp"
         android:text="@string/descarregar" />
 
     <TextView
         android:id="@+id/textViewXml"
-        android:layout_width="301dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_x="28dp"
-        android:layout_y="400dp"
+        android:layout_x="18dp"
+        android:layout_y="384dp"
         android:gravity="clip_vertical"
         android:hint="@string/hint"
         android:scrollbarStyle="insideInset"
         android:scrollbars="vertical" />
 
-    <ImageView
-        android:id="@+id/ImageView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_x="28dp"
-        android:layout_y="12dp"
-        android:src="@drawable/ic_launcher" />
-
-    <ImageView
-        android:id="@+id/ImageView01"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_x="223dp"
-        android:layout_y="14dp"
-        android:src="@drawable/ic_launcher" />
-
 </AbsoluteLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 12af49f..5d55679 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,8 +3,8 @@
     <string name="app_name">UPC_NEWS</string>
     <string name="menu_settings">Settings</string>
     <string name="title_activity_main">MainActivity</string>
-    <string name="descarregar">Start</string>
-    <string name="hint">Click to Start Button.</string>
+    <string name="descarregar">Start Application</string>
+    <string name="hint">Click to Start button or click Settins for Help</string>
     <string name="url">URL server</string>
     <string name="urlhint">Set the route from the server (without http://)</string>
     <string name="prefs">Preferences</string>
diff --git a/src/com/upc/pbe/upcnews/Descarrega.java b/src/com/upc/pbe/upcnews/Descarrega.java
index ef47caf..01d755a 100644
--- a/src/com/upc/pbe/upcnews/Descarrega.java
+++ b/src/com/upc/pbe/upcnews/Descarrega.java
@@ -89,11 +89,9 @@ public class Descarrega extends AsyncTask<Object, Object, Object>{
 			
 			in.close();
 		} catch (MalformedURLException e) {
-			Log.d(TAG, "excepcio 1");
-			e.printStackTrace();
+			Log.d(TAG, "excepcio 1, no sha trobat la URL");
 		} catch (IOException e) {
 			Log.d(TAG, "excepcio 2");
-			e.printStackTrace();
 		}
 		
 		return html;
diff --git a/src/com/upc/pbe/upcnews/Directoris.java b/src/com/upc/pbe/upcnews/Directoris.java
index c58228e..d89004e 100644
--- a/src/com/upc/pbe/upcnews/Directoris.java
+++ b/src/com/upc/pbe/upcnews/Directoris.java
@@ -11,6 +11,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import android.widget.Toast;
 
 public class Directoris extends Activity implements OnClickListener {
 
@@ -73,24 +74,49 @@ public class Directoris extends Activity implements OnClickListener {
 
 		case R.id.button1: {
 			Log.d(TAG, "Click on button1");
-			d = new Descarrega(url + "/" + buttons.get(0).getText() + "/", file,
-					folder);
+			d = new Descarrega(url + "/" + buttons.get(0).getText() + "/",
+					file, folder);
 			String str = d.doInBackground();
 
 			HTMLParser pars = new HTMLParser();
-			String urlvideo = pars.findvideo(str,
-					url + "/" + buttons.get(0).getText() + "/");
+			String urlvideo = pars.findvideo(str, url + "/"
+					+ buttons.get(0).getText() + "/");
 
 			Log.d(TAG, urlvideo);
 
-			d = new Descarrega(urlvideo, file, folder);
-			String m3u8 = d.doInBackground();
-
-			Log.d(TAG, m3u8);
+			if (urlvideo == "No s'ha trobat") {
+				Toast.makeText(this, "El directori no conté cap .m3u8",
+						Toast.LENGTH_LONG).show();
+			} else {
+				d = new Descarrega(urlvideo, file, folder);
+				String m3u8 = d.doInBackground();
+			}
+			// m3u8 --> PARSE!
+			break;
 
 		}
 		case R.id.button2: {
+			Log.d(TAG, "Click on button2");
+			d = new Descarrega(url + "/" + buttons.get(1).getText() + "/",
+					file, folder);
+			String str = d.doInBackground();
+
+			HTMLParser pars = new HTMLParser();
+			String urlvideo = pars.findvideo(str, url + "/"
+					+ buttons.get(1).getText() + "/");
 
+			Log.d(TAG, urlvideo);
+
+			if (urlvideo == "No s'ha trobat") {
+				Toast.makeText(this, "El directori no conté cap .m3u8",
+						Toast.LENGTH_LONG).show();
+			} else {
+
+				d = new Descarrega(urlvideo, file, folder);
+				String m3u8 = d.doInBackground();
+			}
+			// m3u8 --> PARSE!
+			break;
 		}
 		case R.id.button3: {
 
@@ -103,13 +129,13 @@ public class Directoris extends Activity implements OnClickListener {
 
 	public void crearButtons() {
 
-
 		buttons.add((Button) findViewById(R.id.button1));
 		buttons.add((Button) findViewById(R.id.button2));
 		buttons.add((Button) findViewById(R.id.button3));
 		buttons.add((Button) findViewById(R.id.button4));
+		buttons.add((Button) findViewById(R.id.button5));
 
-		for(int i = 0; i < buttons.size(); i++){
+		for (int i = 0; i < buttons.size(); i++) {
 			buttons.get(i).setOnClickListener(this);
 			buttons.get(i).setVisibility(View.GONE);
 		}
diff --git a/src/com/upc/pbe/upcnews/MainActivity.java b/src/com/upc/pbe/upcnews/MainActivity.java
index 0216c3e..b4e6b3e 100644
--- a/src/com/upc/pbe/upcnews/MainActivity.java
+++ b/src/com/upc/pbe/upcnews/MainActivity.java
@@ -22,6 +22,7 @@ public class MainActivity extends Activity implements OnClickListener {
 	String folder = "Environment.getExternalStorageDirectory.getPath()";
 	TextView showText, showRoute;
 
+	
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -31,6 +32,7 @@ public class MainActivity extends Activity implements OnClickListener {
 		buttonDescarrega.setOnClickListener(this);
 		showText = (TextView) findViewById(R.id.textViewXml);
 		showRoute = (TextView) findViewById(R.id.textViewRoute);
+		
 		this.getUrl();
 	}
 
--
libgit2 0.22.2