changes according to CR

src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -80,7 +80,7 @@ public class ThumbnailsCacheManager {
     public static final String PREFIX_THUMBNAIL = "t";
 
     private static final String TAG = ThumbnailsCacheManager.class.getSimpleName();
-    
+    private static final String PNG_MIMETYPE = "image/png";
     private static final String CACHE_FOLDER = "thumbnailCache";
 
     private static final Object mThumbnailsDiskCacheLock = new Object();
@@ -155,8 +155,7 @@ public class ThumbnailsCacheManager {
      * @return Point
      */
     private static Point getScreenDimension() {
-        WindowManager wm = (WindowManager) MainApp.getAppContext().
-                getSystemService(Context.WINDOW_SERVICE);
+        WindowManager wm = (WindowManager) MainApp.getAppContext().getSystemService(Context.WINDOW_SERVICE);
         Display display = wm.getDefaultDisplay();
         Point point = new Point();
         display.getSize(point);
@@ -248,6 +247,7 @@ public class ThumbnailsCacheManager {
 
             } catch (OutOfMemoryError oome) {
                 System.gc();
+                Log_OC.e(TAG, "Out of memory -> garbage collector called");
             } catch (Throwable t) {
                 // the app should never break due to a problem with thumbnails
                 Log_OC.e(TAG, "Generation of thumbnail for " + file + " failed", t);
@@ -271,12 +271,11 @@ public class ThumbnailsCacheManager {
                 int pxH = p.y;
 
                 if (file.isDown()) {
-                    Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(
-                            file.getStoragePath(), pxW, pxH);
+                    Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(file.getStoragePath(), pxW, pxH);
 
                     if (bitmap != null) {
                         // Handle PNG
-                        if (file.getMimetype().equalsIgnoreCase("image/png")) {
+                        if (file.getMimetype().equalsIgnoreCase(PNG_MIMETYPE)) {
                             bitmap = handlePNG(bitmap, pxW);
                         }
 
@@ -294,12 +293,9 @@ public class ThumbnailsCacheManager {
                             GetMethod getMethod = null;
                             try {
                                 // resized image via gallery app
-                                String uri = mClient.getBaseUri() + "" +
-                                        "/index.php/apps/gallery/api/preview/" +
-                                        Integer.parseInt(file.getRemoteId().substring(0, 8)) +
-                                        "/" + pxW + "/" + pxH;
-                                Log_OC.d(TAG, "generate resizedImage: " + file.getFileName() +
-                                        " URI: " + uri);
+                                String uri = mClient.getBaseUri() + "/index.php/apps/gallery/api/preview/" +
+                                        Integer.parseInt(file.getRemoteId().substring(0, 8)) + "/" + pxW + "/" + pxH;
+                                Log_OC.d(TAG, "generate resizedImage: " + file.getFileName() + " URI: " + uri);
                                 getMethod = new GetMethod(uri);
                                 getMethod.setRequestHeader("Cookie",
                                         "nc_sameSiteCookielax=true;nc_sameSiteCookiestrict=true");
@@ -312,7 +308,7 @@ public class ThumbnailsCacheManager {
                                 }
 
                                 // Handle PNG
-                                if (file.getMimetype().equalsIgnoreCase("image/png")) {
+                                if (file.getMimetype().equalsIgnoreCase(PNG_MIMETYPE)) {
                                     thumbnail = handlePNG(thumbnail, pxW);
                                 }
 
@@ -475,15 +471,15 @@ public class ThumbnailsCacheManager {
             return thumbnail;
         }
 
-        protected void onPostExecute(Bitmap bitmap){
+        protected void onPostExecute(Bitmap bitmap) {
             if (bitmap != null && mImageViewReference != null) {
                 final ImageView imageView = mImageViewReference.get();
                 final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
                 if (this == bitmapWorkerTask) {
                     String tagId = "";
-                    if (mFile instanceof OCFile){
+                    if (mFile instanceof OCFile) {
                         tagId = String.valueOf(((OCFile)mFile).getFileId());
-                    } else if (mFile instanceof File){
+                    } else if (mFile instanceof File) {
                         tagId = String.valueOf(mFile.hashCode());
                     }
                     if (String.valueOf(imageView.getTag()).equals(tagId)) {
@@ -517,7 +513,7 @@ public class ThumbnailsCacheManager {
 
                     if (bitmap != null) {
                         // Handle PNG
-                        if (file.getMimetype().equalsIgnoreCase("image/png")) {
+                        if (file.getMimetype().equalsIgnoreCase(PNG_MIMETYPE)) {
                             bitmap = handlePNG(bitmap, pxW);
                         }
 
@@ -535,8 +531,7 @@ public class ThumbnailsCacheManager {
                             getMethod = null;
                             try {
                                 // thumbnail
-                                String uri = mClient.getBaseUri() + "" +
-                                        "/index.php/apps/files/api/v1/thumbnail/" +
+                                String uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" +
                                         pxW + "/" + pxH + Uri.encode(file.getRemotePath(), "/");
                                 Log_OC.d(TAG, "generate thumbnail: " + file.getFileName() +
                                         " URI: " + uri);
@@ -557,7 +552,7 @@ public class ThumbnailsCacheManager {
                                 }
 
                                 // Handle PNG
-                                if (file.getMimetype().equalsIgnoreCase("image/png")) {
+                                if (file.getMimetype().equalsIgnoreCase(PNG_MIMETYPE)) {
                                     thumbnail = handlePNG(thumbnail, pxW);
                                 }
 
@@ -847,7 +842,7 @@ public class ThumbnailsCacheManager {
                                 userId = AccountUtils.getAccountUsername(username);
                             }
 
-                            String uri = mClient.getBaseUri() + "" + "/index.php/avatar/" + Uri.encode(userId) + "/" + px;
+                            String uri = mClient.getBaseUri() + "/index.php/avatar/" + Uri.encode(userId) + "/" + px;
                             Log_OC.d("Avatar", "URI: " + uri);
                             get = new GetMethod(uri);
                             int status = mClient.executeMethod(get);
@@ -1111,7 +1106,7 @@ public class ThumbnailsCacheManager {
 
         if (bitmap != null) {
             // Handle PNG
-            if (file.getMimetype().equalsIgnoreCase("image/png")) {
+            if (file.getMimetype().equalsIgnoreCase(PNG_MIMETYPE)) {
                 bitmap = handlePNG(bitmap, pxW);
             }
 

src/main/java/com/owncloud/android/providers/DiskLruImageCacheFileProvider.java

@@ -1,20 +1,22 @@
 /*
- *   ownCloud Android client application
+ * Nextcloud Android client application
  *
- *   Copyright (C) 2016 Tobias Kaminsky
+ * @author Tobias Kaminsky
+ * Copyright (C) 2017 Tobias Kaminsky
+ * Copyright (C) 2017 Nextcloud GmbH.
  *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- *   License as published by the Free Software Foundation; either
- *   version 3 of the License, or any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
  *
- *   You should have received a copy of the GNU Affero General Public
- *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.providers;
@@ -28,6 +30,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.provider.OpenableColumns;
+import android.support.annotation.NonNull;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.authentication.AccountUtils;
@@ -58,7 +61,7 @@ public class DiskLruImageCacheFileProvider extends ContentProvider {
     }
 
     @Override
-    public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
+    public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException {
         OCFile ocFile = getFile(uri);
 
         Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
@@ -90,7 +93,7 @@ public class DiskLruImageCacheFileProvider extends ContentProvider {
             try {
                 fos = new FileOutputStream(f);
             } catch (FileNotFoundException e) {
-                e.printStackTrace();
+                Log_OC.e(TAG, "File not found: " + e.getMessage());
             }
             fos.write(bitmapData);
             fos.flush();
@@ -104,13 +107,13 @@ public class DiskLruImageCacheFileProvider extends ContentProvider {
     }
 
     @Override
-    public String getType(Uri uri) {
+    public String getType(@NonNull Uri uri) {
         OCFile ocFile = getFile(uri);
         return ocFile.getMimetype();
     }
 
     @Override
-    public Cursor query(Uri uri, String[] arg1, String arg2, String[] arg3, String arg4) {
+    public Cursor query(@NonNull Uri uri, String[] arg1, String arg2, String[] arg3, String arg4) {
         MatrixCursor cursor = null;
 
         OCFile ocFile = getFile(uri);
@@ -126,17 +129,17 @@ public class DiskLruImageCacheFileProvider extends ContentProvider {
     }
 
     @Override
-    public Uri insert(Uri uri, ContentValues values) {
+    public Uri insert(@NonNull Uri uri, ContentValues values) {
         return null;
     }
 
     @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
+    public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) {
         return 0;
     }
 
     @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+    public int update(@NonNull Uri uri, ContentValues values, String selection, String[] selectionArgs) {
         return 0;
     }
 }

src/main/java/com/owncloud/android/ui/adapter/DiskLruImageCache.java

@@ -1,7 +1,9 @@
-/**
+/*
  *   ownCloud Android client application
  *
  *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2017 Tobias Kaminsky
+ *   Copyright (C) 2017 Nextcloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -30,7 +32,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -44,111 +45,103 @@ public class DiskLruImageCache {
     private static final int VALUE_COUNT = 1;
     private static final int IO_BUFFER_SIZE = 8 * 1024;
     private static final String CACHE_TEST_DISK = "cache_test_DISK_";
-            
-    private static final String TAG = DiskLruImageCache.class.getSimpleName();
 
-    //public DiskLruImageCache( Context context,String uniqueName, int diskCacheSize,
-    public DiskLruImageCache(
-            File diskCacheDir, int diskCacheSize, CompressFormat compressFormat, int quality 
-            ) throws IOException {
+    private static final String TAG = DiskLruImageCache.class.getSimpleName();
 
-        mDiskCache = DiskLruCache.open(
-                diskCacheDir, CACHE_VERSION, VALUE_COUNT, diskCacheSize 
-        );
+    public DiskLruImageCache(File diskCacheDir, int diskCacheSize, CompressFormat compressFormat, int quality)
+            throws IOException {
+        mDiskCache = DiskLruCache.open(diskCacheDir, CACHE_VERSION, VALUE_COUNT, diskCacheSize);
         mCompressFormat = compressFormat;
         mCompressQuality = quality;
     }
 
-    private boolean writeBitmapToFile( Bitmap bitmap, DiskLruCache.Editor editor )
-        throws IOException, FileNotFoundException {
+    private boolean writeBitmapToFile(Bitmap bitmap, DiskLruCache.Editor editor) throws IOException {
         OutputStream out = null;
         try {
-            out = new BufferedOutputStream( editor.newOutputStream( 0 ), IO_BUFFER_SIZE );
-            return bitmap.compress( mCompressFormat, mCompressQuality, out );
+            out = new BufferedOutputStream(editor.newOutputStream(0), IO_BUFFER_SIZE);
+            return bitmap.compress(mCompressFormat, mCompressQuality, out);
         } finally {
-            if ( out != null ) {
+            if (out != null) {
                 out.close();
             }
         }
     }
 
-    public void put( String key, Bitmap data ) {
+    public void put(String key, Bitmap data) {
 
         DiskLruCache.Editor editor = null;
         String validKey = convertToValidKey(key);
         try {
-            editor = mDiskCache.edit( validKey );
-            if ( editor == null ) {
+            editor = mDiskCache.edit(validKey);
+            if (editor == null) {
                 return;
             }
 
-            if( writeBitmapToFile( data, editor ) ) {               
+            if (writeBitmapToFile(data, editor)) {
                 mDiskCache.flush();
                 editor.commit();
-                if ( BuildConfig.DEBUG ) {
-                   Log_OC.d( CACHE_TEST_DISK, "image put on disk cache " + validKey );
+                if (BuildConfig.DEBUG) {
+                    Log_OC.d(CACHE_TEST_DISK, "image put on disk cache " + validKey);
                 }
             } else {
                 editor.abort();
-                if ( BuildConfig.DEBUG ) {
-                    Log_OC.d( CACHE_TEST_DISK, "ERROR on: image put on disk cache " + validKey );
+                if (BuildConfig.DEBUG) {
+                    Log_OC.d(CACHE_TEST_DISK, "ERROR on: image put on disk cache " + validKey);
                 }
-            }   
+            }
         } catch (IOException e) {
-            if ( BuildConfig.DEBUG ) {
-                Log_OC.d( CACHE_TEST_DISK, "ERROR on: image put on disk cache " + validKey );
+            if (BuildConfig.DEBUG) {
+                Log_OC.d(CACHE_TEST_DISK, "ERROR on: image put on disk cache " + validKey);
             }
             try {
-                if ( editor != null ) {
+                if (editor != null) {
                     editor.abort();
                 }
             } catch (IOException ignored) {
-            }           
+            }
         }
-
     }
 
-    public Bitmap getBitmap( String key ) {
+    public Bitmap getBitmap(String key) {
 
         Bitmap bitmap = null;
         DiskLruCache.Snapshot snapshot = null;
         String validKey = convertToValidKey(key);
+        
         try {
-
-            snapshot = mDiskCache.get( validKey );
-            if ( snapshot == null ) {
+            snapshot = mDiskCache.get(validKey);
+            if (snapshot == null) {
                 return null;
             }
-            final InputStream in = snapshot.getInputStream( 0 );
-            if ( in != null ) {
-                final BufferedInputStream buffIn = 
-                new BufferedInputStream( in, IO_BUFFER_SIZE );
-                bitmap = BitmapFactory.decodeStream( buffIn );              
-            }   
-        } catch ( IOException e ) {
-            Log_OC.d(TAG, e.getMessage(), e);
+            final InputStream in = snapshot.getInputStream(0);
+            if (in != null) {
+                final BufferedInputStream buffIn =
+                        new BufferedInputStream(in, IO_BUFFER_SIZE);
+                bitmap = BitmapFactory.decodeStream(buffIn);
+            }
+        } catch (IOException e) {
+            Log_OC.e(TAG, e.getMessage(), e);
         } finally {
             if (snapshot != null) {
                 snapshot.close();
             }
         }
 
-        if ( BuildConfig.DEBUG ) {
-            Log_OC.d(CACHE_TEST_DISK, bitmap == null ?
-                    "not found" : "image read from disk " + validKey);
+        if (BuildConfig.DEBUG) {
+            Log_OC.d(CACHE_TEST_DISK, bitmap == null ? "not found" : "image read from disk " + validKey);
         }
 
         return bitmap;
 
     }
 
-    public boolean containsKey( String key ) {
+    public boolean containsKey(String key) {
 
         boolean contained = false;
         DiskLruCache.Snapshot snapshot = null;
         String validKey = convertToValidKey(key);
         try {
-            snapshot = mDiskCache.get( validKey );
+            snapshot = mDiskCache.get(validKey);
             contained = snapshot != null;
         } catch (IOException e) {
             Log_OC.d(TAG, e.getMessage(), e);
@@ -163,12 +156,12 @@ public class DiskLruImageCache {
     }
 
     public void clearCache() {
-        if ( BuildConfig.DEBUG ) {
-            Log_OC.d( CACHE_TEST_DISK, "disk cache CLEARED");
+        if (BuildConfig.DEBUG) {
+            Log_OC.d(CACHE_TEST_DISK, "disk cache CLEARED");
         }
         try {
             mDiskCache.delete();
-        } catch ( IOException e ) {
+        } catch (IOException e) {
             Log_OC.d(TAG, e.getMessage(), e);
         }
     }
@@ -176,16 +169,17 @@ public class DiskLruImageCache {
     public File getCacheFolder() {
         return mDiskCache.getDirectory();
     }
-    
+
     private String convertToValidKey(String key) {
         return Integer.toString(key.hashCode());
     }
 
     /**
      * Remove passed key from cache
+     *
      * @param key
      */
-    public void removeKey( String key ) {
+    public void removeKey(String key) {
         String validKey = convertToValidKey(key);
         try {
             mDiskCache.remove(validKey);

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -1015,11 +1015,11 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
                 return true;
             }
             case R.id.action_keep_files_offline: {
-                mContainerActivity.getFileOperationsHelper().toogleOfflineFiles(checkedFiles, true);
+                mContainerActivity.getFileOperationsHelper().toggleOfflineFiles(checkedFiles, true);
                 return true;
             }
             case R.id.action_unset_keep_files_offline: {
-                mContainerActivity.getFileOperationsHelper().toogleOfflineFiles(checkedFiles, false);
+                mContainerActivity.getFileOperationsHelper().toggleOfflineFiles(checkedFiles, false);
                 return true;
             }
             case R.id.action_favorite: {

src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -1,20 +1,20 @@
-/**
+/*
  * ownCloud Android client application
  *
  * @author masensio
  * @author David A. Velasco
  * @author Juan Carlos González Cabrero
  * Copyright (C) 2015 ownCloud Inc.
- * <p>
+ * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
  * as published by the Free Software Foundation.
- * <p>
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * <p>
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -506,7 +506,8 @@ public class FileOperationsHelper {
                     file.getRemotePath()));
             sendIntent.putExtra(Intent.ACTION_SEND, true);      // Send Action
 
-            mFileActivity.startActivity(Intent.createChooser(sendIntent, "Send"));
+            mFileActivity.startActivity(Intent.createChooser(sendIntent, 
+                    context.getString(R.string.actionbar_send_file)));
         } else {
             Log_OC.wtf(TAG, "Trying to send a NULL OCFile");
         }
@@ -592,7 +593,7 @@ public class FileOperationsHelper {
     }
 
 
-    public void toogleOfflineFiles(Collection<OCFile> files, boolean isAvailableOffline) {
+    public void toggleOfflineFiles(Collection<OCFile> files, boolean isAvailableOffline) {
         List<OCFile> alreadyRightStateList = new ArrayList<>();
         for (OCFile file : files) {
             if (file.isAvailableOffline() == isAvailableOffline) {
@@ -758,7 +759,7 @@ public class FileOperationsHelper {
     }
 
     /**
-     * Starts a check of the currenlty stored credentials for the given account.
+     * Starts a check of the currently stored credentials for the given account.
      *
      * @param account       OC account which credentials will be checked.
      */
@@ -768,8 +769,6 @@ public class FileOperationsHelper {
         service.putExtra(OperationsService.EXTRA_ACCOUNT, account);
         mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);
 
-        mFileActivity.showLoadingDialog(
-                mFileActivity.getString(R.string.wait_checking_credentials)
-        );
+        mFileActivity.showLoadingDialog(mFileActivity.getString(R.string.wait_checking_credentials));
     }
 }

src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -743,20 +743,11 @@ public class PreviewImageFragment extends FileFragment {
 
     public void setErrorPreviewMessage() {
         Snackbar.make(mMultiView, R.string.resized_image_not_possible, Snackbar.LENGTH_INDEFINITE)
-                .setAction(R.string.common_yes, new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        downloadFile();
-                    }
-                }).show();
+                .setAction(R.string.common_yes, v -> downloadFile()).show();
     }
 
     public void setNoConnectionErrorMessage() {
-        try {
-            Snackbar.make(getView(), R.string.auth_no_net_conn_title, Snackbar.LENGTH_LONG).show();
-        } catch (NullPointerException npe) {
-            Log_OC.e(TAG, "Error showing snackbar", npe);
-        }
+            Snackbar.make(mMultiView, R.string.auth_no_net_conn_title, Snackbar.LENGTH_LONG).show();
     }
 
     /**