Просмотр исходного кода

rename boolean variable for nicer getter/setter names

Andy Scherzinger 6 лет назад
Родитель
Сommit
e46818f3fa

+ 2 - 2
src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java

@@ -91,7 +91,7 @@ public class OCFileUnitTest {
         mFile.setPublicLink(PUBLIC_LINK);
         mFile.setPermissions(PERMISSIONS);
         mFile.setRemoteId(REMOTE_ID);
-        mFile.setNeedsUpdateThumbnail(true);
+        mFile.setUpdateThumbnailNeeded(true);
         mFile.setDownloading(true);
         mFile.setEtagInConflict(ETAG_IN_CONFLICT);
 
@@ -126,7 +126,7 @@ public class OCFileUnitTest {
         assertThat(fileReadFromParcel.getPublicLink(), is(PUBLIC_LINK));
         assertThat(fileReadFromParcel.getPermissions(), is(PERMISSIONS));
         assertThat(fileReadFromParcel.getRemoteId(), is(REMOTE_ID));
-        assertThat(fileReadFromParcel.isNeedsUpdateThumbnail(), is(true));
+        assertThat(fileReadFromParcel.isUpdateThumbnailNeeded(), is(true));
         assertThat(fileReadFromParcel.isDownloading(), is(true));
         assertThat(fileReadFromParcel.getEtagInConflict(), is(ETAG_IN_CONFLICT));
     }

+ 4 - 4
src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -199,7 +199,7 @@ public class FileDataStorageManager {
         cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, file.getPublicLink());
         cv.put(ProviderTableMeta.FILE_PERMISSIONS, file.getPermissions());
         cv.put(ProviderTableMeta.FILE_REMOTE_ID, file.getRemoteId());
-        cv.put(ProviderTableMeta.FILE_UPDATE_THUMBNAIL, file.isNeedsUpdateThumbnail());
+        cv.put(ProviderTableMeta.FILE_UPDATE_THUMBNAIL, file.isUpdateThumbnailNeeded());
         cv.put(ProviderTableMeta.FILE_IS_DOWNLOADING, file.isDownloading());
         cv.put(ProviderTableMeta.FILE_ETAG_IN_CONFLICT, file.getEtagInConflict());
 
@@ -468,7 +468,7 @@ public class FileDataStorageManager {
         cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, file.getPublicLink());
         cv.put(ProviderTableMeta.FILE_PERMISSIONS, file.getPermissions());
         cv.put(ProviderTableMeta.FILE_REMOTE_ID, file.getRemoteId());
-        cv.put(ProviderTableMeta.FILE_UPDATE_THUMBNAIL, file.isNeedsUpdateThumbnail());
+        cv.put(ProviderTableMeta.FILE_UPDATE_THUMBNAIL, file.isUpdateThumbnailNeeded());
         cv.put(ProviderTableMeta.FILE_IS_DOWNLOADING, file.isDownloading());
         cv.put(ProviderTableMeta.FILE_ETAG_IN_CONFLICT, file.getEtagInConflict());
         cv.put(ProviderTableMeta.FILE_FAVORITE, file.isFavorite());
@@ -958,7 +958,7 @@ public class FileDataStorageManager {
             file.setPublicLink(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PUBLIC_LINK)));
             file.setPermissions(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PERMISSIONS)));
             file.setRemoteId(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_REMOTE_ID)));
-            file.setNeedsUpdateThumbnail(c.getInt(c.getColumnIndex(ProviderTableMeta.FILE_UPDATE_THUMBNAIL)) == 1);
+            file.setUpdateThumbnailNeeded(c.getInt(c.getColumnIndex(ProviderTableMeta.FILE_UPDATE_THUMBNAIL)) == 1);
             file.setDownloading(c.getInt(c.getColumnIndex(ProviderTableMeta.FILE_IS_DOWNLOADING)) == 1);
             file.setEtagInConflict(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_ETAG_IN_CONFLICT)));
             file.setFavorite(c.getInt(c.getColumnIndex(ProviderTableMeta.FILE_FAVORITE)) == 1);
@@ -1383,7 +1383,7 @@ public class FileDataStorageManager {
                 cv.put(ProviderTableMeta.FILE_FAVORITE, file.isFavorite());
                 cv.put(
                         ProviderTableMeta.FILE_UPDATE_THUMBNAIL,
-                        file.isNeedsUpdateThumbnail() ? 1 : 0
+                        file.isUpdateThumbnailNeeded() ? 1 : 0
                 );
                 cv.put(
                         ProviderTableMeta.FILE_IS_DOWNLOADING,

+ 4 - 4
src/main/java/com/owncloud/android/datamodel/OCFile.java

@@ -84,7 +84,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
     /** The fileid namespaced by the instance fileId, globally unique */
     @Getter @Setter private String remoteId;
 
-    @Getter @Setter private boolean needsUpdateThumbnail;
+    @Getter @Setter private boolean updateThumbnailNeeded;
 
     @Getter @Setter private boolean downloading;
 
@@ -154,7 +154,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
         publicLink = source.readString();
         permissions = source.readString();
         remoteId = source.readString();
-        needsUpdateThumbnail = source.readInt() == 1;
+        updateThumbnailNeeded = source.readInt() == 1;
         downloading = source.readInt() == 1;
         etagInConflict = source.readString();
         sharedWithSharee = source.readInt() == 1;
@@ -184,7 +184,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
         dest.writeString(publicLink);
         dest.writeString(permissions);
         dest.writeString(remoteId);
-        dest.writeInt(needsUpdateThumbnail ? 1 : 0);
+        dest.writeInt(updateThumbnailNeeded ? 1 : 0);
         dest.writeInt(downloading ? 1 : 0);
         dest.writeString(etagInConflict);
         dest.writeInt(sharedWithSharee ? 1 : 0);
@@ -403,7 +403,7 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
         publicLink = null;
         permissions = null;
         remoteId = null;
-        needsUpdateThumbnail = false;
+        updateThumbnailNeeded = false;
         downloading = false;
         etagInConflict = null;
         sharedWithSharee = false;

+ 4 - 4
src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -265,7 +265,7 @@ public final class ThumbnailsCacheManager {
             thumbnail = getBitmapFromDiskCache(imageKey);
 
             // Not found in disk cache
-            if (thumbnail == null || file.isNeedsUpdateThumbnail()) {
+            if (thumbnail == null || file.isUpdateThumbnailNeeded()) {
                 Point p = getScreenDimension();
                 int pxW = p.x;
                 int pxH = p.y;
@@ -281,7 +281,7 @@ public final class ThumbnailsCacheManager {
 
                         thumbnail = addThumbnailToCache(imageKey, bitmap, file.getStoragePath(), pxW, pxH);
 
-                        file.setNeedsUpdateThumbnail(false);
+                        file.setUpdateThumbnailNeeded(false);
                         storageManager.saveFile(file);
                     }
 
@@ -504,7 +504,7 @@ public final class ThumbnailsCacheManager {
             thumbnail = getBitmapFromDiskCache(imageKey);
 
             // Not found in disk cache
-            if (thumbnail == null || (file instanceof OCFile && ((OCFile) file).isNeedsUpdateThumbnail())) {
+            if (thumbnail == null || (file instanceof OCFile && ((OCFile) file).isUpdateThumbnailNeeded())) {
                 int pxW;
                 int pxH;
                 pxW = pxH = getThumbnailDimension();
@@ -528,7 +528,7 @@ public final class ThumbnailsCacheManager {
 
                             thumbnail = addThumbnailToCache(imageKey, bitmap, ocFile.getStoragePath(), pxW, pxH);
 
-                            ocFile.setNeedsUpdateThumbnail(false);
+                            ocFile.setUpdateThumbnailNeeded(false);
                             mStorageManager.saveFile(ocFile);
                         }
                     }

+ 1 - 1
src/main/java/com/owncloud/android/files/services/FileDownloader.java

@@ -492,7 +492,7 @@ public class FileDownloader extends Service
         long syncDate = System.currentTimeMillis();
         file.setLastSyncDateForProperties(syncDate);
         file.setLastSyncDateForData(syncDate);
-        file.setNeedsUpdateThumbnail(true);
+        file.setUpdateThumbnailNeeded(true);
         file.setModificationTimestamp(mCurrentDownload.getModificationTimestamp());
         file.setModificationTimestampAtLastSyncForData(mCurrentDownload.getModificationTimestamp());
         file.setEtag(mCurrentDownload.getEtag());

+ 1 - 1
src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java

@@ -477,7 +477,7 @@ public class RefreshFolderOperation extends RemoteOperation {
             } else if (remoteFolderChanged && MimeTypeUtil.isImage(remoteFile) &&
                     remoteFile.getModificationTimestamp() !=
                             localFile.getModificationTimestamp()) {
-                updatedFile.setNeedsUpdateThumbnail(true);
+                updatedFile.setUpdateThumbnailNeeded(true);
                 Log.d(TAG, "Image " + remoteFile.getFileName() + " updated on the server");
             }
 

+ 1 - 1
src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java

@@ -335,7 +335,7 @@ public class SynchronizeFolderOperation extends SyncOperation {
             } else if (mRemoteFolderChanged && MimeTypeUtil.isImage(remoteFile) &&
                     remoteFile.getModificationTimestamp() !=
                             localFile.getModificationTimestamp()) {
-                updatedFile.setNeedsUpdateThumbnail(true);
+                updatedFile.setUpdateThumbnailNeeded(true);
                 Log.d(TAG, "Image " + remoteFile.getFileName() + " updated on the server");
             }
             updatedFile.setPublicLink(localFile.getPublicLink());

+ 1 - 1
src/main/java/com/owncloud/android/operations/UploadFileOperation.java

@@ -1332,7 +1332,7 @@ public class UploadFileOperation extends SyncOperation {
             // coincidence; nothing else is needed, the storagePath is right
             // in the instance returned by mCurrentUpload.getFile()
         }
-        file.setNeedsUpdateThumbnail(true);
+        file.setUpdateThumbnailNeeded(true);
         getStorageManager().saveFile(file);
         getStorageManager().saveConflict(file, null);
 

+ 1 - 1
src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -388,7 +388,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                         ThumbnailsCacheManager.PREFIX_THUMBNAIL + file.getRemoteId()
                 );
 
-                if (thumbnail != null && !file.isNeedsUpdateThumbnail()) {
+                if (thumbnail != null && !file.isUpdateThumbnailNeeded()) {
                     if (MimeTypeUtil.isVideo(file)) {
                         Bitmap withOverlay = ThumbnailsCacheManager.addVideoOverlay(thumbnail);
                         thumbnailView.setImageBitmap(withOverlay);

+ 1 - 1
src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java

@@ -312,7 +312,7 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
             Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
                     String.valueOf(fakeFileToCheatThumbnailsCacheManagerInterface.getRemoteId())
             );
-            if (thumbnail != null && !fakeFileToCheatThumbnailsCacheManagerInterface.isNeedsUpdateThumbnail()) {
+            if (thumbnail != null && !fakeFileToCheatThumbnailsCacheManagerInterface.isUpdateThumbnailNeeded()) {
                 itemViewHolder.thumbnail.setImageBitmap(thumbnail);
             } else {
                 // generate new Thumbnail

+ 1 - 1
src/main/java/com/owncloud/android/ui/adapter/UploaderAdapter.java

@@ -102,7 +102,7 @@ public class UploaderAdapter extends SimpleAdapter {
                 Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
                         String.valueOf(file.getRemoteId())
                 );
-                if (thumbnail != null && !file.isNeedsUpdateThumbnail()) {
+                if (thumbnail != null && !file.isUpdateThumbnailNeeded()) {
                     fileIcon.setImageBitmap(thumbnail);
                 } else {
                     // generate new Thumbnail

+ 1 - 1
src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -560,7 +560,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
             String tagId = String.valueOf(ThumbnailsCacheManager.PREFIX_RESIZED_IMAGE + getFile().getRemoteId());
             resizedImage = ThumbnailsCacheManager.getBitmapFromDiskCache(tagId);
 
-            if (resizedImage != null && !file.isNeedsUpdateThumbnail()) {
+            if (resizedImage != null && !file.isUpdateThumbnailNeeded()) {
                 activity.setPreviewImageBitmap(resizedImage);
                 activatePreviewImage();
                 previewLoaded = true;

+ 1 - 1
src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -227,7 +227,7 @@ public class PreviewImageFragment extends FileFragment {
                 Bitmap resizedImage = ThumbnailsCacheManager.getBitmapFromDiskCache(
                         String.valueOf(ThumbnailsCacheManager.PREFIX_RESIZED_IMAGE + getFile().getRemoteId()));
 
-                if (resizedImage != null && !getFile().isNeedsUpdateThumbnail()) {
+                if (resizedImage != null && !getFile().isUpdateThumbnailNeeded()) {
                     mImageView.setImageBitmap(resizedImage);
                     mImageView.setVisibility(View.VISIBLE);
                     mBitmap = resizedImage;