setting correct path on restore activity

[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 c0c950a..1936e8e 100644 (file)
--- a/src/eu/alefzero/owncloud/FileDownloader.java
+++ b/src/eu/alefzero/owncloud/FileDownloader.java
@@ -8,7 +8,6 @@ import android.app.Notification;
 import android.app.NotificationManager;\r
 import android.app.PendingIntent;\r
 import android.app.Service;\r
 import android.app.NotificationManager;\r
 import android.app.PendingIntent;\r
 import android.app.Service;\r

-import android.content.BroadcastReceiver;\r

 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


@@ -23,98 +22,118 @@ import android.util.Log;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;\r

+import eu.alefzero.owncloud.utils.OwnCloudVersion;\r

 import eu.alefzero.webdav.WebdavClient;\r
 \r
 public class FileDownloader extends Service {\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
-  private static final String TAG = "FileDownloader";\r
-  \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
+    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
+    private static final String TAG = "FileDownloader";\r
+\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
+\r
+        @Override\r
+        public void handleMessage(Message msg) {\r
+            downloadFile();\r
+            stopSelf(msg.arg1);\r
+        }\r

     }\r
     }\r

+\r

     @Override\r
     @Override\r

-    public void handleMessage(Message msg) {\r
-      downloadFile();\r
-      stopSelf(msg.arg1);\r
+    public void onCreate() {\r
+        super.onCreate();\r
+        nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);\r
+        HandlerThread thread = new HandlerThread("FileDownladerThread",\r
+                Process.THREAD_PRIORITY_BACKGROUND);\r
+        thread.start();\r
+        mServiceLooper = thread.getLooper();\r
+        mServiceHandler = new ServiceHandler(mServiceLooper);\r

     }\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 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_STICKY;\r
+\r
+    @Override\r
+    public IBinder onBind(Intent arg0) {\r
+        return null;\r
+    }\r
+\r
+    @Override\r
+    public int onStartCommand(Intent intent, int flags, int startId) {\r
+        if (!intent.hasExtra(EXTRA_ACCOUNT)\r
+                && !intent.hasExtra(EXTRA_FILE_PATH)) {\r
+            Log.e(TAG, "Not enough information provided in intent");\r
+            return START_STICKY;\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
+        return START_NOT_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
-    return START_NOT_STICKY;\r
-  }\r
-  \r
-  void downloadFile() {\r
-    AccountManager am = (AccountManager)getSystemService(ACCOUNT_SERVICE);\r
-    Uri oc_url = Uri.parse(am.getUserData(mAccount, AccountAuthenticator.KEY_OC_URL));\r
-\r
-    WebdavClient wdc = new WebdavClient(oc_url);\r
-    \r
-    String username = mAccount.name.split("@")[0];\r
-    String password = "";\r
-    try {\r
-      password = am.blockingGetAuthToken(mAccount, AccountAuthenticator.AUTH_TOKEN_TYPE, true);\r
-    } catch (Exception e) {\r
-      e.printStackTrace();\r
+\r
+    void downloadFile() {\r
+        AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);\r
+        String oc_base_url = am.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);\r
+        OwnCloudVersion ocv = new OwnCloudVersion(am\r
+                .getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION));\r
+        String webdav_path = AccountUtils.getWebdavPath(ocv);\r
+        Uri oc_url = Uri.parse(oc_base_url+webdav_path);\r
+\r
+        WebdavClient wdc = new WebdavClient(Uri.parse(oc_base_url + webdav_path));\r
+\r
+        String username = mAccount.name.split("@")[0];\r
+        String password = "";\r
+        try {\r
+            password = am.blockingGetAuthToken(mAccount,\r
+                    AccountAuthenticator.AUTH_TOKEN_TYPE, true);\r
+        } catch (Exception e) {\r
+            e.printStackTrace();\r
+            return;\r
+        }\r
+\r
+        wdc.setCredentials(username, password);\r
+        wdc.allowUnsignedCertificates();\r
+\r
+        Notification n = new Notification(R.drawable.icon, "Downloading file",\r
+                System.currentTimeMillis());\r
+        PendingIntent pi = PendingIntent.getActivity(this, 1, new Intent(this,\r
+                FileDisplayActivity.class), 0);\r
+        n.setLatestEventInfo(this, "Downloading file", "Downloading file "\r
+                + 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
+        File file = new File(dir, mFilePath.replace('/', '.'));\r
+\r
+        Log.e(TAG, file.getAbsolutePath() + " " + oc_url.toString());\r
+        Log.e(TAG, mFilePath+"");\r
+        if (wdc.downloadFile(mFilePath, file)) {\r
+            ContentValues cv = new ContentValues();\r
+            cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getAbsolutePath());\r
+            getContentResolver().update(\r
+                    ProviderTableMeta.CONTENT_URI,\r
+                    cv,\r
+                    ProviderTableMeta.FILE_NAME + "=? AND "\r
+                            + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",\r
+                    new String[] {\r
+                            mFilePath.substring(mFilePath.lastIndexOf('/') + 1),\r
+                            mAccount.name });            \r
+        }\r
+        nm.cancel(1);\r
+        Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE);\r
+        sendBroadcast(end);\r

     }\r
     }\r

-    \r
-    wdc.setCredentials(username, password);\r
-    wdc.allowUnsignedCertificates();\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, "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
-    File file = new File(dir, mFilePath.replace('/', '.'));\r
-    \r
-    wdc.downloadFile(mFilePath, file);\r
-    ContentValues cv = new ContentValues();\r
-    cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getAbsolutePath());\r
-    getContentResolver().update(ProviderTableMeta.CONTENT_URI,\r
-        cv,\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