From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 29 Oct 2015 16:55:56 +0000 (+0100)
Subject: Merge branch 'switchListVsGridMaster' into beta
X-Git-Tag: beta-20151122~94
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e8654191a721c6d5831992645f2c4f38a7ca35b7?ds=sidebyside;hp=-c

Merge branch 'switchListVsGridMaster' into beta
---

e8654191a721c6d5831992645f2c4f38a7ca35b7
diff --combined res/values/strings.xml
index d41189f3,ad90cdf1..43cb0d96
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -263,11 -263,9 +263,11 @@@
      <string name="placeholder_filesize">389 KB</string>
      <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
      <string name="placeholder_media_time">12:23:45</string>
 -
 -    <string name="instant_upload_on_wifi">Upload pictures via WiFi only</string>
 -    <string name="instant_video_upload_on_wifi">Upload videos via WiFi only</string>
 +    
 +    <string name="instant_upload_on_wifi">Upload pictures via wifi only</string>
 +    <string name="instant_upload_on_charging">Upload when charging only</string>
 +    <string name="instant_video_upload_on_wifi">Upload videos via wifi only</string>
 +    <string name="instant_video_upload_on_charging">Upload when charging only</string>
      <string name="instant_upload_path">/InstantUpload</string>
      <string name="conflict_title">File conflict</string>
      <string name="conflict_message">Which files do you want to keep? If you select both versions, the local file will have a number added to its name.</string>
@@@ -279,7 -277,7 +279,7 @@@
      <string name="preview_image_error_unknown_format">This image cannot be shown</string>
  
      <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
 -    <string name="prefs_instant_upload_path_title">Upload Path</string>
 +    <string name="prefs_instant_upload_path_title">Upload path</string>
  
  	<string name="share_link_no_support_share_api">Sorry, sharing is not enabled on your server. Please contact your
  		administrator.</string>
@@@ -344,7 -342,7 +344,7 @@@
      <string name="prefs_category_instant_uploading">Instant Uploads</string>
  	<string name="prefs_category_security">Security</string>
  
 -	<string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
 +	<string name="prefs_instant_video_upload_path_title">Upload video path</string>
      <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
  
  	<string name="shared_subject_header">shared</string>
@@@ -367,5 -365,6 +367,6 @@@
      <string name="file_list__footer__files">%1$d files</string>
      <string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>
      <string name="file_list__footer__files_and_folders">%1$d files, %2$d folders</string>
- 
+     <string name="action_switch_grid_view">Switch to grid view</string>
+     <string name="action_switch_list_view">Switch to list view</string>
  </resources>
diff --combined src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 5b68063c,dcc715f0..5d6b8192
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -319,7 -319,7 +319,7 @@@ public class FileListListAdapter extend
                                      task
                                      );
                              fileIcon.setImageDrawable(asyncDrawable);
 -                            task.execute(file);
 +                            task.execute(file, true);
                          }
                      }
  
@@@ -487,4 -487,8 +487,8 @@@
      public void setGridMode(boolean gridMode) {
          mGridMode = gridMode;
      }
+ 
+     public boolean isGridMode() {
+         return mGridMode;
+     }
  }
diff --combined src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 02105d9e,1321fa00..bfe6ec24
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -53,6 -53,7 +53,7 @@@ import com.owncloud.android.ui.dialog.R
  import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
  import com.owncloud.android.ui.preview.PreviewImageFragment;
  import com.owncloud.android.ui.preview.PreviewMediaFragment;
+ import com.owncloud.android.utils.DisplayUtils;
  import com.owncloud.android.utils.FileStorageUtils;
  import com.owncloud.android.ui.preview.PreviewTextFragment;
  
@@@ -281,8 -282,12 +282,8 @@@ public class OCFileListFragment extend
                      } else {
                          mContainerActivity.getFileOperationsHelper().openFile(file);
                      }
 -
 -                } else {
 -                    // automatic download, preview on finish
 -                    ((FileDisplayActivity) mContainerActivity).startDownloadForPreview(file);
 +                    
                  }
 -
              }
  
          } else {
@@@ -327,6 -332,9 +328,9 @@@
                      item.setEnabled(false);
                  }
              }
+ 
+ //            String.format(mContext.getString(R.string.subject_token),
+ //                    getClient().getCredentials().getUsername(), file.getFileName()));
          }
      }
  
@@@ -517,7 -525,7 +521,7 @@@
              OwnCloudVersion version = AccountUtils.getServerVersion(
                      ((FileActivity)mContainerActivity).getAccount());
              if (version != null && version.supportsRemoteThumbnails() &&
-                 imagesCount > 0 && imagesCount == filesCount) {
+                     DisplayUtils.isGridView(mFile, mContainerActivity.getStorageManager())) {
                  switchToGridView();
                  registerLongClickListener();
              } else {