Descargas en segundo plano, falta control de buffer, arreglada interfaz lista co…

…n iconos, quitado recurso calidad default

Descargas en segundo plano, falta control de buffer, arreglada interfaz lista co…
…n iconos, quitado recurso calidad default
Imanol-Mikel Barba Sabariego
1 parent 2ea470f7
Showing 11 changed files with 578 additions and 436 deletions
res/layout/rowlayout.xml
res/values/strings.xml
res/xml/prefs.xml
src/com/upc/pbe/upcnews/Descarrega.java
src/com/upc/pbe/upcnews/Directoris.java
src/com/upc/pbe/upcnews/HLS.java
src/com/upc/pbe/upcnews/MainActivity.java
src/com/upc/pbe/upcnews/Parser.java
src/com/upc/pbe/upcnews/ResourceAdapter.java
src/com/upc/pbe/upcnews/UpcApp.java
src/com/upc/pbe/upcnews/VideoActivity.java
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/lelayout"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content" >
-
-    <TextView
-        android:id="@+id/rowTextView"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/selectedonlist"
-        android:padding="10dp"
-        android:textColor="@drawable/selectedonlist2"
-        android:textSize="16sp" >
-    </TextView>
-
-    <ImageView
-        android:id="@+id/rowImageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginRight="50dp"
-        android:src="@android:drawable/btn_star_big_off" />
-
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/lelayout"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/Black" >
+
+    <ImageView
+        android:id="@+id/rowImageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="5dip"
+        android:adjustViewBounds="true"
+        android:contentDescription="@string/itemType"
+        android:maxHeight="25dip"
+        android:maxWidth="25dip"
+        android:scaleType="fitCenter"
+        android:src="@android:drawable/btn_star_big_off" />
+
+    <TextView
+        android:id="@+id/rowTextView"
+        android:layout_width="fill_parent"
+        android:layout_height="40dip"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="5dip"
+        android:layout_toRightOf="@+id/rowImageView"
+        android:background="@drawable/selectedonlist"
+        android:gravity="center_vertical"
+        android:textColor="@drawable/selectedonlist2"
+        android:textSize="20sp" />
+
 </RelativeLayout>
 \ No newline at end of file
@@ -6,7 +6,7 @@
     <string name="descarregar">Iniciar aplicació</string>
     <string name="hint">Toca per iniciar.</string>
     <string name="url">URL del Servidor</string>
-    <string name="urlhint">Direcció URL del servidor a connectarse (sense http://)</string>
+    <string name="urlhint">Direcció URL del servidor a connectarse\n(sense http://)</string>
     <string name="prefs">Preferencies</string>
     <string name="help">Ajuda</string>
     <string name="desc">Reproduir</string>
@@ -26,20 +26,8 @@
         siusplau dirigeixi\'s a la Universitat o escrigui un mail als desenvolupadors.\n\n Necessària la instal·lació 
         de la llibreria Vitamio per reproduïr arxius .ts</string>
     <string name="defaultURL">revistes.upc.es/~imanol/PBE</string>
-    <string name="qual">Qualitat de reproducció</string>
-    <string name="qual_hint">Qualitat inicial de reproducció</string>
-    <string-array name="qualityNames">
-        <item >High Quality</item>
-        <item >Medium Quality</item>
-        <item >Low Quality</item>
-    </string-array>
-    <string-array name="qualityValues">
-        <item >0</item>
-        <item >1</item>
-        <item >2</item>
-    </string-array>
-    <string name="defaultQuality">0</string>
     <string name="alertVitamioNotInstalled">Alerta! Llibreries de Vitamio no instal·lades!</string>
     <string name="alertLogoDescription">Alerta!</string>
+    <string name="itemType">Item type</string>
 </resources>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
     <EditTextPreference android:key="server" android:title="@string/url" android:summary="@string/urlhint" android:defaultValue="@string/defaultURL"/>
-    <ListPreference android:title="@string/qual" android:summary="@string/qual_hint" android:key="quality" android:entries="@array/qualityNames" android:entryValues="@array/qualityValues" android:defaultValue="@string/defaultQuality"/>
     </PreferenceScreen>
 \ No newline at end of file
-package com.upc.pbe.upcnews;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLConnection;
-
-import android.app.DownloadManager;
-import android.app.DownloadManager.Request;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Environment;
-import android.util.Log;
-
-//Descarrega un arxiu i el guarda o retorna en String
-public class Descarrega extends AsyncTask<Object, Object, Object>
-{
-	final static String TAG = "Descarrega";
-	private String html;
-	DownloadManager manager;
-
-	public Descarrega()
-	{
-		html = "";
-	}
-	
-	public Descarrega(DownloadManager man){
-		manager = man;
-	}
-
-	public void descarregarguardar(String url, String path) throws IOException
-	{
-		
-		// Descarrega un arxiu i el guarda
-		// Creem l'arxiu
-		File file = new File(path + url.substring(url.lastIndexOf("/")+1, url.length()));
-		// Iniciem la descarrega
-		URLConnection conn = new URL(url).openConnection();
-		conn.connect();
-		Log.d(TAG, "\nDescarregant: \n");
-		Log.d(TAG, " >> URL: " + url + " >> Desti: " + path + " >> Tamany: "
-				+ conn.getContentLength() + " bytes");
-		// Llegeix cada byte i l'escriu en un arxiu fins que arriba a -1
-		InputStream in = conn.getInputStream();
-		OutputStream out = new FileOutputStream(file);
-		byte data[] = new byte[102400]; //Mejor throughput!!
-		int count;
-		while((count = in.read(data)) != -1)
-		{
-			out.write(data,0,count);
-		}
-		out.flush();
-		out.close();
-		in.close();
-		
-	}
-	
-	public void descarrega(String url, String path, String name) throws IOException{
-		
-		Request req = new Request(Uri.parse(url));
-		
-		//req.setVisibleInDownloadsUi(false);
-		req.setDestinationInExternalPublicDir(path, name);
-		manager.enqueue(req);	
-		Log.d(TAG, "\nDescarregant: \n");
-		Log.d(TAG, " >> URL: " + url + " >> Desti: " + path);
-		
-	}
-
-	protected String doInBackground(String url) throws IOException
-	{
-		// Descarrega un arxiu i el retorna en un String
-		html = "";
-		// Iniciem la connexi� i creem els Streams
-		URLConnection conn = new URL(url).openConnection();
-		BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-		// Iniciem la descarrega i anem guardant al String
-		Log.d(TAG, "\nDescarregant: \n");
-		Log.d(TAG, ">> URL: " + url + " >> Tamany: " + conn.getContentLength()
-				+ " bytes");
-		String inputLine;
-		while ((inputLine = in.readLine()) != null)
-		{
-			html = html + "\n" + inputLine;
-		}
-		Log.d(TAG, "Descarrega finalitzada");
-		in.close();
-		return html;
-	}
-
-	@Override
-	protected Object doInBackground(Object... arg0)
-	{
-		// Metode Overrided, no te utilitat
-		return null;
-	}
-}
+package com.upc.pbe.upcnews;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.util.Log;
+import android.widget.Toast;
+
+public class Descarrega extends AsyncTask<URL, Integer, String>
+{
+	final static String TAG = "Descarrega";
+	private Context ctx;
+	
+	public Descarrega(Context c)
+	{
+		ctx = c;
+	}
+
+	@Override
+	protected String doInBackground(URL... urls)
+	{
+		String html = "";
+		// Iniciem la connexi� i creem els Streams
+		try
+		{
+			URLConnection conn = urls[0].openConnection();
+			BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+			// Iniciem la descarrega i anem guardant al String
+			Log.d(TAG, "\nDescarregant: \n");
+			Log.d(TAG, ">> URL: " + urls[0] + " >> Tamany: " + conn.getContentLength() + " bytes");
+			String inputLine;
+			while ((inputLine = in.readLine()) != null)
+			{
+				html += inputLine + "\n";
+			}
+			in.close();
+			Log.d(TAG, "Descarrega finalitzada");
+		}
+		catch(IOException e)
+		{
+			this.cancel(true);
+			Toast.makeText(ctx, e.getMessage(), Toast.LENGTH_LONG).show();
+			return "";
+		}
+		return html;
+	 }
+		
+}
+
 package com.upc.pbe.upcnews;
 import java.io.IOException;
+import java.net.URL;
 import java.util.ArrayList;
+import java.util.concurrent.ExecutionException;
 import android.app.Activity;
 import android.app.DownloadManager;
@@ -16,147 +18,195 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 //Segona Activity, mostra els directoris i arxius del servidor
-public class Directoris extends Activity implements OnItemClickListener {
-	
+public class Directoris extends Activity implements OnItemClickListener
+{
+
 	final static String TAG = "Directoris";
-	private Descarrega d = new Descarrega();
 	private String URL, currentFolder;
 	private HTMLParser parser;
-	public void onCreate(Bundle savedInstanceState){
-		//Creem el layout
+	public void onCreate(Bundle savedInstanceState)
+	{
+		// Creem el layout
 		Log.d(TAG, "onCreated");
 		super.onCreate(savedInstanceState);
-		//Passem del layout anterior al actual
+		// Passem del layout anterior al actual
 		setContentView(R.layout.dirs);
-		//Canviem la direccio de la URL a la actual
+		// Canviem la direccio de la URL a la actual
 		currentFolder = ((UpcApp) getApplication()).getUrl() + "/";
 		URL = currentFolder;
-		//Creem un HTMLParser
+		// Creem un HTMLParser
 		parser = new HTMLParser(URL);
-		//Fem una llista ListView i la omplim amb la informacio trobada
-		((ListView)findViewById(R.id.listView1)).setOnItemClickListener(this);
+		// Fem una llista ListView i la omplim amb la informacio trobada
+		((ListView) findViewById(R.id.listView1)).setOnItemClickListener(this);
 		this.showResources();
 	}
-	
-	public void showResources(){
-		//Actualitza la informacio que mostra la ListView a mesura que ens desplacem pels directoris
+
+	public void showResources()
+	{
+		// Actualitza la informacio que mostra la ListView a mesura que ens
+		// desplacem pels directoris
 		ArrayList<String> entries;
-		try{
-			entries = parser.parse(d.doInBackground(currentFolder));
+		Descarrega d = new Descarrega(this);
+		try
+		{
+			d.execute(new URL(currentFolder));
+			entries = parser.parse(d.get());
 			this.createEntries(entries);
 		}
-		catch (IOException e){
+		catch (InterruptedException e)
+		{
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		catch (ExecutionException e)
+		{
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		catch (IOException e)
+		{
 			// Nunca llegara aqui la cosa, y si lo hace ES CULPA DEL SERVIDOR!!
 		}
 	}
-	
-	public void createEntries(ArrayList<String> directories){
-		//Crea les entrades de la ListView
+
+	public void createEntries(ArrayList<String> directories)
+	{
+		// Crea les entrades de la ListView
 		String[] entries = directories.toArray(new String[directories.size()]);
 		ListView listView = (ListView) findViewById(R.id.listView1);
 		listView.setAdapter(null);
 		ResourceAdapter adapter = new ResourceAdapter(this, R.layout.rowlayout, entries);
 		listView.setAdapter(adapter);
 	}
-	
+
 	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 		//Determina el funcionament al clickar en una de les entrades de al ListView
-		String path = ((TextView)view).getText().toString();
+		String path = ((TextView)((RelativeLayout)view).findViewById(R.id.rowTextView)).getText().toString();
 		//Si es un m3u8, el descarrega, parseja i inicia la reproduccio
-		if(path.endsWith(".m3u8")){
+		if(path.endsWith(".m3u8"))
+		{
 			path = currentFolder + path;
 			String playlist;
-			try{
-				//Descarreguem m3u8
-				playlist = d.doInBackground(path);
-				Parser p = new Parser(path.substring(0, path.lastIndexOf("/") + 1), this);
-				try{
-					//Parsing m3u8
-					ArrayList<ParentList> m3u8parsed = p.parseFile(playlist);
-					Log.d(TAG, "Parsing completat");
-					//Creem un gestor HLS
-					DownloadManager manager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
-					HLS h = new HLS(m3u8parsed,((UpcApp)getApplication()).getLocalPath(), manager);
-					((UpcApp)getApplication()).setHLS(h);
-					//Iniciem la reproduccio
-					Intent mIntent = new Intent(this, VideoActivity.class);
-					if(((UpcApp)getApplication()).getHLS() != null) {
-						startActivity(mIntent);
+			try
+			{
+					Descarrega d = new Descarrega(this);
+					//Descarreguem m3u8
+					d.execute(new URL(path));
+					playlist = d.get();
+					Parser p = new Parser(path.substring(0, path.lastIndexOf("/") + 1), this);
+					try
+					{
+						//Parsing m3u8
+						ArrayList<ParentList> m3u8parsed = p.parseFile(playlist);
+						Log.d(TAG, "Parsing completat");
+						//Creem un gestor HLS
+						DownloadManager manager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
+						HLS h = new HLS(m3u8parsed,((UpcApp)getApplication()).getLocalPath(), manager);
+						((UpcApp)getApplication()).setHLS(h);
+						//Iniciem la reproduccio
+						Intent mIntent = new Intent(this, VideoActivity.class);
+						if(((UpcApp)getApplication()).getHLS() != null) 
+						{
+							startActivity(mIntent);
+						}
+						else 
+						{
+							Toast.makeText(this, "Error en gestor HLS", Toast.LENGTH_LONG).show();
+						}
+					}
+					catch (ErrorException e)
+					{
+						Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
+						Log.d(TAG, e.getMessage());
+					}	
+					catch (WarningException e)
+					{
+						Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
+						Log.d(TAG, e.getMessage());
 					}
-					else {
-						Toast.makeText(this, "Error en gestor HLS", Toast.LENGTH_LONG).show();
+					catch (InfoException e)
+					{
+						Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
+						Log.d(TAG, e.getMessage());
 					}
 				}
-				catch (ErrorException e){
-					Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
-					Log.d(TAG, e.getMessage());
+				catch (IOException e1)
+				{
+					// Nunca llegara aqui la cosa, y si lo hace ES CULPA DEL SERVIDOR!!
 				}
-				catch (WarningException e){
-					Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
-					Log.d(TAG, e.getMessage());
+				catch (InterruptedException e1)
+				{
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
 				}
-				catch (InfoException e){
-					Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
-					Log.d(TAG, e.getMessage());
+				catch (ExecutionException e1)
+				{
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
 				}
 			}
-			catch (IOException e1){
-				// Nunca llegara aqui la cosa, y si lo hace ES CULPA DEL SERVIDOR!!
-			}
-
-		}
 		//Si es una carpeta, hi entra i mostra el seu contingut
-		else{
-			if(!path.startsWith("http://")){
+		else
+		{
+			if(!path.startsWith("http://"))
+			{
 				currentFolder += path;
 			}
-			else{
+			else
+			{
 				currentFolder = path;
 			}
 			showResources();
 		}
 	}
-	
-	public boolean onKeyDown(int keyCode, KeyEvent event)  {
-		//Determina el funcionament al apretar la tecla de tornar enrere
-	    if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0){
-	    	if(currentFolder.equals(URL)){
-	    		super.finish();
-		        return true;
-	    	}
-	    	currentFolder = currentFolder.substring(0, currentFolder.length()-1);
-	        currentFolder = currentFolder.substring(0,currentFolder.lastIndexOf("/")+1);
-	        showResources();
-	        return true;
-	    }
-	    return super.onKeyDown(keyCode, event);
+
+	public boolean onKeyDown(int keyCode, KeyEvent event)
+	{
+		// Determina el funcionament al apretar la tecla de tornar enrere
+		if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0)
+		{
+			if (currentFolder.equals(URL))
+			{
+				super.finish();
+				return true;
+			}
+			currentFolder = currentFolder.substring(0, currentFolder.length() - 1);
+			currentFolder = currentFolder.substring(0, currentFolder.lastIndexOf("/") + 1);
+			showResources();
+			return true;
+		}
+		return super.onKeyDown(keyCode, event);
 	}
-	
-	public boolean onCreateOptionsMenu(Menu menu) {
-		//Determina el funcionament al apretar la tecla d'opcions
+
+	public boolean onCreateOptionsMenu(Menu menu)
+	{
+		// Determina el funcionament al apretar la tecla d'opcions
 		getMenuInflater().inflate(R.menu.menu, menu);
 		Log.d(TAG, "Menu");
 		return true;
 	}
-	public boolean onOptionsItemSelected(MenuItem item) {
-		//Determina el funcionament al clickar en el menu d'opcions
-		switch (item.getItemId()) {
-			case R.id.itemprefs:
-				startActivity(new Intent(this, Prefs.class));
-				Log.d(TAG, "Preferencies");
-				return true;
-			case R.id.itemhelp:
-				startActivity(new Intent(this, Help.class));
-				Log.d(TAG, "Help");
-				return true;
-			default:
-				return false;
+	public boolean onOptionsItemSelected(MenuItem item)
+	{
+		// Determina el funcionament al clickar en el menu d'opcions
+		switch (item.getItemId())
+		{
+		case R.id.itemprefs:
+			startActivity(new Intent(this, Prefs.class));
+			Log.d(TAG, "Preferencies");
+			return true;
+		case R.id.itemhelp:
+			startActivity(new Intent(this, Help.class));
+			Log.d(TAG, "Help");
+			return true;
+		default:
+			return false;
 		}
 	}
 }
 \ No newline at end of file
@@ -5,7 +5,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import android.app.DownloadManager;
+import android.app.DownloadManager.Request;
+import android.content.Context;
 import android.net.TrafficStats;
+import android.net.Uri;
 import android.util.Log;
 //Gestor del protocol HTTP Live Streaming
@@ -21,7 +24,7 @@ public class HLS
 	private int currentSegment;
 	private boolean endReached;
 	private String localFolder;
-	private Descarrega d;
+	private DownloadManager dm;
 	private BandwidthMeasurer bm;
@@ -42,8 +45,6 @@ public class HLS
 		endReached = false;
 		this.localFolder = localFolder;
 		bm = new BandwidthMeasurer();
-	
-		d = new Descarrega(manager);
 	}
 	public void loadVideo()
@@ -75,7 +76,7 @@ public class HLS
 			Log.d(TAG, seg.getName() + " " + seg.getURL());
 			long startTime = System.currentTimeMillis();
 			long segmentBytes = TrafficStats.getTotalRxBytes();
-			d.descarregarguardar(seg.getURL(), localFolder);
+			descarregarguardar(seg.getURL(), localFolder);
 			double bps = bm.Measure(segmentBytes, startTime);
 			Log.d(TAG, "Velocitat actual (KB/s): " + (bps / 8e3));
 			if ((bps <= qualities.get(currentQuality).getQuality()) && (bps != -1))
@@ -117,6 +118,14 @@ public class HLS
 		return path;
 	}
+	public void descarregarguardar(String url, String path)
+	{
+		Request req = new Request(Uri.parse(url));
+		req.setVisibleInDownloadsUi(false);
+		req.setDestinationUri(Uri.parse("file://"+path + url.substring(url.lastIndexOf("/")+1, url.length())));
+		dm.enqueue(req);
+	}
+	
 	public String previous() throws IOException
 	{
 		Segment seg = null;
@@ -128,8 +137,8 @@ public class HLS
 		return localFolder + seg.getURL().substring(seg.getURL().lastIndexOf("/") + 1, seg.getURL().length());
 	}
-	public void setDefQuality(int q)
+	public void startDownloadManager(Context ctx)
 	{
-		currentQuality = q;
+		dm = (DownloadManager) ctx.getSystemService("download");
 	}
 }
 \ No newline at end of file
 package com.upc.pbe.upcnews;
 import java.io.File;
-import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 import android.app.Activity;
-import android.app.DownloadManager;
-import android.app.DownloadManager.Request;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -48,19 +44,7 @@ public class MainActivity extends Activity implements OnClickListener {
 		if(tempFolder.mkdirs()) {
 			Log.d(TAG,"Directori " + tempFolder.toString() + " creat");
 		}
-		Log.d(TAG, Environment.getExternalStorageDirectory().toString());
-		
-		DownloadManager manager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
-		Request req = new Request(Uri.parse("http://10.0.2.157/upload/segments/pbe1.ts"));
-		
-		//req.setVisibleInDownloadsUi(false);
-		req.setDestinationInExternalPublicDir(Environment.getExternalStorageDirectory().toString()+"/UPC NEWS", "b.ts");
-		manager.enqueue(req);	
-		
-		
-
-		
-		
+			
 		//Creem els botons i text
 		URLText = (TextView) findViewById(R.id.textViewUrl);
 		buttonDescarrega = (ImageButton) findViewById(R.id.button);
@@ -87,26 +71,29 @@ public class MainActivity extends Activity implements OnClickListener {
 	public void onClick(View v) {
 		//Al polsar el boto s'inicia la descarrega
 		Log.d(TAG, "onClicked");
-		this.descarregar();
-		if(!html.equals("EMPTY")) {
-			((UpcApp) getApplication()).setDesc(html);
-			startActivity(new Intent(this, Directoris.class));
+		Descarrega d = new Descarrega(this);
+		try
+		{
+			d.execute(new URL(((UpcApp)getApplication()).getUrl()));
+			html = d.get();
 		}
-	}
-	
-	public void descarregar() {
-		//Descarrega del document HTML de la URL especificada
-		//Si hi ha errors, els mostrem en Toasts
-		Descarrega d = new Descarrega();
-		html="EMPTY";
-		try {
-			html = (String) d.doInBackground(((UpcApp)getApplication()).getUrl());
+		catch (InterruptedException e)
+		{
+			// TODO Auto-generated catch block
+			e.printStackTrace();
 		}
-		catch(MalformedURLException e) {
-			Toast.makeText(this, "URL invalida", Toast.LENGTH_LONG).show();
+		catch (ExecutionException e)
+		{
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		catch (MalformedURLException e)
+		{
+			Toast.makeText(this, "URL Malformada", Toast.LENGTH_LONG).show();
 		}
-		catch(IOException e) {
-			Toast.makeText(this, "No s'ha pogut trobar la URL", Toast.LENGTH_LONG).show();
+		if(!html.equals("")) {
+			((UpcApp) getApplication()).setDesc(html);
+			startActivity(new Intent(this, Directoris.class));
 		}
 	}
@@ -141,6 +128,7 @@ public class MainActivity extends Activity implements OnClickListener {
 				return false;
 		}
 	}
+
 	/*
 	 * COSAS POR HACER
 	 * (NORMAL) Quitar la elección de calidad al inicio? Discutir
@@ -3,79 +3,91 @@ package com.upc.pbe.upcnews;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
+import java.util.concurrent.ExecutionException;
+import java.net.URL;
-import android.app.Activity;
+import android.content.Context;
 import android.widget.Toast;
 //Parser d'arxius m3u8
-public class Parser{
-	
+public class Parser
+{
+
 	private static final String STARTWORD = "#EXTM3U";
-	private String path; //CWD, completes implicit paths such as "file.m3u8" appending the CWD in order to download the file
-	private int fileType; //Indica si es segment list o media list
+	private String path; // CWD, completes implicit paths such as "file.m3u8"
+							// appending the CWD in order to download the file
+	private int fileType; // Indica si es segment list o media list
 	private int currentLine;
-	private int currentSegment; //Cada segment de cada qualitat distinta
-	private int currentList; //Index de cada recurso distint
+	private int currentSegment; // Cada segment de cada qualitat distinta
+	private int currentList; // Index de cada recurso distint
 	private boolean expectSegment = false;
 	private boolean expectList = false;
-	private Descarrega download;
-	private Activity caller; //On enviar les notificacions i warnings
-	private boolean validated; //Indica si la llista comen�a amb #EXTM3U o no
+	private Context ctx; // On enviar les notificacions i warnings
+	private boolean validated; // Indica si la llista comen�a amb #EXTM3U o no
 	private String server;
-	public Parser(String p, Activity caller){
-		this.caller = caller;
+	public Parser(String p, Context caller)
+	{
+		ctx = caller;
 		path = p;
 		String host = p.substring(7);
-		server = host.substring(0,host.indexOf("/"));
+		server = host.substring(0, host.indexOf("/"));
 		currentLine = 0;
 		currentSegment = 0;
 		currentList = 0;
-		fileType = -1;//-1 indica UNDETERMINED, 0 indica SEGMENTS, 1 indica MEDIA
-		download = new Descarrega();
+		fileType = -1;// -1 indica UNDETERMINED, 0 indica SEGMENTS, 1 indica
+						// MEDIA
 		validated = false;
 	}
-	public ArrayList<ParentList> parseFile(String file) throws ErrorException, WarningException, InfoException {
-		//Parseja un arxiu m3u8
+	public ArrayList<ParentList> parseFile(String file) throws ErrorException, WarningException, InfoException
+	{
+		// Parseja un arxiu m3u8
 		ArrayList<ParentList> lists = new ArrayList<ParentList>();
 		lists.add(new ParentList(""));
 		lists.get(0).getLists().add(new Video(-1));
 		String[] lines = file.split("\n");
-		for (int i = 0; i < lines.length; i++){
-			if (lines[i].endsWith("\\")){
-				//Barreja les entrades multilinea, que son les que acaben en backslash
+		for (int i = 0; i < lines.length; i++)
+		{
+			if (lines[i].endsWith("\\"))
+			{
+				// Barreja les entrades multilinea, que son les que acaben en
+				// backslash
 				lines[++i] = lines[i - 1].substring(0, lines[i - 1].indexOf("\\") - 1)
 						+ lines[i];
 			}
-			try{
+			try
+			{
 				parseLine(lines[i], lists);
 			}
-			catch (InfoException iE){
-				Toast.makeText(caller, iE.getMessage(), Toast.LENGTH_SHORT).show();
+			catch (InfoException iE)
+			{
+				Toast.makeText(ctx, iE.getMessage(), Toast.LENGTH_SHORT).show();
 			}
-			catch (WarningException wE){
-				Toast.makeText(caller, wE.getMessage(), Toast.LENGTH_SHORT).show();
+			catch (WarningException wE)
+			{
+				Toast.makeText(ctx, wE.getMessage(), Toast.LENGTH_SHORT).show();
 			}
 		}
 		/*
-		 * Esto contiene una lista de RECURSOS, 
-		 * que a su vez contiene una lista de CALIDADES. 
-		 * Si no te gusta mis VERSOS,
-		 * te mando a la mierda sin SUTILIDADES.
+		 * Esto contiene una lista de RECURSOS, que a su vez contiene una lista
+		 * de CALIDADES. Si no te gusta mis VERSOS, te mando a la mierda sin
+		 * SUTILIDADES.
 		 * 
 		 * -- Imanol, hasta las cejas de cafeina.
 		 * 
 		 * PD: En el ultimo nivel de profundidad hay una lista de segmentos
 		 * (debajo de calidades). Alli esta el autentico tesoro de Narnia.
 		 */
-		for (int i = 0; i < lists.size(); i++){
+		for (int i = 0; i < lists.size(); i++)
+		{
 			sortQuality(lists.get(i));
 		}
 		return lists;
 	}
-	private int searchID(String ID, ArrayList<ParentList> lists){
+	private int searchID(String ID, ArrayList<ParentList> lists)
+	{
 		for (int i = 0; i < lists.size(); i++)
 		{
 			if (lists.get(i).getID().equals(ID))
@@ -86,110 +98,154 @@ public class Parser{
 		return -1;
 	}
-	private void sortQuality(ParentList ppls){
+	private void sortQuality(ParentList ppls)
+	{
 		ArrayList<Video> lists = ppls.getLists();
-		if (lists.get(0).getQuality() == -1){
-			//Es el cas de Media Lists i Segment Lists, no tenen diferenciacio de qualitats
+		if (lists.get(0).getQuality() == -1)
+		{
+			// Es el cas de Media Lists i Segment Lists, no tenen diferenciacio
+			// de qualitats
 			return;
 		}
-		//Bubblesort
-		while (true){
+		// Bubblesort
+		while (true)
+		{
 			boolean sorted = true;
 			int i = 0;
-			do{
-				if (lists.get(i).getQuality() < lists.get(i + 1).getQuality()){
+			do
+			{
+				if (lists.get(i).getQuality() < lists.get(i + 1).getQuality())
+				{
 					sorted = false;
 					Video aux = lists.get(i);
 					lists.set(i, lists.get(i + 1));
 					lists.set(i + 1, aux);
 				}
-			}while (++i != lists.size() - 1);
-			if (sorted){
+			}
+			while (++i != lists.size() - 1);
+			if (sorted)
+			{
 				break;
 			}
 		}
 	}
-	public void parseLine(String line, ArrayList<ParentList> lists) throws ErrorException, WarningException, InfoException {
-		//Parseja una linea de l'arxiu
-		if (line.isEmpty()){
+	public void parseLine(String line, ArrayList<ParentList> lists) throws ErrorException, WarningException, InfoException
+	{
+		// Parseja una linea de l'arxiu
+		if (line.isEmpty())
+		{
 			currentLine++;
 			return;
 		}
-		else{
+		else
+		{
 			ParentList ppls = lists.get(currentList);
 			Video pls = ppls.getLists().get(ppls.getLists().size() - 1);
-			if (!validated){
-				if (line.equals(STARTWORD)){
+			if (!validated)
+			{
+				if (line.equals(STARTWORD))
+				{
 					validated = true;
 				}
-				else{
+				else
+				{
 					throw new ErrorException("Playlist no valida");
 				}
 			}
-			else{
-				if (line.charAt(0) == '#'){
-					if (line.substring(0, 4).equals("#EXT")){
-						if (expectSegment && !line.startsWith("#EXT-X-BYTERANGE")){
+			else
+			{
+				if (line.charAt(0) == '#')
+				{
+					if (line.substring(0, 4).equals("#EXT"))
+					{
+						if (expectSegment
+								&& !line.startsWith("#EXT-X-BYTERANGE"))
+						{
 							throw new ErrorException("S'esperava segment URI, en comptes tenim EXT-TAG");
 						}
-						if (expectList){
+						if (expectList)
+						{
 							throw new ErrorException("S'esperava llista, en comptes tenim EXT-TAG");
 						}
 						String[] extTag = line.split(":", 2);
-						if (extTag[0].equals("#EXT-X-MEDIA-SEQUENCE")){
+						if (extTag[0].equals("#EXT-X-MEDIA-SEQUENCE"))
+						{
 							pls.setSequence(Integer.parseInt(extTag[1]));
 						}
-						else if (extTag[0].equals("#EXT-X-TARGETDURATION")){
+						else if (extTag[0].equals("#EXT-X-TARGETDURATION"))
+						{
 							pls.setMaxDuration(Integer.parseInt(extTag[1]));
 						}
-						else if (extTag[0].equals("#EXTINF")){
-							if (fileType == -1){
+						else if (extTag[0].equals("#EXTINF"))
+						{
+							if (fileType == -1)
+							{
 								fileType = 0;
 							}
-							else if (fileType == 1){
+							else if (fileType == 1)
+							{
 								throw new ErrorException("Arxiu invalid, hauria de contenir llistes pero s'han trobat segments");
 							}
 							String[] args = extTag[1].split(",");
 							float duration = Float.parseFloat(args[0]);
-							if (duration > pls.getMaxDuration()){
-								throw new ErrorException("Segment " + currentSegment + 1 + " en linea " + currentLine + " supera la duracio maxima");
+							if (duration > pls.getMaxDuration())
+							{
+								throw new ErrorException("Segment "
+										+ currentSegment + 1 + " en linea "
+										+ currentLine
+										+ " supera la duracio maxima");
 							}
 							Segment s = new Segment(duration);
-							if (args.length == 1){
+							if (args.length == 1)
+							{
 								s.setName("");
 							}
-							else{
+							else
+							{
 								s.setName(args[1]);
 							}
 							pls.getSegments().add(s);
 							expectSegment = true;
 						}
-						else if (extTag[0].equals("#EXT-X-STREAM-INF")){
-							if (fileType == -1){
+						else if (extTag[0].equals("#EXT-X-STREAM-INF"))
+						{
+							if (fileType == -1)
+							{
 								fileType = 1;
 							}
-							else if (fileType == 0){
+							else if (fileType == 0)
+							{
 								throw new ErrorException("Arxiu invalid, hauria de contenir segments pero s'han trobat llistes");
 							}
 							expectList = true;
 							String programID = "";
 							double bandwidth = -1;
 							String[] arguments = extTag[1].split(",");
-							for (int i = 0; i < arguments.length; i++){
+							for (int i = 0; i < arguments.length; i++)
+							{
 								String[] argument = arguments[i].split("=");
-								//Si l'argument en questio conte diferents valors, detecta el caracter " i els ajunta en un String
-								if (argument[1].startsWith("\"") && !argument[1].endsWith("\"")){
+								// Si l'argument en questio conte diferents
+								// valors, detecta el caracter " i els ajunta en
+								// un String
+								if (argument[1].startsWith("\"")
+										&& !argument[1].endsWith("\""))
+								{
 									int j = i;
-									while (true){
-										if (i == arguments.length - 1){
-											throw new ErrorException("Argument mal expressat en linea " + currentLine);
+									while (true)
+									{
+										if (i == arguments.length - 1)
+										{
+											throw new ErrorException("Argument mal expressat en linea "
+													+ currentLine);
 										}
-										if (arguments[++i].endsWith("\"")){
+										if (arguments[++i].endsWith("\""))
+										{
 											String end = arguments[i];
-											for (int k = j + 1; k < i; k++){
+											for (int k = j + 1; k < i; k++)
+											{
 												argument[1] += arguments[k];
 											}
 											argument[1] += end;
@@ -197,26 +253,37 @@ public class Parser{
 										}
 									}
 								}
-								if (argument[0].equals("PROGRAM-ID")){
+								if (argument[0].equals("PROGRAM-ID"))
+								{
 									programID = argument[1];
 								}
-								else if (argument[0].equals("BANDWIDTH")){
+								else if (argument[0].equals("BANDWIDTH"))
+								{
 									bandwidth = Double.parseDouble(argument[1]);
 								}
 							}
-							if (programID.equals("") || bandwidth == -1){
-								throw new ErrorException("Playlist en linea " + currentLine + " no te arguments");
+							if (programID.equals("") || bandwidth == -1)
+							{
+								throw new ErrorException("Playlist en linea "
+										+ currentLine + " no te arguments");
 							}
-							if (!programID.equals(ppls.getID())){
-								//Si el Program-ID no coincideix, buscar o crear un de nou
-								if (ppls.getID().equals("")){
-									//Si es treballa amb la ParentList per defecte, modificar, no crear una nova
+							if (!programID.equals(ppls.getID()))
+							{
+								// Si el Program-ID no coincideix, buscar o
+								// crear un de nou
+								if (ppls.getID().equals(""))
+								{
+									// Si es treballa amb la ParentList per
+									// defecte, modificar, no crear una nova
 									lists.get(0).setID(programID);
 								}
-								else{
+								else
+								{
 									currentList = searchID(programID, lists);
-									if (currentList == -1){
-										//No s'ha trobat ParentList, es crea una nova
+									if (currentList == -1)
+									{
+										// No s'ha trobat ParentList, es crea
+										// una nova
 										lists.add(new ParentList(programID));
 										currentList = lists.size() - 1;
 									}
@@ -224,20 +291,28 @@ public class Parser{
 									pls = ppls.getLists().get(ppls.getLists().size() - 1);
 								}
 							}
-							//Creem una List dins el ParentList correcte
-							if ((ppls.getLists().size() == 1) && (pls.getQuality() == -1) && pls.getSegments().isEmpty()){
-								//Si es treballa amb la List per defecte, modificar, no crear una nova
+							// Creem una List dins el ParentList correcte
+							if ((ppls.getLists().size() == 1)
+									&& (pls.getQuality() == -1)
+									&& pls.getSegments().isEmpty())
+							{
+								// Si es treballa amb la List per defecte,
+								// modificar, no crear una nova
 								pls.setQuality(bandwidth);
 							}
-							else{
+							else
+							{
 								ppls.getLists().add(new Video(bandwidth));
 							}
 						}
-						else if (extTag[0].equals("#EXT-X-MEDIA")){
-							if (fileType == -1){
+						else if (extTag[0].equals("#EXT-X-MEDIA"))
+						{
+							if (fileType == -1)
+							{
 								fileType = 1;
 							}
-							else if (fileType == 0){
+							else if (fileType == 0)
+							{
 								throw new ErrorException("Arxiu invalid, hauria de contenir segments pero s'han trobat llistes");
 							}
 							String Type = "";
@@ -246,18 +321,28 @@ public class Parser{
 							String URI = "";
 							boolean Default = false;
 							String[] arguments = extTag[1].split(",");
-							for (int i = 0; i < arguments.length; i++){
+							for (int i = 0; i < arguments.length; i++)
+							{
 								String[] argument = arguments[i].split("=");
-								//Si l'argument en questio conte diferents valors, detecta el caracter " i els ajunta en un String
-								if (argument[1].startsWith("\"") && !argument[1].endsWith("\"")){
+								// Si l'argument en questio conte diferents
+								// valors, detecta el caracter " i els ajunta en
+								// un String
+								if (argument[1].startsWith("\"")
+										&& !argument[1].endsWith("\""))
+								{
 									int j = i;
-									while (true){
-										if (i == arguments.length - 1){
-											throw new ErrorException("Argument mal expressat en linea " + currentLine);
+									while (true)
+									{
+										if (i == arguments.length - 1)
+										{
+											throw new ErrorException("Argument mal expressat en linea "
+													+ currentLine);
 										}
-										if (arguments[++i].endsWith("\"")){
+										if (arguments[++i].endsWith("\""))
+										{
 											String end = arguments[i];
-											for (int k = j + 1; k < i; k++){
+											for (int k = j + 1; k < i; k++)
+											{
 												argument[1] += arguments[k];
 											}
 											argument[1] += end;
@@ -265,55 +350,79 @@ public class Parser{
 										}
 									}
 								}
-								if (argument[0].equals("NAME")){
+								if (argument[0].equals("NAME"))
+								{
 									Name = argument[1].substring(1, argument[1].length() - 1);
 								}
-								else if (argument[0].equals("TYPE")){
+								else if (argument[0].equals("TYPE"))
+								{
 									Type = argument[1];
 								}
-								else if (argument[0].equals("GROUP-ID")){
+								else if (argument[0].equals("GROUP-ID"))
+								{
 									GroupID = argument[1].substring(1, argument[1].length() - 1);
 								}
-								else if (argument[0].equals("DEFAULT")){
-									if (argument[1].equals("YES")){
+								else if (argument[0].equals("DEFAULT"))
+								{
+									if (argument[1].equals("YES"))
+									{
 										Default = true;
 									}
-									else if (argument[1].equals("NO")){
+									else if (argument[1].equals("NO"))
+									{
 										Default = true;
 									}
-									else{
-										throw new ErrorException("Valor invalid per l'argument DEFAULT en linea " + currentLine);
+									else
+									{
+										throw new ErrorException("Valor invalid per l'argument DEFAULT en linea "
+												+ currentLine);
 									}
 								}
-								else if (argument[0].equals("URI")){
-									if (!argument[1].contains("http://")){
-										//En cas de que la ruta llegida es RELATIVE
-										URI = path + argument[1].substring(1, argument[1].length() - 1);
+								else if (argument[0].equals("URI"))
+								{
+									if (!argument[1].contains("http://"))
+									{
+										// En cas de que la ruta llegida es
+										// RELATIVE
+										URI = path
+												+ argument[1].substring(1, argument[1].length() - 1);
 									}
-									else{
+									else
+									{
 										URI = argument[1].substring(1, argument[1].length() - 1);
 									}
 								}
 							}
-							if (Type.equals("") || Name.equals("") || URI.equals("") || GroupID.equals("")) {
-								throw new ErrorException("Playlist en linea " + currentLine + " no te arguments");
+							if (Type.equals("") || Name.equals("")
+									|| URI.equals("") || GroupID.equals(""))
+							{
+								throw new ErrorException("Playlist en linea "
+										+ currentLine + " no te arguments");
 							}
-							Parser p = new Parser(URI.substring(0, URI.lastIndexOf("/") + 1), caller);
+							Parser p = new Parser(URI.substring(0, URI.lastIndexOf("/") + 1), ctx);
 							Video newList;
-							try{
-								newList = p.parseFile(download.doInBackground(URI)).get(0).getLists().get(0);
-								if (!GroupID.equals(ppls.getID())){
-									if (ppls.getID().equals("")){
-										//Si es treballa amb la ParentList per defecte, modificar, no crear una nova
+							try
+							{
+								Descarrega download = new Descarrega(ctx);
+								download.execute(new URL(URI));
+								newList = p.parseFile(download.get()).get(0).getLists().get(0);
+								if (!GroupID.equals(ppls.getID()))
+								{
+									if (ppls.getID().equals(""))
+									{
+										// Si es treballa amb la ParentList per
+										// defecte, modificar, no crear una nova
 										ppls.setDefault(Default);
 										ppls.setName(Name);
 										ppls.setType(Type);
 										ppls.getLists().set(0, newList);
 										ppls.setID(GroupID);
 									}
-									else{
+									else
+									{
 										currentList = searchID(GroupID, lists);
-										if (currentList == -1){
+										if (currentList == -1)
+										{
 											ParentList pl = new ParentList(GroupID);
 											pl.setDefault(Default);
 											pl.setName(Name);
@@ -325,73 +434,115 @@ public class Parser{
 										ppls.getLists().add(newList);
 									}
 								}
-								else{
+								else
+								{
 									ppls.getLists().add(newList);
 								}
 							}
-							catch (IOException e){
-								// Nunca llegara aqui la cosa, y si lo hace ES CULPA DEL SERVIDOR!!
+							catch (IOException e)
+							{
+								// Nunca llegara aqui la cosa, y si lo hace ES
+								// CULPA DEL SERVIDOR!!
+							}
+							catch(InterruptedException e)
+							{
+								
+							}
+							catch(ExecutionException e)
+							{
+								
 							}
 						}
-						else if (extTag[0].equals("#EXT-X-ENDLIST")){
-							if (expectSegment || expectList){
+						else if (extTag[0].equals("#EXT-X-ENDLIST"))
+						{
+							if (expectSegment || expectList)
+							{
 								throw new ErrorException("Final de llista no esperat!");
 							}
 						}
-						else if (extTag[0].equals("#EXT-X-VERSION")){
-							//IGNORE
+						else if (extTag[0].equals("#EXT-X-VERSION"))
+						{
+							// IGNORE
 						}
-						else if (extTag[0].equals("#EXT-X-PLAYLIST-TYPE")){
-							//IGNORE
+						else if (extTag[0].equals("#EXT-X-PLAYLIST-TYPE"))
+						{
+							// IGNORE
 						}
-						else{
+						else
+						{
 							currentLine++;
-							throw new WarningException("Tag no implementat: " + extTag[0]);
+							throw new WarningException("Tag no implementat: "
+									+ extTag[0]);
 						}
 					}
-					else{
+					else
+					{
 						String comment = line.substring(1);
-						throw new InfoException("Comentari en linea " + currentLine++ + " " + comment);
+						throw new InfoException("Comentari en linea "
+								+ currentLine++ + " " + comment);
 					}
 				}
-				else{
-					if (expectSegment){
+				else
+				{
+					if (expectSegment)
+					{
 						expectSegment = false;
-						try{
-							if(!line.startsWith("http://") && !line.startsWith("/"))
+						try
+						{
+							if (!line.startsWith("http://")
+									&& !line.startsWith("/"))
 							{
 								line = path + line;
 							}
-							else if(line.startsWith("/"))
+							else if (line.startsWith("/"))
 							{
 								line = server + line;
 							}
 							pls.getSegments().get(currentSegment).setURL(line);
 						}
-						catch (MalformedURLException e){
+						catch (MalformedURLException e)
+						{
 							throw new ErrorException(e.getMessage());
 						}
 						currentSegment++;
 					}
-					else if (expectList){
-						//Descarregar llista i juntar les entrades amb les de la llista actual
+					else if (expectList)
+					{
+						// Descarregar llista i juntar les entrades amb les de
+						// la llista actual
 						expectList = false;
-						Parser p = new Parser(line.substring(0, line.lastIndexOf("/") + 1), caller);
+						Parser p = new Parser(line.substring(0, line.lastIndexOf("/") + 1), ctx);
 						Video newList;
-						try{
-							newList = p.parseFile(download.doInBackground(line)).get(0).getLists().get(0);
+						try
+						{
+							Descarrega download = new Descarrega(ctx);
+							download.execute(new URL(line));
+							newList = p.parseFile(download.get()).get(0).getLists().get(0);
 							pls.setMaxDuration(newList.getMaxDuration());
 							pls.setSequence(newList.getSequence());
-							for (int i = 0; i < newList.getSegments().size(); i++){
+							for (int i = 0; i < newList.getSegments().size(); i++)
+							{
 								pls.getSegments().add(newList.getSegments().get(i));
 							}
 						}
-						catch (IOException e){
-							// Nunca llegara aqui la cosa, y si lo hace ES CULPA DEL SERVIDOR!!
+						catch (IOException e)
+						{
+							// Nunca llegara aqui la cosa, y si lo hace ES CULPA
+							// DEL SERVIDOR!!
+						}
+						catch(InterruptedException e)
+						{
+							
+						}
+						catch(ExecutionException e)
+						{
+							
 						}
 					}
-					else{
-						throw new ErrorException("ERROR: String no esperat" + line);
+					else
+					{
+						throw new ErrorException("ERROR: String no esperat"
+								+ line);
 					}
 				}
 			}
@@ -9,6 +9,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 //Modificacio de l'Adapter d'Adnroid, creat al nostre gust per donar estil als elements de la ListView de directoris i arxius
@@ -29,17 +30,20 @@ public class ResourceAdapter extends ArrayAdapter&lt;String&gt; {
     public View getView(int position, View convertView, ViewGroup parent) {
     	 TextView row;
     	 ImageView rowImage;
+    	 RelativeLayout container;
-         if (convertView == null) {
+         if (convertView == null) 
+         {
         	 LayoutInflater inflater = ((Activity)context).getLayoutInflater();
-             row = (TextView) inflater.inflate(R.layout.rowlayout, parent, false);
-             rowImage = (ImageView) inflater.inflate(R.layout.rowlayout, parent, false);
+             container = (RelativeLayout) inflater.inflate(R.layout.rowlayout, parent, false);
          } 
-         else {
-             row = (TextView) convertView;
-             rowImage = (ImageView) convertView;
+         else 
+         {
+             container = (RelativeLayout) convertView;
          }
          final String text = entries[position];
+         row = (TextView) container.findViewById(R.id.rowTextView);
+         rowImage = (ImageView) container.findViewById(R.id.rowImageView);
          row.setText(text);
          //Si es un m3u8, posem el text en verd i l'icono de video
 	     if(text.endsWith(".m3u8")) {
@@ -52,6 +56,6 @@ public class ResourceAdapter extends ArrayAdapter&lt;String&gt; {
 	    	 row.setTextColor(((Activity)context).getResources().getColor(R.color.BlueAndroid));
 	    	 rowImage.setImageResource(R.drawable.mediacontroller_ff_right);
 	     }
-        return row;
+        return container;
     }
 }
 \ No newline at end of file
@@ -15,8 +15,7 @@ public class UpcApp extends Application implements
 	private SharedPreferences prefs; // Conjunt de preferencies de l'aplicacio
 	private String url = null;
 	private String desc;
-	private final static String localPath = Environment
-			.getExternalStorageDirectory().getPath() + "/UPC NEWS/";
+	private final static String localPath = Environment.getExternalStorageDirectory().getPath() + "/UPC NEWS/";
 	private HLS h;
 	public String getLocalPath() {
@@ -61,10 +60,4 @@ public class UpcApp extends Application implements
 	public String getDesc() {
 		return desc;
 	}
-
-	public int getQuality() {
-		int qual = Integer.parseInt(prefs.getString("quality", "0"));
-		
-		return qual;
-	}
 }
 \ No newline at end of file
@@ -60,7 +60,7 @@ public class VideoActivity extends Activity {
 		video.setVideoQuality(MediaPlayer.VIDEOQUALITY_HIGH);
 		//Creem un gestor HLS, carreguem el video i iniciem la reproduccio
 		h = ((UpcApp)getApplication()).getHLS();
-		h.setDefQuality(((UpcApp)getApplication()).getQuality());
+		h.startDownloadManager(this);
 		h.loadVideo();
 		video.stopPlayback();
 		video.setMediaController(mc);