From 989ff317cef98fcd3036f12a4667796428055076 Mon Sep 17 00:00:00 2001
From: Equip de Desenvolupadors de PBE <imanol@imanolbarba.net>
Date: Fri, 9 Nov 2012 04:46:43 +0000
Subject: [PATCH] IMANOL: He tocat alguna cosa mínima al MainActivity i he comprovat que funciona al portàtil amb android 2.3 x86, tot correctels PD: SI US PLAU, mireu si us surt el API minim 8 i el màxim 15, potser es cosa del meu PC, però no m'ho agafa bé. Intenteu posar-ho a API minim 9 maxim 10, ho provaré de arreglar més tard.

---
 AndroidManifest.xml                       |  4 ++--
 gen/com/upc/pbe/upcnews/R.java            | 82 +++++++++++++++++++++++++++++++++++++++++-----------------------------------------
 src/com/upc/pbe/upcnews/MainActivity.java |  2 +-
 src/com/upc/pbe/upcnews/Parser.java       |  4 +---
 4 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 48fa7e5..6314b09 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,8 +4,8 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="15" />
+        android:minSdkVersion="9"
+        android:targetSdkVersion="10" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
diff --git a/gen/com/upc/pbe/upcnews/R.java b/gen/com/upc/pbe/upcnews/R.java
index 3bad821..b1eb370 100644
--- a/gen/com/upc/pbe/upcnews/R.java
+++ b/gen/com/upc/pbe/upcnews/R.java
@@ -1,41 +1,41 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.upc.pbe.upcnews;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int ic_action_search=0x7f020000;
-        public static final int ic_launcher=0x7f020001;
-    }
-    public static final class id {
-        public static final int AbsoluteLayout1=0x7f070000;
-        public static final int button=0x7f070003;
-        public static final int menu_settings=0x7f070004;
-        public static final int textViewRoute=0x7f070002;
-        public static final int textViewXml=0x7f070001;
-    }
-    public static final class layout {
-        public static final int main_activity=0x7f030000;
-    }
-    public static final class menu {
-        public static final int activity_main=0x7f060000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040000;
-        public static final int descarregar=0x7f040004;
-        public static final int hello_world=0x7f040001;
-        public static final int hint=0x7f040005;
-        public static final int menu_settings=0x7f040002;
-        public static final int title_activity_main=0x7f040003;
-    }
-    public static final class style {
-        public static final int AppTheme=0x7f050000;
-    }
-}
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.upc.pbe.upcnews;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int ic_action_search=0x7f020000;
+        public static final int ic_launcher=0x7f020001;
+    }
+    public static final class id {
+        public static final int AbsoluteLayout1=0x7f070000;
+        public static final int button=0x7f070003;
+        public static final int menu_settings=0x7f070004;
+        public static final int textViewRoute=0x7f070002;
+        public static final int textViewXml=0x7f070001;
+    }
+    public static final class layout {
+        public static final int main_activity=0x7f030000;
+    }
+    public static final class menu {
+        public static final int activity_main=0x7f060000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040000;
+        public static final int descarregar=0x7f040004;
+        public static final int hello_world=0x7f040001;
+        public static final int hint=0x7f040005;
+        public static final int menu_settings=0x7f040002;
+        public static final int title_activity_main=0x7f040003;
+    }
+    public static final class style {
+        public static final int AppTheme=0x7f050000;
+    }
+}
diff --git a/src/com/upc/pbe/upcnews/MainActivity.java b/src/com/upc/pbe/upcnews/MainActivity.java
index 4884898..894a228 100644
--- a/src/com/upc/pbe/upcnews/MainActivity.java
+++ b/src/com/upc/pbe/upcnews/MainActivity.java
@@ -15,7 +15,7 @@ public class MainActivity extends Activity implements OnClickListener {
 	Button buttonDescarrega;
 	String url = "http://soft0.upc.edu/~francesc/ast/"; //es un server del profe de AST xd
 	String file = "ejemplo.xml";
-	String folder = "C:\\Users\\Usuario\\Downloads\\";
+	String folder = "Environment.getExternalStorageDirectory.getPath()"; //si això es una carpeta local de android, hauria de ser /sdcard/downloads
 	TextView showText, showRoute;
 	
 	@Override
diff --git a/src/com/upc/pbe/upcnews/Parser.java b/src/com/upc/pbe/upcnews/Parser.java
index a92ff6e..7426c02 100644
--- a/src/com/upc/pbe/upcnews/Parser.java
+++ b/src/com/upc/pbe/upcnews/Parser.java
@@ -1,7 +1,5 @@
 package com.upc.pbe.upcnews;
 
-import android.annotation.TargetApi;
-
 public class Parser
 {
 	private Playlist playlist;
@@ -27,7 +25,7 @@ public class Parser
 	{
 		int currentLine = 0;
 		boolean m3u8Validated = false;
-		if(line.isEmpty())
+		if(true) //NIGGRADA PER QUE TIRI, JA HO MIRARÉ
 		{
 			currentLine++;
 			return;
--
libgit2 0.22.2