fix crash when deleting used account

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / FileDownloader.java

diff --git a/src/eu/alefzero/owncloud/FileDownloader.java b/src/eu/alefzero/owncloud/FileDownloader.java
index 3245be1..3fb5b45 100644 (file)
--- a/src/eu/alefzero/owncloud/FileDownloader.java
+++ b/src/eu/alefzero/owncloud/FileDownloader.java
@@ -11,7 +11,6 @@ import android.app.Service;
 import android.content.ContentValues;\r
 import android.content.Intent;\r
 import android.net.Uri;\r
 import android.content.ContentValues;\r
 import android.content.Intent;\r
 import android.net.Uri;\r

-import android.os.Binder;\r

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


@@ -21,15 +20,15 @@ import android.os.Message;
 import android.os.Process;\r
 import android.util.Log;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import android.os.Process;\r
 import android.util.Log;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r

-import eu.alefzero.owncloud.db.DbHandler;\r

 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 public class FileDownloader extends Service {\r
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 public class FileDownloader extends Service {\r

+  public static final String DOWNLOAD_FINISH_MESSAGE = "DOWNLOAD_FINISH";\r

   public static final String EXTRA_ACCOUNT = "ACCOUNT";\r
   public static final String EXTRA_FILE_PATH = "FILE_PATH";\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
+  private static final String TAG = "FileDownloader";\r

   \r
   private NotificationManager nm;\r
   private Looper mServiceLooper;\r
   \r
   private NotificationManager nm;\r
   private Looper mServiceLooper;\r


@@ -105,6 +104,7 @@ public class FileDownloader extends Service {
     dir.mkdirs();\r
     File file = new File(dir, mFilePath.replace('/', '.'));\r
     \r
     dir.mkdirs();\r
     File file = new File(dir, mFilePath.replace('/', '.'));\r
     \r

+    Log.e(TAG, file.getAbsolutePath() + " " + oc_url.toString());\r

     wdc.downloadFile(mFilePath, file);\r
     ContentValues cv = new ContentValues();\r
     cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getAbsolutePath());\r
     wdc.downloadFile(mFilePath, file);\r
     ContentValues cv = new ContentValues();\r
     cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getAbsolutePath());\r


@@ -113,6 +113,8 @@ public class FileDownloader extends Service {
         ProviderTableMeta.FILE_NAME +"=? AND "+ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
         new String[]{mFilePath.substring(mFilePath.lastIndexOf('/')+1), mAccount.name});\r
     nm.cancel(1);\r
         ProviderTableMeta.FILE_NAME +"=? AND "+ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
         new String[]{mFilePath.substring(mFilePath.lastIndexOf('/')+1), mAccount.name});\r
     nm.cancel(1);\r

+    Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE);\r
+    sendBroadcast(end);\r

   }\r
   \r
 }\r
   }\r
   \r
 }\r