From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 5 Nov 2015 21:04:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into resizedImagesMaster
X-Git-Tag: beta-20151122~1^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ce841a3c4f7e32d5f54972dbc8d9b950174ed2ca?hp=--cc

Merge remote-tracking branch 'remotes/upstream/master' into resizedImagesMaster
---

ce841a3c4f7e32d5f54972dbc8d9b950174ed2ca
diff --cc AndroidManifest.xml
index 1f06b3e3,805e9ce7..e1d21f3c
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -124,17 -114,17 +114,23 @@@
              android:name=".providers.FileContentProvider"
              android:authorities="@string/authority"
              android:enabled="true"
 -            android:exported="false"
 +            android:exported="true"
              android:label="@string/sync_string_files"
-             android:syncable="true" >
-         </provider>
+             android:syncable="true" />
+ 
+         <provider
+             android:name=".providers.UsersAndGroupsSearchProvider"
+             android:authorities="com.owncloud.android.providers.UsersAndGroupsSearchProvider"
+             android:enabled="true"
+             android:exported="false"
+             android:label="@string/search_users_and_groups_hint" />
  
 +        <provider
 +            android:name=".ui.adapter.DiskLruImageCacheFileProvider"
 +            android:authorities="com.owncloud.imageCache.provider"
 +            android:exported="true">
 +        </provider>
 +
          <activity
              android:name=".authentication.AuthenticatorActivity"
              android:exported="true"
diff --cc src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 9b31f3aa,f0ecf767..939bc9a4
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@@ -35,8 -33,9 +35,10 @@@ import android.content.res.Resources
  import android.graphics.Bitmap;
  import android.graphics.Bitmap.CompressFormat;
  import android.graphics.BitmapFactory;
 +import android.graphics.Point;
+ import android.graphics.Canvas;
  import android.graphics.drawable.BitmapDrawable;
+ import android.graphics.drawable.ColorDrawable;
  import android.graphics.drawable.Drawable;
  import android.media.ThumbnailUtils;
  import android.net.Uri;
@@@ -297,22 -253,21 +295,27 @@@ public class ThumbnailsCacheManager 
  
              // Not found in disk cache
              if (thumbnail == null || file.needsUpdateThumbnail()) {
 -
 -                int px = getThumbnailDimension();
 +                int pxW = 0;
 +                int pxH = 0;
 +                if (mIsThumbnail) {
 +                    pxW = pxH = getThumbnailDimension();
 +                } else {
 +                    Point p = getScreenDimension();
 +                    pxW = p.x;
 +                    pxH = p.y;
 +                }
  
                  if (file.isDown()) {
 -                    Bitmap temp = BitmapUtils.decodeSampledBitmapFromFile(
 -                            file.getStoragePath(), px, px);
 -                    Bitmap bitmap = ThumbnailUtils.extractThumbnail(temp, px, px);
 +                    Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
 +                            file.getStoragePath(), pxW, pxH);
  
                      if (bitmap != null) {
+                         // Handle PNG
+                         if (file.getMimetype().equalsIgnoreCase("image/png")) {
 -                            bitmap = handlePNG(bitmap, px);
++                            bitmap = handlePNG(bitmap, pxW);
+                         }
+ 
 -                        thumbnail = addThumbnailToCache(imageKey, bitmap, file.getStoragePath(), px);
 +                        thumbnail = addThumbnailToCache(imageKey, bitmap, file.getStoragePath(), pxW, pxH);
  
                          file.setNeedsUpdateThumbnail(false);
                          mStorageManager.saveFile(file);
@@@ -331,20 -286,15 +334,22 @@@
                                  GetMethod get = new GetMethod(uri);
                                  int status = mClient.executeMethod(get);
                                  if (status == HttpStatus.SC_OK) {
- //                                    byte[] bytes = get.getResponseBody();
- //                                    Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0,
- //                                            bytes.length);
                                      InputStream inputStream = get.getResponseBodyAsStream();
                                      Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
 -                                    thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);
 +                                    thumbnail = ThumbnailUtils.extractThumbnail(bitmap, pxW, pxH);
 +                                    byte[] bytes = get.getResponseBody();
 +
 +                                    if (mIsThumbnail) {
 +                                        thumbnail = ThumbnailUtils.extractThumbnail(bitmap, pxW, pxH);
 +                                    } else {
 +                                        thumbnail = bitmap;
 +                                    }
  
+                                     // Handle PNG
+                                     if (file.getMimetype().equalsIgnoreCase("image/png")) {
 -                                        thumbnail = handlePNG(thumbnail, px);
++                                        thumbnail = handlePNG(thumbnail, pxW);
+                                     }
+ 
                                      // Add thumbnail to cache
                                      if (thumbnail != null) {
                                          addBitmapToCache(imageKey, thumbnail);
@@@ -364,18 -314,23 +369,31 @@@
  
          }
  
+         private Bitmap handlePNG(Bitmap bitmap, int px){
+             Bitmap resultBitmap = Bitmap.createBitmap(px,
+                     px,
+                     Bitmap.Config.ARGB_8888);
+             Canvas c = new Canvas(resultBitmap);
+ 
+             c.drawColor(MainApp.getAppContext().getResources().
+                     getColor(R.color.background_color));
+             c.drawBitmap(bitmap, 0, 0, null);
+ 
+             return resultBitmap;
+         }
+ 
 -        private Bitmap doFileInBackground() {
 +        private Bitmap doFileInBackground(Boolean mIsThumbnail) {
              File file = (File)mFile;
  
 -            final String imageKey = String.valueOf(file.hashCode());
 +            // distinguish between thumbnail and resized image
 +            String temp = String.valueOf(file.hashCode());
 +            if (mIsThumbnail){
 +                temp = "t" + temp;
 +            } else {
 +                temp = "r" + temp;
 +            }
 +
 +            final String imageKey = temp;
  
              // Check disk cache in background thread
              Bitmap thumbnail = getBitmapFromDiskCache(imageKey);
diff --cc src/com/owncloud/android/files/FileOperationsHelper.java
index abea72cc,a22de8ef..a0034da6
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@@ -21,11 -21,12 +21,13 @@@
  
  package com.owncloud.android.files;
  
- import org.apache.http.protocol.HTTP;
- 
  import android.accounts.Account;
+ import android.content.ActivityNotFoundException;
+ import android.content.Context;
  import android.content.Intent;
 +import android.graphics.Bitmap;
+ import android.content.pm.PackageManager;
+ import android.content.pm.ResolveInfo;
  import android.net.Uri;
  import android.support.v4.app.DialogFragment;
  import android.webkit.MimeTypeMap;
@@@ -35,24 -35,22 +37,30 @@@ import com.owncloud.android.MainApp
  import com.owncloud.android.R;
  import com.owncloud.android.authentication.AccountUtils;
  import com.owncloud.android.datamodel.OCFile;
 +import com.owncloud.android.datamodel.ThumbnailsCacheManager;
  import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
- 
  import com.owncloud.android.lib.common.network.WebdavUtils;
  import com.owncloud.android.lib.common.utils.Log_OC;
+ import com.owncloud.android.lib.resources.shares.ShareType;
  import com.owncloud.android.lib.resources.status.OwnCloudVersion;
  import com.owncloud.android.services.OperationsService;
+ import com.owncloud.android.services.observer.FileObserverService;
  import com.owncloud.android.ui.activity.FileActivity;
 +import com.owncloud.android.ui.adapter.DiskLruImageCacheFileProvider;
+ import com.owncloud.android.ui.activity.ShareActivity;
  import com.owncloud.android.ui.dialog.ShareLinkToDialog;
  
 +import java.io.ByteArrayOutputStream;
 +import java.io.File;
 +import java.io.FileNotFoundException;
 +import java.io.FileOutputStream;
 +import java.io.IOException;
 +
+ import org.apache.http.protocol.HTTP;
+ 
+ import java.util.List;
+ 
  /**
   *
   */
@@@ -213,27 -324,12 +334,32 @@@ public class FileOperationsHelper 
          }
      }
  
 +    public void sendCachedImage(OCFile file) {
 +        if (file != null) {
 +            Intent sendIntent = new Intent(android.content.Intent.ACTION_SEND);
 +            // set MimeType
 +            sendIntent.setType(file.getMimetype());
 +//            sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("content://" + DiskLruImageCacheFileProvider.AUTHORITY + "/#" + file.getRemoteId() + "#" + file.getFileName()));
 +            sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("content://" + DiskLruImageCacheFileProvider.AUTHORITY + file.getRemotePath()));
 +            sendIntent.putExtra(Intent.ACTION_SEND, true);      // Send Action
 +
 +            // Show dialog, without the own app
 +            String[] packagesToExclude = new String[] { mFileActivity.getPackageName() };
 +            DialogFragment chooserDialog = ShareLinkToDialog.newInstance(sendIntent, packagesToExclude, file);
 +            chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
 +        } else {
 +            Log_OC.wtf(TAG, "Trying to send a NULL OCFile");
 +        }
 +    }
 +    
 +    
++
+     /**
+      * Request the synchronization of a file or folder with the OC server, including its contents.
+      *
+      * @param file          The file or folder to synchronize
+      */
      public void syncFile(OCFile file) {
-         
          if (!file.isFolder()){
              Intent intent = new Intent(mFileActivity, OperationsService.class);
              intent.setAction(OperationsService.ACTION_SYNC_FILE);
diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 897f9804,07a3eed5..2aa25eaf
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -317,11 -338,18 +337,18 @@@ public class FileListListAdapter extend
                                      task
                                      );
                              fileIcon.setImageDrawable(asyncDrawable);
 -                            task.execute(file);
 +                            task.execute(file, true);
                          }
                      }
+ 
+                     if (file.getMimetype().equalsIgnoreCase("image/png")) {
+                         fileIcon.setBackgroundColor(mContext.getResources()
+                                 .getColor(R.color.background_color));
+                     }
+ 
+ 
                  } else {
-                     fileIcon.setImageResource(DisplayUtils.getFileTypeIconId(file.getMimetype(),
+                     fileIcon.setImageResource(MimetypeIconUtil.getFileTypeIconId(file.getMimetype(),
                              file.getFileName()));
                  }
  
diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 8b37f893,066ff0a2..44776368
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@@ -223,11 -283,14 +283,14 @@@ public class OCFileListFragment extend
                      } else {
                          mContainerActivity.getFileOperationsHelper().openFile(file);
                      }
 -
++                    
                  } else {
                      // automatic download, preview on finish
                      ((FileDisplayActivity) mContainerActivity).startDownloadForPreview(file);
                  }
 -
++                    
              }
 -
++            
          } else {
              Log_OC.d(TAG, "Null object in ListAdapter!!");
          }
diff --cc src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index 5ef10405,a114fabd..0166829b
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@@ -76,10 -74,8 +77,10 @@@ public class PreviewImageFragment exten
      private TextView mMessageView;
      private ProgressBar mProgressWheel;
  
 +    private Boolean mShowResizedImage = false;
 +
      public Bitmap mBitmap = null;
-     
+ 
      private static final String TAG = PreviewImageFragment.class.getSimpleName();
  
      private boolean mIgnoreFirstSavedState;
@@@ -141,10 -134,9 +142,10 @@@
              // not right now
  
          mIgnoreFirstSavedState = args.getBoolean(ARG_IGNORE_FIRST);
 +        mShowResizedImage = args.getBoolean(ARG_SHOW_RESIZED_IMAGE);
          setHasOptionsMenu(true);
      }
-     
+ 
  
      /**
       * {@inheritDoc}
@@@ -187,8 -179,11 +188,8 @@@
          if (getFile() == null) {
              throw new IllegalStateException("Instanced with a NULL OCFile");
          }
 -        if (!getFile().isDown()) {
 -            throw new IllegalStateException("There is no local file to preview");
 -        }
      }
-         
+ 
  
      /**
       * {@inheritDoc}
@@@ -204,48 -199,14 +205,48 @@@
      public void onStart() {
          super.onStart();
          if (getFile() != null) {
 -            mLoadBitmapTask = new LoadBitmapTask(mImageView, mMessageView, mProgressWheel);
 -            //mLoadBitmapTask.execute(new String[]{getFile().getStoragePath()});
 -//            mLoadBitmapTask.execute(getFile().getStoragePath());
 -            mLoadBitmapTask.execute(getFile());
 +            mImageView.setTag(getFile().getFileId());
 +
 +            if (mShowResizedImage){
 +                Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
 +                        String.valueOf("r" + getFile().getRemoteId())
 +                );
 +
 +                if (thumbnail != null && !getFile().needsUpdateThumbnail()){
 +                    mProgressWheel.setVisibility(View.GONE);
 +                    mImageView.setImageBitmap(thumbnail);
 +                    mImageView.setVisibility(View.VISIBLE);
 +                    mBitmap  = thumbnail;
 +                } else {
 +                    // generate new Thumbnail
 +                    if (ThumbnailsCacheManager.cancelPotentialWork(getFile(), mImageView) &&
 +                        mContainerActivity.getStorageManager() != null) {
 +                        final ThumbnailsCacheManager.ThumbnailGenerationTask task =
 +                                new ThumbnailsCacheManager.ThumbnailGenerationTask(
 +                                        mImageView, mContainerActivity.getStorageManager(),
 +                                        mContainerActivity.getStorageManager().getAccount(),
 +                                        mProgressWheel);
 +                        if (thumbnail == null) {
 +                            thumbnail = ThumbnailsCacheManager.mDefaultImg;
 +                        }
 +                        final ThumbnailsCacheManager.AsyncDrawable asyncDrawable =
 +                                new ThumbnailsCacheManager.AsyncDrawable(
 +                                        MainApp.getAppContext().getResources(),
 +                                        thumbnail,
 +                                        task
 +                                );
 +                        mImageView.setImageDrawable(asyncDrawable);
 +                        task.execute(getFile(), false);
 +                    }
 +            }
 +            } else {
 +                mLoadBitmapTask = new LoadBitmapTask(mImageView, mMessageView, mProgressWheel);
-                 mLoadBitmapTask.execute(getFile().getStoragePath());
++                mLoadBitmapTask.execute(getFile());
 +            }
          }
      }
-     
-     
+ 
+ 
      @Override
      public void onStop() {
          Log_OC.d(TAG, "onStop starts");