Refactor: convert Attachment from java to kotlin

Author: mohitsatr

legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java

@@ -1985,13 +1985,13 @@ public void addAttachmentView(final Attachment attachment) {
             attachmentsView.setVisibility(View.VISIBLE);
 
             View view = getLayoutInflater().inflate(R.layout.message_compose_attachment, attachmentsView, false);
-            attachmentViews.put(attachment.uri, view);
+            attachmentViews.put(attachment.getUri(), view);
 
             View deleteButton = view.findViewById(R.id.attachment_delete);
             deleteButton.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    attachmentPresenter.onClickRemoveAttachment(attachment.uri);
+                    attachmentPresenter.onClickRemoveAttachment(attachment.getUri());
                 }
             });
 
@@ -2001,26 +2001,26 @@ public void onClick(View view) {
 
         @Override
         public void updateAttachmentView(Attachment attachment) {
-            View view = attachmentViews.get(attachment.uri);
+            View view = attachmentViews.get(attachment.getUri());
             if (view == null) {
                 throw new IllegalArgumentException();
             }
 
             MaterialTextView nameView = view.findViewById(R.id.attachment_name);
-            boolean hasMetadata = (attachment.state != Attachment.LoadingState.URI_ONLY);
+            boolean hasMetadata = (attachment.getState() != Attachment.LoadingState.URI_ONLY);
             if (hasMetadata) {
-                nameView.setText(attachment.name);
+                nameView.setText(attachment.getName());
             } else {
                 nameView.setText(R.string.loading_attachment);
             }
 
-            if (attachment.size != null && attachment.size >= 0) {
+            if (attachment.getSize() != null && attachment.getSize() >= 0) {
                 MaterialTextView sizeView = view.findViewById(R.id.attachment_size);
-                sizeView.setText(sizeFormatter.formatSize(attachment.size));
+                sizeView.setText(sizeFormatter.formatSize(attachment.getSize()));
             }
 
             View progressBar = view.findViewById(R.id.progressBar);
-            boolean isLoadingComplete = (attachment.state == Attachment.LoadingState.COMPLETE);
+            boolean isLoadingComplete = (attachment.getState() == Attachment.LoadingState.COMPLETE);
             if (isLoadingComplete) {
                 if (attachment.isSupportedImage()) {
                     ImageView attachmentTypeView = view.findViewById(R.id.attachment_type);
@@ -2029,7 +2029,7 @@ public void updateAttachmentView(Attachment attachment) {
                     ImageView preview = view.findViewById(R.id.attachment_preview);
                     preview.setVisibility(View.VISIBLE);
                     Glide.with(MessageCompose.this)
-                            .load(new File(attachment.filename))
+                            .load(new File(attachment.getFileName()))
                             .centerCrop()
                             .diskCacheStrategy(DiskCacheStrategy.NONE)
                             .into(preview);
@@ -2042,9 +2042,9 @@ public void updateAttachmentView(Attachment attachment) {
 
         @Override
         public void removeAttachmentView(Attachment attachment) {
-            View view = attachmentViews.get(attachment.uri);
+            View view = attachmentViews.get(attachment.getUri());
             attachmentsView.removeView(view);
-            attachmentViews.remove(attachment.uri);
+            attachmentViews.remove(attachment.getUri());
 
             if (attachmentViews.isEmpty()) {
                 attachmentsView.setVisibility(View.GONE);

legacy/ui/legacy/src/main/java/com/fsck/k9/activity/compose/AttachmentPresenter.java

@@ -80,12 +80,12 @@ public void onRestoreInstanceState(Bundle savedInstanceState) {
         ArrayList<Attachment> attachmentList = savedInstanceState.getParcelableArrayList(STATE_KEY_ATTACHMENTS);
         // noinspection ConstantConditions, we know this is set in onSaveInstanceState
         for (Attachment attachment : attachmentList) {
-            attachments.put(attachment.uri, attachment);
+            attachments.put(attachment.getUri(), attachment);
             attachmentMvpView.addAttachmentView(attachment);
 
-            if (attachment.state == LoadingState.URI_ONLY) {
+            if (attachment.getState() == LoadingState.URI_ONLY) {
                 initAttachmentInfoLoader(attachment);
-            } else if (attachment.state == LoadingState.METADATA) {
+            } else if (attachment.getState() == LoadingState.METADATA) {
                 initAttachmentContentLoader(attachment);
             }
         }
@@ -107,7 +107,7 @@ public boolean checkOkForSendingOrDraftSaving() {
 
     private boolean hasLoadingAttachments() {
         for (Attachment attachment : attachments.values()) {
-            Loader loader = loaderManager.getLoader(attachment.loaderId);
+            Loader loader = loaderManager.getLoader(attachment.getLoaderId());
             if (loader != null && loader.isStarted()) {
                 return true;
             }
@@ -183,11 +183,12 @@ private void addInlineAttachment(AttachmentViewInfo attachmentViewInfo) {
         attachment = attachment.deriveWithMetadataLoaded(
                 attachmentViewInfo.mimeType, attachmentViewInfo.displayName, attachmentViewInfo.size);
 
-        inlineAttachments.put(attachment.uri, new InlineAttachment(attachmentViewInfo.part.getContentId(), attachment));
+        inlineAttachments.put(
+            attachment.getUri(), new InlineAttachment(attachmentViewInfo.part.getContentId(), attachment));
 
         Bundle bundle = new Bundle();
-        bundle.putParcelable(LOADER_ARG_ATTACHMENT, attachment.uri);
-        loaderManager.initLoader(attachment.loaderId, bundle, mInlineAttachmentContentLoaderCallback);
+        bundle.putParcelable(LOADER_ARG_ATTACHMENT, attachment.getUri());
+        loaderManager.initLoader(attachment.getLoaderId(), bundle, mInlineAttachmentContentLoaderCallback);
     }
 
     private void addInternalAttachment(Uri uri, String contentType, boolean allowMessageType) {
@@ -243,37 +244,37 @@ public void processMessageToForwardAsAttachment(MessageViewInfo messageViewInfo)
     }
 
     private void addAttachmentAndStartLoader(Attachment attachment) {
-        attachments.put(attachment.uri, attachment);
+        attachments.put(attachment.getUri(), attachment);
         listener.onAttachmentAdded();
         attachmentMvpView.addAttachmentView(attachment);
 
-        if (attachment.state == LoadingState.URI_ONLY) {
+        if (attachment.getState() == LoadingState.URI_ONLY) {
             initAttachmentInfoLoader(attachment);
-        } else if (attachment.state == LoadingState.METADATA) {
+        } else if (attachment.getState() == LoadingState.METADATA) {
             initAttachmentContentLoader(attachment);
         } else {
             throw new IllegalStateException("Attachment can only be added in URI_ONLY or METADATA state!");
         }
     }
 
     private void initAttachmentInfoLoader(Attachment attachment) {
-        if (attachment.state != LoadingState.URI_ONLY) {
+        if (attachment.getState() != LoadingState.URI_ONLY) {
             throw new IllegalStateException("initAttachmentInfoLoader can only be called for URI_ONLY state!");
         }
 
         Bundle bundle = new Bundle();
-        bundle.putParcelable(LOADER_ARG_ATTACHMENT, attachment.uri);
-        loaderManager.initLoader(attachment.loaderId, bundle, mAttachmentInfoLoaderCallback);
+        bundle.putParcelable(LOADER_ARG_ATTACHMENT, attachment.getUri());
+        loaderManager.initLoader(attachment.getLoaderId(), bundle, mAttachmentInfoLoaderCallback);
     }
 
     private void initAttachmentContentLoader(Attachment attachment) {
-        if (attachment.state != LoadingState.METADATA) {
+        if (attachment.getState() != LoadingState.METADATA) {
             throw new IllegalStateException("initAttachmentContentLoader can only be called for METADATA state!");
         }
 
         Bundle bundle = new Bundle();
-        bundle.putParcelable(LOADER_ARG_ATTACHMENT, attachment.uri);
-        loaderManager.initLoader(attachment.loaderId, bundle, mAttachmentContentLoaderCallback);
+        bundle.putParcelable(LOADER_ARG_ATTACHMENT, attachment.getUri());
+        loaderManager.initLoader(attachment.getLoaderId(), bundle, mAttachmentContentLoaderCallback);
     }
 
     private int getNextFreeLoaderId() {
@@ -296,16 +297,16 @@ public void onLoadFinished(Loader<Attachment> loader, Attachment attachment) {
                     int loaderId = loader.getId();
                     loaderManager.destroyLoader(loaderId);
 
-                    if (!attachments.containsKey(attachment.uri)) {
+                    if (!attachments.containsKey(attachment.getUri())) {
                         return;
                     }
 
-                    if (attachment.state == LoadingState.METADATA) {
+                    if (attachment.getState() == LoadingState.METADATA) {
                         attachmentMvpView.updateAttachmentView(attachment);
-                        attachments.put(attachment.uri, attachment);
+                        attachments.put(attachment.getUri(), attachment);
                         initAttachmentContentLoader(attachment);
                     } else {
-                        attachments.remove(attachment.uri);
+                        attachments.remove(attachment.getUri());
                         attachmentMvpView.removeAttachmentView(attachment);
                     }
                 }
@@ -329,15 +330,15 @@ public void onLoadFinished(Loader<Attachment> loader, Attachment attachment) {
                     int loaderId = loader.getId();
                     loaderManager.destroyLoader(loaderId);
 
-                    if (!attachments.containsKey(attachment.uri)) {
+                    if (!attachments.containsKey(attachment.getUri())) {
                         return;
                     }
 
-                    if (attachment.state == Attachment.LoadingState.COMPLETE) {
+                    if (attachment.getState() == Attachment.LoadingState.COMPLETE) {
                         attachmentMvpView.updateAttachmentView(attachment);
-                        attachments.put(attachment.uri, attachment);
+                        attachments.put(attachment.getUri(), attachment);
                     } else {
-                        attachments.remove(attachment.uri);
+                        attachments.remove(attachment.getUri());
                         attachmentMvpView.removeAttachmentView(attachment);
                     }
 
@@ -363,11 +364,11 @@ public void onLoadFinished(Loader<Attachment> loader, Attachment attachment) {
                     int loaderId = loader.getId();
                     loaderManager.destroyLoader(loaderId);
 
-                    if (attachment.state == Attachment.LoadingState.COMPLETE) {
-                        inlineAttachments.put(attachment.uri, new InlineAttachment(
-                                inlineAttachments.get(attachment.uri).getContentId(), attachment));
+                    if (attachment.getState() == Attachment.LoadingState.COMPLETE) {
+                        inlineAttachments.put(attachment.getUri(), new InlineAttachment(
+                                inlineAttachments.get(attachment.getUri()).getContentId(), attachment));
                     } else {
-                        inlineAttachments.remove(attachment.uri);
+                        inlineAttachments.remove(attachment.getUri());
                     }
 
                     postPerformStalledAction();
@@ -432,7 +433,7 @@ public void attachmentProgressDialogCancelled() {
     public void onClickRemoveAttachment(Uri uri) {
         Attachment attachment = attachments.get(uri);
 
-        loaderManager.destroyLoader(attachment.loaderId);
+        loaderManager.destroyLoader(attachment.getLoaderId());
 
         attachmentMvpView.removeAttachmentView(attachment);
         attachments.remove(uri);

legacy/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java

@@ -30,7 +30,7 @@ public class AttachmentContentLoader extends AsyncTaskLoader<Attachment> {
 
     public AttachmentContentLoader(Context context, Attachment attachment) {
         super(context);
-        if (attachment.state != LoadingState.METADATA) {
+        if (attachment.getState() != LoadingState.METADATA) {
             throw new IllegalArgumentException("Attachment provided to content loader must be in METADATA state");
         }
 
@@ -60,15 +60,15 @@ public Attachment loadInBackground() {
 
             InputStream in;
 
-            if (sourceAttachment.internalAttachment) {
+            if (sourceAttachment.isInternalAttachment()) {
                 ContentResolver unsafeContentResolver = context.getContentResolver();
-                in = unsafeContentResolver.openInputStream(sourceAttachment.uri);
+                in = unsafeContentResolver.openInputStream(sourceAttachment.getUri());
             } else {
                 SafeContentResolver safeContentResolver = SafeContentResolver.newInstance(context);
-                in = safeContentResolver.openInputStream(sourceAttachment.uri);
+                in = safeContentResolver.openInputStream(sourceAttachment.getUri());
             }
             if (in == null) {
-                Log.w("Error opening attachment for reading: %s", sourceAttachment.uri);
+                Log.w("Error opening attachment for reading: %s", sourceAttachment.getUri());
 
                 cachedResultAttachment = sourceAttachment.deriveWithLoadCancelled();
                 return cachedResultAttachment;

legacy/ui/legacy/src/main/java/com/fsck/k9/activity/loader/AttachmentInfoLoader.java

@@ -26,7 +26,7 @@ public class AttachmentInfoLoader  extends AsyncTaskLoader<Attachment> {
 
     public AttachmentInfoLoader(Context context, Attachment attachment) {
         super(context);
-        if (attachment.state != LoadingState.URI_ONLY) {
+        if (attachment.getState() != LoadingState.URI_ONLY) {
             throw new IllegalArgumentException("Attachment provided to metadata loader must be in URI_ONLY state");
         }
 
@@ -47,8 +47,8 @@ protected void onStartLoading() {
     @Override
     public Attachment loadInBackground() {
         try {
-            Uri uri = sourceAttachment.uri;
-            String contentType = sourceAttachment.contentType;
+            Uri uri = sourceAttachment.getUri();
+            String contentType = sourceAttachment.getContentType();
 
             long size = -1;
             String name = null;
@@ -86,7 +86,7 @@ public Attachment loadInBackground() {
                 usableContentType = MimeTypeUtil.getMimeTypeByExtension(name);
             }
 
-            if (!sourceAttachment.allowMessageType && MimeUtility.isMessageType(usableContentType)) {
+            if (!sourceAttachment.getAllowMessageType() && MimeUtility.isMessageType(usableContentType)) {
                 usableContentType = MimeTypeUtil.DEFAULT_ATTACHMENT_MIME_TYPE;
             }