first download & preview scratch, removing unused code, changing noncompatible code

diff --git a/res/drawable-hdpi/download.png b/res/drawable-hdpi/download.png
new file mode 100644 (file)
index 0000000..19593cf
Binary files /dev/null and b/res/drawable-hdpi/download.png differ

diff --git a/res/drawable-ldpi/download.png b/res/drawable-ldpi/download.png
new file mode 100644 (file)
index 0000000..f8b790f
Binary files /dev/null and b/res/drawable-ldpi/download.png differ

diff --git a/res/drawable-mdpi/download.png b/res/drawable-mdpi/download.png
new file mode 100644 (file)
index 0000000..e055568
Binary files /dev/null and b/res/drawable-mdpi/download.png differ

diff --git a/res/layout/file_details.xml b/res/layout/file_details.xml
index 5646991..b84b6bb 100644 (file)
--- a/res/layout/file_details.xml
+++ b/res/layout/file_details.xml
@@ -27,6 +27,18 @@
        </LinearLayout>
        <LinearLayout android:layout_width="fill_parent"
                android:id="@+id/linearLayout4" android:layout_height="fill_parent">
        </LinearLayout>
        <LinearLayout android:layout_width="fill_parent"
                android:id="@+id/linearLayout4" android:layout_height="fill_parent">

+
+               <ImageView
+                   android:id="@+id/imageView2"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:src="@drawable/action_item_btn" />
+
+               <VideoView
+                   android:id="@+id/videoView1"
+                   android:layout_width="wrap_content"
+                   android:layout_height="match_parent" />
+

                <ListView android:layout_width="fill_parent" android:id="@android:id/list"
                        android:layout_height="fill_parent" android:divider="@drawable/uploader_list_separator"
                        android:dividerHeight="1dip"></ListView>
                <ListView android:layout_width="fill_parent" android:id="@android:id/list"
                        android:layout_height="fill_parent" android:divider="@drawable/uploader_list_separator"
                        android:dividerHeight="1dip"></ListView>

diff --git a/src/eu/alefzero/owncloud/FileDownloader.java b/src/eu/alefzero/owncloud/FileDownloader.java
index 87e8d96..3245be1 100644 (file)
--- a/src/eu/alefzero/owncloud/FileDownloader.java
+++ b/src/eu/alefzero/owncloud/FileDownloader.java
@@ -8,6 +8,7 @@ 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.ContentValues;\r

 import android.content.Intent;\r
 import android.net.Uri;\r
 import android.os.Binder;\r
 import android.content.Intent;\r
 import android.net.Uri;\r
 import android.os.Binder;\r


@@ -20,6 +21,8 @@ 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
 import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r


@@ -71,8 +74,7 @@ public class FileDownloader extends Service {
     Message msg = mServiceHandler.obtainMessage();\r
     msg.arg1 = startId;\r
     mServiceHandler.sendMessage(msg);\r
     Message msg = mServiceHandler.obtainMessage();\r
     msg.arg1 = startId;\r
     mServiceHandler.sendMessage(msg);\r

-    \r
-    \r
+\r

     return START_NOT_STICKY;\r
   }\r
   \r
     return START_NOT_STICKY;\r
   }\r
   \r


@@ -87,7 +89,6 @@ public class FileDownloader extends Service {
     try {\r
       password = am.blockingGetAuthToken(mAccount, AccountAuthenticator.AUTH_TOKEN_TYPE, true);\r
     } catch (Exception e) {\r
     try {\r
       password = am.blockingGetAuthToken(mAccount, AccountAuthenticator.AUTH_TOKEN_TYPE, true);\r
     } catch (Exception e) {\r

-      // TODO Auto-generated catch block\r

       e.printStackTrace();\r
     }\r
     \r
       e.printStackTrace();\r
     }\r
     \r


@@ -105,6 +106,12 @@ public class FileDownloader extends Service {
     File file = new File(dir, mFilePath.replace('/', '.'));\r
     \r
     wdc.downloadFile(mFilePath, file);\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
   }\r
   \r
     nm.cancel(1);\r
   }\r
   \r

diff --git a/src/eu/alefzero/owncloud/Uploader.java b/src/eu/alefzero/owncloud/Uploader.java
index b15cab9..6b17052 100644 (file)
--- a/src/eu/alefzero/owncloud/Uploader.java
+++ b/src/eu/alefzero/owncloud/Uploader.java
@@ -438,6 +438,16 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
                 Uploader.this.onUploadComplete(false, "Error while uploading file: " + c.getString(c.getColumnIndex(Media.DISPLAY_NAME)));\r
               }\r
             });\r
                 Uploader.this.onUploadComplete(false, "Error while uploading file: " + c.getString(c.getColumnIndex(Media.DISPLAY_NAME)));\r
               }\r
             });\r

+          } else {\r
+            mHandler.post(new Runnable() {\r
+              public void run() {\r
+                Uploader.this.PartialupdateUpload(c.getString(c.getColumnIndex(Media.DATA)),\r
+                    c.getString(c.getColumnIndex(Media.DISPLAY_NAME)),\r
+                    mUploadPath+"/"+c.getString(c.getColumnIndex(Media.DISPLAY_NAME)),\r
+                    c.getString(c.getColumnIndex(Media.MIME_TYPE)),\r
+                    c.getString(c.getColumnIndex(Media.SIZE)));\r
+              }\r
+            });\r

           }\r
         } else if (uri.getScheme().equals("file")) {\r
          final File file = new File(Uri.decode(uri.toString()).replace(uri.getScheme()+"://", ""));\r
           }\r
         } else if (uri.getScheme().equals("file")) {\r
          final File file = new File(Uri.decode(uri.toString()).replace(uri.getScheme()+"://", ""));\r

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 93d0ab7..328128d 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -18,59 +18,26 @@
 \r
 package eu.alefzero.owncloud.ui.activity;\r
 \r
 \r
 package eu.alefzero.owncloud.ui.activity;\r
 \r

-import java.io.File;\r
-import java.io.FileInputStream;\r
-import java.io.FileNotFoundException;\r
-import java.io.IOException;\r
-import java.util.LinkedList;\r
-import java.util.Stack;\r
-\r

 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.AlertDialog;\r
 import android.app.Dialog;\r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.AlertDialog;\r
 import android.app.Dialog;\r

-import android.app.ListActivity;\r

 import android.app.ActionBar.OnNavigationListener;\r
 import android.content.DialogInterface;\r
 import android.content.Intent;\r
 import android.content.DialogInterface.OnCancelListener;\r
 import android.content.res.Configuration;\r
 import android.app.ActionBar.OnNavigationListener;\r
 import android.content.DialogInterface;\r
 import android.content.Intent;\r
 import android.content.DialogInterface.OnCancelListener;\r
 import android.content.res.Configuration;\r

-import android.database.Cursor;\r
-import android.database.DataSetObserver;\r
-import android.graphics.Bitmap;\r
-import android.graphics.BitmapFactory;\r
-import android.graphics.Matrix;\r
-import android.graphics.drawable.Drawable;\r
-import android.net.Uri;\r

 import android.os.Bundle;\r
 import android.os.Bundle;\r

-import android.os.Environment;\r
-import android.support.v4.app.FragmentActivity;\r

 import android.support.v4.app.FragmentTransaction;\r
 import android.support.v4.view.Menu;\r
 import android.support.v4.view.MenuItem;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.support.v4.view.Menu;\r
 import android.support.v4.view.MenuItem;\r

-import android.text.TextUtils;\r
-import android.util.Log;\r

 import android.view.MenuInflater;\r
 import android.view.MenuInflater;\r

-import android.view.View;\r
-import android.view.ViewGroup;\r
-import android.view.Window;\r

 import android.widget.ArrayAdapter;\r
 import android.widget.ArrayAdapter;\r

-import android.widget.ImageView;\r
-import android.widget.ListView;\r
-import android.widget.Spinner;\r
-import android.widget.SpinnerAdapter;\r
-import android.widget.TextView;\r

 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.R.id;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.R.id;\r

-import eu.alefzero.owncloud.R.layout;\r
-import eu.alefzero.owncloud.R.menu;\r
-import eu.alefzero.owncloud.R.string;\r

 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\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.fragment.FileDetail;\r
 import eu.alefzero.owncloud.ui.fragment.FileList;\r
 import eu.alefzero.owncloud.ui.fragment.FileDetail;\r
 import eu.alefzero.owncloud.ui.fragment.FileList;\r

-import eu.alefzero.owncloud.ui.fragment.ActionBar;\r

 \r
 /**\r
  * Displays, what files the user has available in his ownCloud.\r
 \r
 /**\r
  * Displays, what files the user has available in his ownCloud.\r


@@ -79,12 +46,6 @@ import eu.alefzero.owncloud.ui.fragment.ActionBar;
  */\r
 \r
 public class FileDisplayActivity extends android.support.v4.app.FragmentActivity implements OnNavigationListener {\r
  */\r
 \r
 public class FileDisplayActivity extends android.support.v4.app.FragmentActivity implements OnNavigationListener {\r

-  private DbHandler mDBHandler;\r
-  private Stack<String> mParents;\r
-  private LinkedList<String> mPath;\r
-  private Account mAccount;\r
-  private Cursor mCursor;\r
-  private boolean mIsDisplayingFile;\r

   private ArrayAdapter<String> mDirectories;\r
  \r
   private static final int DIALOG_CHOOSE_ACCOUNT = 0;\r
   private ArrayAdapter<String> mDirectories;\r
  \r
   private static final int DIALOG_CHOOSE_ACCOUNT = 0;\r


@@ -95,7 +56,6 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
   \r
   public boolean popPath() {\r
     mDirectories.remove(mDirectories.getItem(0));\r
   \r
   public boolean popPath() {\r
     mDirectories.remove(mDirectories.getItem(0));\r

-    Log.d("TAG", ""+getActionBar().getCustomView());\r

     return !mDirectories.isEmpty();\r
   }\r
   \r
     return !mDirectories.isEmpty();\r
   }\r
   \r


@@ -108,51 +68,13 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
     getActionBar().setNavigationMode(android.support.v4.app.ActionBar.NAVIGATION_MODE_LIST);\r
     getActionBar().setDisplayShowTitleEnabled(false);\r
     getActionBar().setListNavigationCallbacks(mDirectories, this);\r
     getActionBar().setNavigationMode(android.support.v4.app.ActionBar.NAVIGATION_MODE_LIST);\r
     getActionBar().setDisplayShowTitleEnabled(false);\r
     getActionBar().setListNavigationCallbacks(mDirectories, this);\r

-    \r
+\r

     FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
     ft.add(R.id.file_list_container, new FileList());\r
     if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {\r
       ft.add(R.id.fileDetail, new FileDetail());\r
     }\r
     ft.commit();\r
     FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
     ft.add(R.id.file_list_container, new FileList());\r
     if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {\r
       ft.add(R.id.fileDetail, new FileDetail());\r
     }\r
     ft.commit();\r

-\r
-    /*getSupportFragmentManager().beginTransaction().add(arg0, arg1);\r
-    FileList fl = new FileList();\r
-    ft.add(R.id.fileList, fl);\r
-    ft.commit();\r
-    /*\r
-\r
-    \r
-    if (savedInstanceState != null) {\r
-      mParents = (Stack<String>)savedInstanceState.getSerializable("parentsStack");\r
-      mIsDisplayingFile = savedInstanceState.getBoolean("isDisplayingFile");\r
-      mPath = (LinkedList<String>)savedInstanceState.getSerializable("path");\r
-    } else {\r
-      mParents = new Stack<String>();\r
-      mPath = new LinkedList<String>();\r
-      mIsDisplayingFile = false;\r
-    }\r
-\r
-    mDBHandler = new DbHandler(getBaseContext());\r
-    requestWindowFeature(Window.FEATURE_NO_TITLE);\r
-    setContentView(R.layout.main);\r
-\r
-    AccountManager accMan = AccountManager.get(this);\r
-    Account[] accounts = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r
-\r
-    if (accounts.length == 0) {\r
-      // using string value since in API7 this constatn is not defined\r
-      // in API7 < this constatant is defined in Settings.ADD_ACCOUNT_SETTINGS\r
-      // and Settings.EXTRA_AUTHORITIES\r
-      Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");\r
-      intent.putExtra("authorities", new String[] {AccountAuthenticator.AUTH_TOKEN_TYPE});\r
-      startActivity(intent);\r
-    } else if (accounts.length > 1) {\r
-      showDialog(DIALOG_CHOOSE_ACCOUNT);\r
-    } else {\r
-      mAccount = accounts[0];\r
-      populateFileList();\r
-    }*/\r

   }\r
 \r
   @Override\r
   }\r
 \r
   @Override\r


@@ -182,7 +104,7 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
     inflater.inflate(R.menu.menu, menu);\r
     return true;\r
   }\r
     inflater.inflate(R.menu.menu, menu);\r
     return true;\r
   }\r

-    \r
+\r

   private Dialog createChooseAccountDialog() {\r
     final AccountManager accMan = AccountManager.get(this);\r
     CharSequence[] items = new CharSequence[accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE).length];\r
   private Dialog createChooseAccountDialog() {\r
     final AccountManager accMan = AccountManager.get(this);\r
     CharSequence[] items = new CharSequence[accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE).length];\r


@@ -196,7 +118,7 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
     builder.setCancelable(true);\r
     builder.setItems(items, new DialogInterface.OnClickListener() {\r
         public void onClick(DialogInterface dialog, int item) {\r
     builder.setCancelable(true);\r
     builder.setItems(items, new DialogInterface.OnClickListener() {\r
         public void onClick(DialogInterface dialog, int item) {\r

-            mAccount = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[item];\r
+            //mAccount = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[item];\r

             dialog.dismiss();\r
         }\r
     });\r
             dialog.dismiss();\r
         }\r
     });\r


@@ -209,150 +131,11 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
     return alert;\r
   }\r
 \r
     return alert;\r
   }\r
 \r

-  //@Override\r
-  //public void onBackPressed() {\r
-    /*PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);\r
-    if (mIsDisplayingFile) {\r
-      mIsDisplayingFile = false;\r
-      setContentView(R.layout.main);\r
-      pl = (PathLayout) findViewById(R.id.pathLayout1);\r
-      Uri uri;\r
-      if (mParents.empty()) {\r
-        uri = ProviderTableMeta.CONTENT_URI;\r
-      } else {\r
-        uri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, mParents.peek());\r
-      }\r
-      mCursor = managedQuery(uri,\r
-                             null,\r
-                             ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
-                             new String[]{mAccount.name}, null);\r
-  \r
-      if (mCursor.moveToFirst()) {\r
-        String s = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_PATH));\r
-        for (String str : s.split("/")) {\r
-          if (!TextUtils.isEmpty(str))\r
-            pl.push(DisplayUtils.HtmlDecode(str));\r
-        }\r
-      }\r
-      getListView().setAdapter(new FileListListAdapter(mCursor, this));      \r
-      getListView().invalidate();\r
-      return;\r
-    }\r
-    if (mParents.size()==0) {\r
-      super.onBackPressed();\r
-      return;\r
-    } else if (mParents.size() == 1) {\r
-      mParents.pop();\r
-      mPath.removeLast();\r
-      pl.pop();\r
-      mCursor = managedQuery(ProviderTableMeta.CONTENT_URI,\r
-          null,\r
-          ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
-          new String[]{mAccount.name},\r
-          null);\r
-    } else {\r
-      mParents.pop();\r
-      mPath.removeLast();\r
-      pl.pop();\r
-      mCursor = managedQuery(Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, mParents.peek()),\r
-          null,\r
-          ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
-          new String[]{mAccount.name},\r
-          null);\r
-    }\r
-    \r
-    setListAdapter(new FileListListAdapter(mCursor, this));\r
-    getListView().invalidate();*/\r
-  //}\r
-\r
-  //@Override\r
-/*  protected void onListItemClick(ListView l, View v, int position, long id) {\r
-    super.onListItemClick(l, v, position, id);\r
-    /*PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);\r
-    if (!mCursor.moveToPosition(position)) {\r
-      throw new IndexOutOfBoundsException("Incorrect item selected");\r
-    }\r
-    if (!mIsDisplayingFile) {\r
-      if (mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE)).equals("DIR")) {\r
-        String id_ = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta._ID));\r
-        String dirname = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_NAME));\r
-        pl.push(DisplayUtils.HtmlDecode(dirname));\r
-        mPath.addLast(DisplayUtils.HtmlDecode(dirname));\r
-        mParents.push(id_);\r
-        mCursor = managedQuery(Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, id_),\r
-                               null,\r
-                               ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",\r
-                               new String[]{mAccount.name}, null);\r
-        setListAdapter(new FileListListAdapter(mCursor, this));\r
-      } else {\r
-        mIsDisplayingFile = true;\r
-        setContentView(R.layout.file_display);\r
-        String id_ = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta._ID));\r
-        mCursor = managedQuery(Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_FILE, id_),\r
-                               null,\r
-                               null,\r
-                               null,\r
-                               null);\r
-        mCursor.moveToFirst();\r
-        // filename\r
-        TextView tv = (TextView) findViewById(R.id.textView1);\r
-        tv.setText(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_NAME)));\r
-        // filetype\r
-        tv = (TextView) findViewById(R.id.textView2);\r
-        tv.setText(DisplayUtils.convertMIMEtoPrettyPrint(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE))));\r
-        // size\r
-        tv = (TextView) findViewById(R.id.textView3);\r
-        tv.setText(DisplayUtils.bitsToHumanReadable(mCursor.getLong(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH))));\r
-        // modified\r
-        tv = (TextView) findViewById(R.id.textView4);\r
-        tv.setText(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_MODIFIED)));\r
-        if (!TextUtils.isEmpty(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH))) &&\r
-            mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE)).matches("image/*")) {\r
-          ImageView iv = (ImageView) findViewById(R.id.imageView1);\r
-          Bitmap bmp = BitmapFactory.decodeFile(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH)));\r
-          Matrix m = new Matrix();\r
-          float scale;\r
-          if (bmp.getWidth() > bmp.getHeight()) {\r
-            scale = (float) (200./bmp.getWidth());\r
-          } else {\r
-            scale = (float) (200./bmp.getHeight());\r
-          }\r
-          m.postScale(scale, scale);\r
-          Bitmap newBmp = Bitmap.createBitmap(bmp, 0, 0, bmp.getWidth(), bmp.getHeight(), m, true);\r
-          iv.setImageBitmap(newBmp);\r
-        }\r
-        setListAdapter(new FileListActionListAdapter(mCursor, this, mAccount));\r
-      }    \r
-      getListView().invalidate();\r
-    } else {\r
-        Intent i = (Intent) getListAdapter().getItem(position);\r
-        if (i.hasExtra("toDownload")) {\r
-          \r
-          Intent intent = new Intent(this, FileDownloader.class);\r
-          intent.putExtra(FileDownloader.EXTRA_FILE_PATH, "/"+((TextView)findViewById(R.id.textView1)).getText().toString());\r
-          intent.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);\r
-          startService(intent);\r
-          /*\r
-          if (i.getBooleanExtra("toDownload", false)) {\r
-            startActivityForResult(i, 200);\r
-          } else {\r
-            startActivity(i);            \r
-          }*/\r
-       // }\r
-\r
-    //}\r
-//  }\r
-  \r
- \r
-//    setListAdapter(new FileListListAdapter(mCursor, this));\r
-//    getListView().invalidate();\r
-\r

   @Override\r
   public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
     int i = itemPosition;\r
     while (i-- != 0) {\r
   @Override\r
   public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
     int i = itemPosition;\r
     while (i-- != 0) {\r

-      popPath();\r
-      //mFileList.onBackPressed();\r
+      onBackPressed();\r

     }\r
     return true;\r
   }\r
     }\r
     return true;\r
   }\r


@@ -367,17 +150,4 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
     }\r
     ((FileList)getSupportFragmentManager().findFragmentById(id.file_list_container)).onBackPressed();\r
   }\r
     }\r
     ((FileList)getSupportFragmentManager().findFragmentById(id.file_list_container)).onBackPressed();\r
   }\r

-  \r
-  //@Override\r
-  /*protected void onActivityResult(int requestCode, int resultCode, Intent data) {\r
-    super.onActivityResult(requestCode, resultCode, data);\r
-  }\r
-  \r
-  @Override\r
-  protected void onSaveInstanceState(Bundle outState) {\r
-    super.onSaveInstanceState(outState);\r
-    outState.putSerializable("parentsStack", mParents);\r
-    outState.putSerializable("path", mPath);\r
-    outState.putBoolean("isDisplayingFile", mIsDisplayingFile);\r
-  }*/\r

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java
index 9ac4910..23c90dc 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java
@@ -17,32 +17,36 @@
  */\r
 package eu.alefzero.owncloud.ui.fragment;\r
 \r
  */\r
 package eu.alefzero.owncloud.ui.fragment;\r
 \r

-import eu.alefzero.owncloud.DisplayUtils;\r
-import eu.alefzero.owncloud.R;\r
-import eu.alefzero.owncloud.cp;\r
-import eu.alefzero.owncloud.R.id;\r
-import eu.alefzero.owncloud.R.layout;\r
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
+import android.accounts.Account;\r

 import android.content.Intent;\r
 import android.database.Cursor;\r
 import android.content.Intent;\r
 import android.database.Cursor;\r

+import android.graphics.Bitmap;\r
+import android.graphics.BitmapFactory;\r

 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.support.v4.app.Fragment;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.support.v4.app.Fragment;\r

-import android.util.Log;\r

 import android.view.LayoutInflater;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
 import android.view.LayoutInflater;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r

+import android.view.View.OnClickListener;\r
+import android.widget.ImageView;\r

 import android.widget.TextView;\r
 import android.widget.Toast;\r
 import android.widget.TextView;\r
 import android.widget.Toast;\r

+import android.widget.VideoView;\r
+import eu.alefzero.owncloud.DisplayUtils;\r
+import eu.alefzero.owncloud.FileDownloader;\r
+import eu.alefzero.owncloud.R;\r
+import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r

 \r
 /**\r
  * This Fragment is used to display the details about a file.\r
  * @author Bartek Przybylski\r
  *\r
  */\r
 \r
 /**\r
  * This Fragment is used to display the details about a file.\r
  * @author Bartek Przybylski\r
  *\r
  */\r

-public class FileDetail extends Fragment {\r
+public class FileDetail extends Fragment implements OnClickListener {\r

   \r
   \r

-  public Intent mIntent;\r
+  private Intent mIntent;\r
+  private View mView;\r

   \r
   public void setStuff(Intent intent) {\r
     mIntent = intent;\r
   \r
   public void setStuff(Intent intent) {\r
     mIntent = intent;\r


@@ -50,8 +54,10 @@ public class FileDetail extends Fragment {
   }\r
   \r
   private void setStuff(View view) {\r
   }\r
   \r
   private void setStuff(View view) {\r

+    mView = view;\r

     String id = mIntent.getStringExtra("FILE_ID");\r
     String id = mIntent.getStringExtra("FILE_ID");\r

-    String account_name = mIntent.getStringExtra("ACCOUNT_NAME");\r
+    Account account = mIntent.getParcelableExtra("ACCOUNT");\r
+    String account_name = account.name;\r

     Cursor c = getActivity().managedQuery(\r
         Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_FILE, id),\r
         null,\r
     Cursor c = getActivity().managedQuery(\r
         Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_FILE, id),\r
         null,\r


@@ -59,11 +65,37 @@ public class FileDetail extends Fragment {
         new String[]{account_name},\r
         null);\r
     c.moveToFirst();\r
         new String[]{account_name},\r
         null);\r
     c.moveToFirst();\r

-    \r
+\r
+    // retrive details from DB\r

     String filename = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_NAME));\r
     String filename = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_NAME));\r

-    setFilename(filename, view);\r

     String mimetype = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE));\r
     String mimetype = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE));\r

-    setFiletype(DisplayUtils.convertMIMEtoPrettyPrint(mimetype), view);\r
+    String path = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));\r
+    long filesize = c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH));\r
+\r
+    // set file details\r
+    setFilename(filename);\r
+    setFiletype(DisplayUtils.convertMIMEtoPrettyPrint(mimetype));\r
+    setFilesize(filesize);\r
+    \r
+    // set file preview if available and possible\r
+    View w = view.findViewById(R.id.videoView1);\r
+    w.setVisibility(View.INVISIBLE);\r
+    if (path == null) {\r
+      ImageView v = (ImageView) getView().findViewById(R.id.imageView2);\r
+      v.setImageResource(R.drawable.download);\r
+      v.setOnClickListener(this);\r
+    } else {\r
+      if (mimetype.startsWith("image/")) {\r
+        ImageView v = (ImageView) view.findViewById(R.id.imageView2);\r
+        Bitmap bmp = BitmapFactory.decodeFile(path);\r
+        v.setImageBitmap(bmp);\r
+      } else if (mimetype.startsWith("video/")) {\r
+        VideoView v = (VideoView) view.findViewById(R.id.videoView1);\r
+        v.setVisibility(View.VISIBLE);\r
+        v.setVideoPath(path);\r
+        v.start();\r
+      }\r
+    }\r

   }\r
 \r
   @Override\r
   }\r
 \r
   @Override\r


@@ -78,21 +110,33 @@ public class FileDetail extends Fragment {
     return v;\r
   }\r
 \r
     return v;\r
   }\r
 \r

-  private void setFilename(String filename, View target_view) {\r
-    TextView tv = (TextView) target_view.findViewById(R.id.textView1);\r
+  @Override\r
+  public View getView() {\r
+    return mView == null ? super.getView() : mView;\r
+  };\r
+  \r
+  public void setFilename(String filename) {\r
+    TextView tv = (TextView) getView().findViewById(R.id.textView1);\r

     if (tv != null) tv.setText(filename);\r
   }\r
   \r
     if (tv != null) tv.setText(filename);\r
   }\r
   \r

-  private void setFiletype(String mimetype, View target_view) {\r
-    TextView tv = (TextView) target_view.findViewById(R.id.textView2);\r
+  public void setFiletype(String mimetype) {\r
+    TextView tv = (TextView) getView().findViewById(R.id.textView2);\r

     if (tv != null) tv.setText(mimetype);\r
   }\r
   \r
     if (tv != null) tv.setText(mimetype);\r
   }\r
   \r

-  public void setFilename(String filename) {\r
-    setFilename(filename, getView());\r
+  public void setFilesize(long filesize) {\r
+    TextView tv = (TextView) getView().findViewById(R.id.textView3);\r
+    if (tv != null) tv.setText(DisplayUtils.bitsToHumanReadable(filesize));\r

   }\r
   }\r

-  \r
-  public void setFiletype(String filename) {\r
-    setFiletype(filename, getView());\r
+\r
+  @Override\r
+  public void onClick(View v) {\r
+    Toast.makeText(getActivity(), "Downloading", Toast.LENGTH_LONG).show();\r
+    Intent i = new Intent(getActivity(), FileDownloader.class);\r
+    i.putExtra(FileDownloader.EXTRA_ACCOUNT, mIntent.getParcelableExtra("ACCOUNT"));\r
+    i.putExtra(FileDownloader.EXTRA_FILE_PATH, mIntent.getStringExtra("FULL_PATH"));\r
+    getActivity().startService(i);\r

   }\r
   }\r

+  \r

 }\r
 }\r

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileList.java b/src/eu/alefzero/owncloud/ui/fragment/FileList.java
index 3c7c0ea..779c35b 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileList.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileList.java
@@ -21,17 +21,12 @@ import java.util.Stack;
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r

-import android.app.FragmentManager;\r

 import android.app.Service;\r
 import android.content.Intent;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.app.Service;\r
 import android.content.Intent;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r

-import android.support.v4.app.FragmentTransaction;\r
-import android.util.Log;\r
-import android.view.LayoutInflater;\r

 import android.view.View;\r
 import android.view.View;\r

-import android.view.ViewGroup;\r

 import android.widget.AdapterView;\r
 import android.widget.TextView;\r
 import eu.alefzero.owncloud.R;\r
 import android.widget.AdapterView;\r
 import android.widget.TextView;\r
 import eu.alefzero.owncloud.R;\r


@@ -85,10 +80,12 @@ public class FileList extends FragmentListView {
         return;\r
     }\r
     Intent i = new Intent(getActivity(), FileDetailActivity.class);\r
         return;\r
     }\r
     Intent i = new Intent(getActivity(), FileDetailActivity.class);\r

-    i.putExtra("FILE_NAME", ((TextView)v.findViewById(R.id.Filename)).getText());\r
+    String filename = ((TextView)v.findViewById(R.id.Filename)).getText().toString();\r
+    i.putExtra("FILE_NAME", filename);\r
+    i.putExtra("FULL_PATH", "/" + filename);\r

     i.putExtra("FILE_ID", id_);\r
     i.putExtra("FILE_ID", id_);\r

-    i.putExtra("ACCOUNT_NAME", mAccount.name);\r
-    FileDetail fd = (FileDetail) getFragmentManager().findFragmentById(R.id.fileDetail);\r
+    i.putExtra("ACCOUNT", mAccount);\r
+    FileDetail fd = (FileDetail) getSupportFragmentManager().findFragmentById(R.id.fileDetail);\r

     if (fd != null) {\r
       fd.setStuff(i);\r
     } else {\r
     if (fd != null) {\r
       fd.setStuff(i);\r
     } else {\r