downloader made background thread

diff --git a/src/eu/alefzero/owncloud/FileDownloader.java b/src/eu/alefzero/owncloud/FileDownloader.java
index 121e147..87e8d96 100644 (file)
--- a/src/eu/alefzero/owncloud/FileDownloader.java
+++ b/src/eu/alefzero/owncloud/FileDownloader.java
@@ -10,49 +10,85 @@ import android.app.PendingIntent;
 import android.app.Service;\r
 import android.content.Intent;\r
 import android.net.Uri;\r
 import android.app.Service;\r
 import android.content.Intent;\r
 import android.net.Uri;\r

+import android.os.Binder;\r

 import android.os.Environment;\r
 import android.os.Environment;\r

+import android.os.Handler;\r
+import android.os.HandlerThread;\r

 import android.os.IBinder;\r
 import android.os.IBinder;\r

+import android.os.Looper;\r
+import android.os.Message;\r
+import android.os.Process;\r

 import android.util.Log;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 public class FileDownloader extends Service {\r
 import android.util.Log;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 public class FileDownloader extends Service {\r

-  static final String EXTRA_ACCOUNT = "ACCOUNT";\r
-  static final String EXTRA_FILE_PATH = "FILE_PATH";\r
-  static final String TAG = "OC_FileDownloader";\r
+  public static final String EXTRA_ACCOUNT = "ACCOUNT";\r
+  public static final String EXTRA_FILE_PATH = "FILE_PATH";\r
+  private static final String TAG = "OC_FileDownloader";\r

   \r
   \r

-  NotificationManager nm;\r
+  private NotificationManager nm;\r
+  private Looper mServiceLooper;\r
+  private ServiceHandler mServiceHandler;\r
+  private Account mAccount;\r
+  private String mFilePath;\r
+  \r
+  private final class ServiceHandler extends Handler {\r
+    public ServiceHandler(Looper looper) {\r
+      super(looper);\r
+    }\r
+    @Override\r
+    public void handleMessage(Message msg) {\r
+      downloadFile();\r
+      stopSelf(msg.arg1);\r
+    }\r
+  }\r
+  \r
+  @Override\r
+  public void onCreate() {\r
+    super.onCreate();\r
+    nm = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);\r
+    HandlerThread thread = new HandlerThread("FileDownladerThread", Process.THREAD_PRIORITY_BACKGROUND);\r
+    thread.start();\r
+    mServiceLooper = thread.getLooper();\r
+    mServiceHandler = new ServiceHandler(mServiceLooper); \r
+  }\r

   \r
   @Override\r
   public IBinder onBind(Intent arg0) {\r
     return null;\r
   }\r
   \r
   @Override\r
   public IBinder onBind(Intent arg0) {\r
     return null;\r
   }\r

-  \r
+\r

   @Override\r
   public int onStartCommand(Intent intent, int flags, int startId) {\r
     if (!intent.hasExtra(EXTRA_ACCOUNT) && !intent.hasExtra(EXTRA_FILE_PATH)) {\r
       Log.e(TAG, "Not enough information provided in intent");\r
   @Override\r
   public int onStartCommand(Intent intent, int flags, int startId) {\r
     if (!intent.hasExtra(EXTRA_ACCOUNT) && !intent.hasExtra(EXTRA_FILE_PATH)) {\r
       Log.e(TAG, "Not enough information provided in intent");\r

-      return START_NOT_STICKY;\r
+      return START_STICKY;\r

     }\r
     }\r

+    mAccount = intent.getParcelableExtra(EXTRA_ACCOUNT);\r
+    mFilePath = intent.getStringExtra(EXTRA_FILE_PATH);\r
+    Message msg = mServiceHandler.obtainMessage();\r
+    msg.arg1 = startId;\r
+    mServiceHandler.sendMessage(msg);\r

     \r
     \r

-    nm = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);\r

     \r
     \r

-    Account account = intent.getParcelableExtra(EXTRA_ACCOUNT);\r
-    String file_path = intent.getStringExtra(EXTRA_FILE_PATH);\r
+    return START_NOT_STICKY;\r
+  }\r
+  \r
+  void downloadFile() {\r

     AccountManager am = (AccountManager)getSystemService(ACCOUNT_SERVICE);\r
     AccountManager am = (AccountManager)getSystemService(ACCOUNT_SERVICE);\r

-    Uri oc_url = Uri.parse(am.getUserData(account, AccountAuthenticator.KEY_OC_URL));\r
+    Uri oc_url = Uri.parse(am.getUserData(mAccount, AccountAuthenticator.KEY_OC_URL));\r

 \r
     WebdavClient wdc = new WebdavClient(oc_url);\r
     \r
 \r
     WebdavClient wdc = new WebdavClient(oc_url);\r
     \r

-    String username = account.name.split("@")[0];\r
+    String username = mAccount.name.split("@")[0];\r

     String password = "";\r
     try {\r
     String password = "";\r
     try {\r

-      password = am.blockingGetAuthToken(account, AccountAuthenticator.AUTH_TOKEN_TYPE, true);\r
+      password = am.blockingGetAuthToken(mAccount, AccountAuthenticator.AUTH_TOKEN_TYPE, true);\r

     } catch (Exception e) {\r
       // TODO Auto-generated catch block\r
       e.printStackTrace();\r
     } catch (Exception e) {\r
       // TODO Auto-generated catch block\r
       e.printStackTrace();\r

-      return START_NOT_STICKY;\r

     }\r
     \r
     wdc.setCredentials(username, password);\r
     }\r
     \r
     wdc.setCredentials(username, password);\r


@@ -60,18 +96,16 @@ public class FileDownloader extends Service {
 \r
     Notification n = new Notification(R.drawable.icon, "Downloading file", System.currentTimeMillis());\r
     PendingIntent pi = PendingIntent.getActivity(this, 1, new Intent(this, FileDisplayActivity.class), 0);\r
 \r
     Notification n = new Notification(R.drawable.icon, "Downloading file", System.currentTimeMillis());\r
     PendingIntent pi = PendingIntent.getActivity(this, 1, new Intent(this, FileDisplayActivity.class), 0);\r

-    n.setLatestEventInfo(this, "A", "B", pi);\r
+    n.setLatestEventInfo(this, "Downloading file", "Downloading file " + mFilePath, pi);\r

     nm.notify(1, n);\r
 \r
     File sdCard = Environment.getExternalStorageDirectory();\r
     File dir = new File (sdCard.getAbsolutePath() + "/owncloud");\r
     dir.mkdirs();\r
     nm.notify(1, n);\r
 \r
     File sdCard = Environment.getExternalStorageDirectory();\r
     File dir = new File (sdCard.getAbsolutePath() + "/owncloud");\r
     dir.mkdirs();\r

-    File file = new File(dir, file_path.replace('/', '.'));\r
-    \r
-    wdc.downloadFile(file_path, file);\r
+    File file = new File(dir, mFilePath.replace('/', '.'));\r

     \r
     \r

-    return START_NOT_STICKY;\r
+    wdc.downloadFile(mFilePath, file);\r
+    nm.cancel(1);\r

   }\r
   \r
   }\r
   \r

-  \r

 }\r
 }\r