From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 27 Jun 2012 16:28:42 +0000 (+0200)
Subject: Better file opening; new ownCloud logo in account settings page
X-Git-Tag: oc-android-1.4.3~330
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/49c1f9e3180099dff1ba1d8880a95314e47480a4?hp=-c

Better file opening; new ownCloud logo in account settings page
---

49c1f9e3180099dff1ba1d8880a95314e47480a4
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fff3a3f9..841ce234 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->
 <manifest package="eu.alefzero.owncloud"
     android:versionCode="1"
-    android:versionName="0.1.136B" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionName="0.1.137B" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index cdd31723..93f3038a 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -42,7 +42,7 @@
                 android:layout_height="match_parent"
                 android:layout_margin="7dp"
                 android:layout_weight="1"
-                android:src="@drawable/logo_inverted" />
+                android:src="@drawable/owncloud_logo" />
 
             <LinearLayout
                 android:id="@+id/LinearLayout1"
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index add258c8..65e1cd9f 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -46,7 +46,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
                 android:layout_weight="1"
-                android:src="@drawable/logo_inverted" />
+                android:src="@drawable/owncloud_logo" />
 
             <FrameLayout
                 android:layout_width="match_parent"
diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
index d5512a18..8d76328d 100644
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -34,6 +34,7 @@ import android.content.Intent;
 import android.content.SyncResult;
 import android.os.Bundle;
 import android.util.Log;
+import android.webkit.MimeTypeMap;
 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
 import eu.alefzero.owncloud.datamodel.OCFile;
 import eu.alefzero.webdav.WebdavEntry;
@@ -142,7 +143,16 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         OCFile file = new OCFile(we.path());
         file.setCreationTimestamp(we.createTimestamp());
         file.setFileLength(we.contentLength());
-        file.setMimetype(we.contentType());
+        
+        // dvelasco; looks like server is not sending very precise mimeTypes; mp3 file results un application/oct
+        String filename = file.getFileName();
+        String mimeType = MimeTypeMap.getSingleton()
+                .getMimeTypeFromExtension(filename.substring(filename.lastIndexOf('.') + 1));
+        if (mimeType == null)
+            file.setMimetype(we.contentType());
+        else
+            file.setMimetype(mimeType);
+        
         file.setModificationTimestamp(we.modifiedTimesamp());
         file.setLastSyncDate(mCurrentSyncTime);
         return file;
diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
index f5664ead..00a1f838 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
@@ -48,7 +48,7 @@ public class FileDetailActivity extends SherlockFragmentActivity {
         
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
         mFileDetail = new FileDetailFragment();
-        ft.add(R.id.fragment, mFileDetail, "FileDetails");
+        ft.replace(R.id.fragment, mFileDetail, "FileDetails");
         ft.commit();
 
     }
diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index 0397e5b5..6b2aa86a 100644
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -22,6 +22,7 @@ import java.util.List;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.ActionBar.LayoutParams;
+import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -243,10 +244,11 @@ public class FileDetailFragment extends SherlockFragment implements
                     public void onClick(View v) {
                         Intent i = new Intent(Intent.ACTION_VIEW);
                         i.setDataAndType(Uri.parse("file://"+mFile.getStoragePath()), mFile.getMimetype());
-                        List list = getActivity().getPackageManager().queryIntentActivities(i, PackageManager.MATCH_DEFAULT_ONLY);
-                        if (list.size() > 0) {
+                        i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+                        try {
                             startActivity(i);
-                        } else {
+                            
+                        } catch (ActivityNotFoundException e) {
                             Toast.makeText(getActivity(), "There is no application to handle file " + mFile.getFileName(), Toast.LENGTH_SHORT).show();
                         }
                     }