Merge branch 'develop' into release-1.5.8

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f41f2f4..7a3b1fc 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,8 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="105007"
-    android:versionName="1.5.7" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="10500800"
+    android:versionName="1.5.8" 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/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index 069a7d3..9fa39b3 100644 (file)
--- a/oc_jb_workaround/AndroidManifest.xml
+++ b/oc_jb_workaround/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android.workaround.accounts"
-    android:versionCode="0100016"
-    android:versionName="1.0.16" >
+    android:versionCode="0100017"
+    android:versionName="1.0.17" >
 
     <uses-sdk
         android:minSdkVersion="16"

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

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

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

diff --git a/res/drawable/downloading_file_indicator.png b/res/drawable/downloading_file_indicator.png
index 179a3f7..7c49554 100644 (file)
Binary files a/res/drawable/downloading_file_indicator.png and b/res/drawable/downloading_file_indicator.png differ

diff --git a/res/drawable/ic_favorite.png b/res/drawable/ic_favorite.png
deleted file mode 100644 (file)
index 4843dc1..0000000
Binary files a/res/drawable/ic_favorite.png and /dev/null differ

diff --git a/res/drawable/local_file_indicator.png b/res/drawable/local_file_indicator.png
index 08a7b80..85d5271 100644 (file)
Binary files a/res/drawable/local_file_indicator.png and b/res/drawable/local_file_indicator.png differ

diff --git a/res/drawable/uploading_file_indicator.png b/res/drawable/uploading_file_indicator.png
index b0b5634..b71add0 100644 (file)
Binary files a/res/drawable/uploading_file_indicator.png and b/res/drawable/uploading_file_indicator.png differ

diff --git a/res/layout/failed_upload_message_view.xml b/res/layout/failed_upload_message_view.xml
deleted file mode 100644 (file)
index cf20544..0000000
--- a/res/layout/failed_upload_message_view.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
-    android:id="@+id/failed_upload_message_view"\r
-    android:layout_width="fill_parent"\r
-    android:layout_height="fill_parent"\r
-    android:background="@color/background_color"\r
-    android:orientation="vertical" >\r
-\r
-   <TextView android:id="@+id/faild_upload_message" \r
-       android:layout_width="match_parent"\r
-       android:layout_height="wrap_content"\r
-       android:minWidth="100dp"/>\r
-   \r
-   <Button\r
-    android:id="@+id/failed_uploadactivity_close_button"\r
-    android:layout_width="fill_parent"\r
-    android:layout_height="wrap_content"\r
-    android:text="Dismiss" />\r
-\r
-</LinearLayout>
\ No newline at end of file

diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index 459f4f1..5e7edc6 100644 (file)
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -29,30 +29,30 @@
         android:layout_height="56dp"\r
         android:focusable="false"\r
         android:focusableInTouchMode="false">\r
-        \r
+\r
         <ImageView\r
             android:id="@+id/imageView2"\r
-            android:layout_width="wrap_content"\r
-            android:layout_height="wrap_content"\r
-            android:src="@drawable/local_file_indicator"/>\r
+            android:layout_width="32dp"\r
+            android:layout_height="32dp"\r
+            android:layout_gravity="center_vertical"\r
+            android:layout_marginLeft="22dp"\r
+            android:src="@drawable/local_file_indicator" />\r
 \r
         <ImageView\r
             android:id="@+id/imageView1"\r
             android:layout_width="32dp"\r
             android:layout_height="32dp"\r
-            android:layout_gravity="center_vertical|center"\r
-            android:layout_margin="4dp"\r
+            android:layout_gravity="center_vertical"\r
+            android:layout_marginLeft="9dp"\r
             android:src="@drawable/ic_menu_archive" />\r
 \r
         <ImageView\r
             android:id="@+id/imageView3"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
-            android:layout_gravity="bottom"\r
-            android:layout_weight=".1"\r
-            android:maxHeight="15dip"\r
+            android:layout_gravity="bottom|right"\r
+            android:layout_marginBottom="10dp"\r
             android:src="@drawable/ic_favorite" />\r
-        \r
     </FrameLayout>\r
 \r
     <LinearLayout\r
@@ -88,6 +88,7 @@
                 android:layout_height="wrap_content"\r
                 android:text="TextView"\r
                 android:layout_weight=".5"\r
+                android:textColor="@color/list_item_lastmod_and_filesize_text"\r
                 android:textSize="12dip"/>\r
 \r
             <TextView\r
@@ -96,6 +97,7 @@
                 android:layout_height="wrap_content"\r
                 android:gravity="right"\r
                 android:text="TextView"\r
+                android:textColor="@color/list_item_lastmod_and_filesize_text"\r
                 android:layout_weight=".5"\r
                 android:textSize="12dip"/>\r
 \r

diff --git a/res/values/colors.xml b/res/values/colors.xml
index ce9b2d1..2b1fec9 100644 (file)
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -21,5 +21,6 @@
     
     <color name="filelist_icon_backgorund">#DDDDDD</color>
     <color name="owncloud_blue_bright">#00ddff</color>
+    <color name="list_item_lastmod_and_filesize_text">#989898</color>
     
 </resources>
\ No newline at end of file

diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java
index 7a5f8de..49866fb 100644 (file)
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@ -28,36 +28,6 @@ import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import com.owncloud.android.R;
-import com.owncloud.android.authentication.AuthenticatorActivity;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.db.DbHandler;
-import com.owncloud.android.notifications.NotificationBuilderWithProgressBar;
-import com.owncloud.android.notifications.NotificationDelayer;
-import com.owncloud.android.operations.CreateFolderOperation;
-import com.owncloud.android.lib.resources.files.RemoteFile;
-import com.owncloud.android.lib.common.operations.RemoteOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.operations.UploadFileOperation;
-import com.owncloud.android.operations.common.SyncOperation;
-import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
-import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation;
-import com.owncloud.android.lib.resources.files.FileUtils;
-import com.owncloud.android.lib.resources.status.OwnCloudVersion;
-import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;
-import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
-import com.owncloud.android.lib.common.OwnCloudAccount;
-import com.owncloud.android.lib.common.OwnCloudClient;
-import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
-import com.owncloud.android.ui.activity.FailedUploadActivity;
-import com.owncloud.android.ui.activity.FileActivity;
-import com.owncloud.android.ui.activity.FileDisplayActivity;
-import com.owncloud.android.ui.activity.InstantUploadActivity;
-import com.owncloud.android.utils.ErrorMessageAdapter;
-import com.owncloud.android.utils.Log_OC;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountsException;
@@ -75,6 +45,35 @@ import android.os.Process;
 import android.support.v4.app.NotificationCompat;
 import android.webkit.MimeTypeMap;
 
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AuthenticatorActivity;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.db.DbHandler;
+import com.owncloud.android.lib.common.OwnCloudAccount;
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;
+import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
+import com.owncloud.android.lib.resources.files.FileUtils;
+import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation;
+import com.owncloud.android.lib.resources.files.RemoteFile;
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;
+import com.owncloud.android.notifications.NotificationBuilderWithProgressBar;
+import com.owncloud.android.notifications.NotificationDelayer;
+import com.owncloud.android.operations.CreateFolderOperation;
+import com.owncloud.android.operations.UploadFileOperation;
+import com.owncloud.android.operations.common.SyncOperation;
+import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
+import com.owncloud.android.ui.activity.InstantUploadActivity;
+import com.owncloud.android.utils.ErrorMessageAdapter;
+import com.owncloud.android.utils.Log_OC;
+
 
 
 public class FileUploader extends Service implements OnDatatransferProgressListener {
@@ -774,14 +773,8 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
 
                 // we add only for instant-uploads the InstantUploadActivity and the
                 // db entry
-                Intent detailUploadIntent = null;
-                if (upload.isInstant() && InstantUploadActivity.IS_ENABLED) {
-                    detailUploadIntent = new Intent(this, InstantUploadActivity.class);
-                    detailUploadIntent.putExtra(FileUploader.KEY_ACCOUNT, upload.getAccount());
-                } else {
-                    detailUploadIntent = new Intent(this, FailedUploadActivity.class);
-                    detailUploadIntent.putExtra(FailedUploadActivity.MESSAGE, content);
-                }
+                Intent detailUploadIntent = new Intent(this, InstantUploadActivity.class);
+                detailUploadIntent.putExtra(FileUploader.KEY_ACCOUNT, upload.getAccount());
                 resultBuilder
                     .setContentIntent(PendingIntent.getActivity(
                         this, (int) System.currentTimeMillis(), detailUploadIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT

diff --git a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java
deleted file mode 100644 (file)
index 33432cf..0000000
--- a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ownCloud Android client application\r
- *   Copyright (C) 2012-2013 ownCloud Inc.\r
- *\r
- *   This program is free software: you can redistribute it and/or modify\r
- *   it under the terms of the GNU General Public License version 2,\r
- *   as published by the Free Software Foundation.\r
- *\r
- *   This program is distributed in the hope that it will be useful,\r
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- *   GNU General Public License for more details.\r
- *\r
- *   You should have received a copy of the GNU General Public License\r
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- *\r
- */\r
-\r
-package com.owncloud.android.ui.activity;\r
-\r
-import com.owncloud.android.R;\r
-\r
-import android.app.Activity;\r
-import android.os.Bundle;\r
-import android.view.View;\r
-import android.view.View.OnClickListener;\r
-import android.widget.Button;\r
-import android.widget.TextView;\r
-\r
-\r
-/**\r
- * This Activity is used to display a detail message for failed uploads\r
- * \r
- * The entry-point for this activity is the 'Failed upload Notification"\r
- * \r
- * @author andomaex / Matthias Baumann\r
- */\r
-public class FailedUploadActivity extends Activity {\r
-\r
-    public static final String MESSAGE = "message";\r
-\r
-    @Override\r
-    public void onCreate(Bundle savedInstanceState) {\r
-        super.onCreate(savedInstanceState);\r
-        setContentView(R.layout.failed_upload_message_view);\r
-        String message = getIntent().getStringExtra(MESSAGE);\r
-        TextView textView = (TextView) findViewById(R.id.faild_upload_message);\r
-        textView.setText(message);\r
-        Button closeBtn = (Button) findViewById(R.id.failed_uploadactivity_close_button);\r
-        \r
-        closeBtn.setOnClickListener(new OnClickListener() {\r
-            @Override\r
-            public void onClick(View v) {\r
-                finish();\r
-            }\r
-        });\r
-    }\r
-}\r