a

app/src/main/java/com/epson/cameracopy/alt/FileUtils.java

@@ -5,10 +5,10 @@ import android.os.Environment;
 
 import androidx.annotation.NonNull;
 
-import epson.common.ExternalFileUtils;
-
 import java.io.File;
 
+import epson.common.ExternalFileUtils;
+
 public class FileUtils {
     public static final String TEMPRARY_DIRECOTRY = "tempCamera";
 

app/src/main/java/com/epson/cameracopy/device/PaperContourDetector.java

@@ -2,9 +2,6 @@ package com.epson.cameracopy.device;
 
 import android.util.Pair;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.opencv.core.Mat;
 import org.opencv.core.MatOfPoint;
 import org.opencv.core.MatOfPoint2f;
@@ -12,6 +9,9 @@ import org.opencv.core.Point;
 import org.opencv.core.Size;
 import org.opencv.imgproc.Imgproc;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class PaperContourDetector {
     private static final double DETECT_AREA_RATIO = 0.8d;
 

app/src/main/java/com/epson/cameracopy/device/PortraitCameraView.java

@@ -11,17 +11,17 @@ import android.os.Build;
 import android.util.AttributeSet;
 import android.view.SurfaceHolder;
 
-import epson.common.ImageUtil;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import org.opencv.android.CameraBridgeViewBase;
 import org.opencv.core.Core;
 import org.opencv.core.CvType;
 import org.opencv.core.Mat;
 import org.opencv.imgproc.Imgproc;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import epson.common.ImageUtil;
+
 public class PortraitCameraView extends CameraBridgeViewBase implements Camera.PreviewCallback {
     @SuppressLint({"InlinedApi"})
     private static final String[] FAVORITE_FOCUS_MODES = {"continuous-video", "continuous-picture", "auto"};

app/src/main/java/com/epson/cameracopy/device/PreviewResolutionSelector.java

@@ -2,10 +2,10 @@ package com.epson.cameracopy.device;
 
 import com.epson.mobilephone.common.wifidirect.ActivityControlWiFi;
 
-import java.util.Iterator;
-
 import org.opencv.videoio.Videoio;
 
+import java.util.Iterator;
+
 public class PreviewResolutionSelector {
     static SizeWrapper selectSize01(double d, Iterable<SizeWrapper> iterable, int i, int i2) {
         int score01;

app/src/main/java/com/epson/cameracopy/printlayout/CustomManuscriptSize.java

@@ -4,8 +4,6 @@ import android.content.Context;
 import android.graphics.Point;
 import android.graphics.PointF;
 
-import com.epson.cameracopy.printlayout.ManuscriptSize;
-
 /* compiled from: ManuscriptSize */
 class CustomManuscriptSize implements ManuscriptSize.ManuscriptTypeAdapter {
     private DocumentSizeInfo mDocumentSizeInfo;

app/src/main/java/com/epson/cameracopy/printlayout/DocumentSizeInfo.java

@@ -4,13 +4,13 @@ import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import java.io.Serializable;
-import java.util.LinkedList;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.Serializable;
+import java.util.LinkedList;
+
 public class DocumentSizeInfo implements Parcelable, Serializable {
     public static final Parcelable.Creator<DocumentSizeInfo> CREATOR = new Parcelable.Creator<DocumentSizeInfo>() {
         public DocumentSizeInfo createFromParcel(Parcel parcel) {

app/src/main/java/com/epson/cameracopy/printlayout/IdManuscriptSize.java

@@ -3,7 +3,6 @@ package com.epson.cameracopy.printlayout;
 import android.content.Context;
 import android.graphics.Point;
 
-import com.epson.cameracopy.printlayout.ManuscriptSize;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 
 import epson.common.Info_paper;

app/src/main/java/com/epson/cameracopy/printlayout/ImageAndLayout.java

@@ -3,18 +3,8 @@ package com.epson.cameracopy.printlayout;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-
-
 import com.epson.cameracopy.alt.SimpleBmpMerger;
 
-import epson.print.Util.ImageFileUtil;
-import epson.print.Util.OpenCvHelper;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-
 import org.opencv.core.Core;
 import org.opencv.core.CvType;
 import org.opencv.core.Mat;
@@ -26,6 +16,14 @@ import org.opencv.core.Size;
 import org.opencv.imgcodecs.Imgcodecs;
 import org.opencv.imgproc.Imgproc;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+
+import epson.print.Util.ImageFileUtil;
+import epson.print.Util.OpenCvHelper;
+
 public class ImageAndLayout implements Parcelable {
     static final /* synthetic */ boolean $assertionsDisabled = false;
     public static final Parcelable.Creator<ImageAndLayout> CREATOR = new Parcelable.Creator<ImageAndLayout>() {

app/src/main/java/com/epson/cameracopy/printlayout/PreviewPosition.java

@@ -2,8 +2,6 @@ package com.epson.cameracopy.printlayout;
 
 import android.graphics.Rect;
 
-import com.epson.cameracopy.printlayout.PreviewView;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;

app/src/main/java/com/epson/cameracopy/printlayout/PreviewView.java

@@ -16,11 +16,11 @@ import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 import android.view.View;
 
+import org.opencv.videoio.Videoio;
+
 import epson.common.ImageUtil;
 import epson.common.Info_paper;
 
-import org.opencv.videoio.Videoio;
-
 public class PreviewView extends View {
     private static final int BORDER_AREA_COLOR = -1;
     private static final ColorMatrixColorFilter[] COLOR_FILTER = {new ColorMatrixColorFilter(new ColorMatrix(colorMatrix)), new ColorMatrixColorFilter(new ColorMatrix(monoMatrix)), new ColorMatrixColorFilter(new ColorMatrix(sepiaMatrix))};

app/src/main/java/com/epson/cameracopy/printlayout/RegistedDocumentSizeList.java

@@ -2,6 +2,9 @@ package com.epson.cameracopy.printlayout;
 
 import android.content.Context;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Collection;
@@ -9,9 +12,6 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Locale;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 public class RegistedDocumentSizeList {
     private static final int CLASS_SAVE_VERSION = 1;
     private static int DEFAULT_PAPER_SIZE_COUNT = 17;

app/src/main/java/com/epson/cameracopy/ui/CameraPreviewActivity.java

@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-
 import android.view.Menu;
 import android.view.MenuItem;
 

app/src/main/java/com/epson/cameracopy/ui/CameraPreviewFragment.java

@@ -6,7 +6,6 @@ import android.hardware.Camera;
 import android.hardware.SensorManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
-
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -26,13 +25,6 @@ import com.epson.cameracopy.device.CameraPreviewControl;
 import com.epson.cameracopy.device.OpenCvCameraView;
 import com.epson.cameracopy.device.RectangleDetector;
 
-import epson.print.R;
-import epson.print.imgsel.CameraCopyImageSelectActivity;
-
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
 import org.opencv.android.CameraBridgeViewBase;
 import org.opencv.android.OpenCVLoader;
 import org.opencv.core.CvType;
@@ -42,6 +34,13 @@ import org.opencv.core.Scalar;
 import org.opencv.core.Size;
 import org.opencv.imgproc.Imgproc;
 
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+import epson.print.R;
+import epson.print.imgsel.CameraCopyImageSelectActivity;
+
 /* renamed from: com.epson.cameracopy.ui.CameraPreviewFragment */
 public class CameraPreviewFragment extends Fragment implements CameraBridgeViewBase.CvCameraViewListener2, OpenCvCameraView.AutoFocusCallBack {
     private static final Scalar COLOR_BLACK = new Scalar(0.0d, 0.0d, 0.0d, 255.0d);

app/src/main/java/com/epson/cameracopy/ui/CameraPreviewOptionActivity.java

@@ -3,7 +3,6 @@ package com.epson.cameracopy.ui;
 import android.content.Intent;
 import android.graphics.Point;
 import android.os.Bundle;
-
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -17,10 +16,10 @@ import android.widget.TextView;
 
 import com.epson.cameracopy.device.CameraPreviewControl;
 
-import epson.print.ActivityIACommon;
-
 import java.io.File;
 
+import epson.print.ActivityIACommon;
+
 /* renamed from: com.epson.cameracopy.ui.CameraPreviewOptionActivity */
 public class CameraPreviewOptionActivity extends ActivityIACommon implements PictureResolutionDialogFragment.OnItemSelectedListener {
     private static final int CODE_DIRECTORY_SELECT = 1;

app/src/main/java/com/epson/cameracopy/ui/CameraPrintProgress.java

@@ -22,8 +22,9 @@ import com.epson.iprint.prtlogger.Analytics;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 import com.epson.mobilephone.common.wifidirect.NfcTagUtils;
 
-import epson.common.Utils;
+import java.util.ArrayList;
 
+import epson.common.Utils;
 import epson.print.CommonDefine;
 import epson.print.MyPrinter;
 import epson.print.Util.EPLog;
@@ -33,8 +34,6 @@ import epson.print.service.IEpsonService;
 import epson.print.service.IEpsonServiceCallback;
 import epson.print.widgets.CustomTitleAlertDialogBuilder;
 
-import java.util.ArrayList;
-
 /* renamed from: com.epson.cameracopy.ui.CameraPrintProgress */
 public class CameraPrintProgress extends Activity implements CommonDefine {
     private static final int DIALOG_CONFIRM = 1;

app/src/main/java/com/epson/cameracopy/ui/CameraPrintSettingActivity.java

@@ -26,11 +26,13 @@ import com.epson.mobilephone.common.escpr.EscprError;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 
+import java.io.File;
+import java.util.ArrayList;
+
 import epson.common.Constants;
 import epson.common.ExternalFileUtils;
 import epson.common.Utils;
 import epson.print.ActivityIACommon;
-
 import epson.print.EPPrinterManager;
 import epson.print.MyPrinter;
 import epson.print.R;
@@ -47,9 +49,6 @@ import epson.print.service.IEpsonServiceCallback;
 import epson.print.widgets.CustomTitleAlertDialogBuilder;
 import epson.print.widgets.LongTapRepeatAdapter;
 
-import java.io.File;
-import java.util.ArrayList;
-
 /* renamed from: com.epson.cameracopy.ui.CameraPrintSettingActivity */
 public class CameraPrintSettingActivity extends ActivityIACommon implements View.OnClickListener {
     private static final String EXTRA_PRINTER = "myprinter";

app/src/main/java/com/epson/cameracopy/ui/CropImageActivity.java

@@ -3,8 +3,6 @@ package com.epson.cameracopy.ui;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
-
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -16,17 +14,13 @@ import android.graphics.Point;
 import android.graphics.PointF;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Debug;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.provider.MediaStore;
-
-
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
@@ -48,6 +42,15 @@ import com.epson.cameracopy.device.CameraPreviewControl;
 import com.epson.cameracopy.printlayout.DocumentSizeInfo;
 import com.epson.cameracopy.printlayout.RegistedDocumentSizeList;
 
+import org.opencv.core.Size;
+
+import java.io.File;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.List;
+import java.util.Locale;
+
 import epson.colorcorrection.ImageCollect;
 import epson.common.DialogProgress;
 import epson.common.DialogProgressViewModel;
@@ -55,19 +58,9 @@ import epson.common.ExternalFileUtils;
 import epson.common.Info_paper;
 import epson.print.ActivityIACommon;
 import epson.print.ActivityRequestPermissions;
-
 import epson.print.CommonDefine;
 import epson.print.R;
 
-import java.io.File;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Deque;
-import java.util.List;
-import java.util.Locale;
-
-import org.opencv.core.Size;
-
 /* renamed from: com.epson.cameracopy.ui.CropImageActivity */
 public class CropImageActivity extends ActivityIACommon implements View.OnClickListener, SeekBar.OnSeekBarChangeListener, View.OnTouchListener, GestureDetector.OnDoubleTapListener {
     private static final int ACTIVITY_MODE_COLOR_ADJUSTMENT = 2;

app/src/main/java/com/epson/cameracopy/ui/DocumentSizeEditActivity.java

@@ -15,12 +15,11 @@ import android.widget.TextView;
 import com.epson.cameracopy.printlayout.DocumentSizeInfo;
 import com.epson.cameracopy.printlayout.RegistedDocumentSizeList;
 
-import epson.print.ActivityIACommon;
+import java.math.BigDecimal;
 
+import epson.print.ActivityIACommon;
 import epson.print.widgets.LongTapRepeatAdapter;
 
-import java.math.BigDecimal;
-
 /* renamed from: com.epson.cameracopy.ui.DocumentSizeEditActivity */
 public class DocumentSizeEditActivity extends ActivityIACommon implements View.OnClickListener, RadioGroup.OnCheckedChangeListener {
     private final double RATIO_INCHTOMM = 25.4d;

app/src/main/java/com/epson/cameracopy/ui/DocumentSizeSettingActivity.java

@@ -5,7 +5,6 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -18,10 +17,10 @@ import android.widget.TextView;
 import com.epson.cameracopy.printlayout.DocumentSizeInfo;
 import com.epson.cameracopy.printlayout.RegistedDocumentSizeList;
 
-import epson.print.ActivityIACommon;
-
 import java.util.Locale;
 
+import epson.print.ActivityIACommon;
+
 /* renamed from: com.epson.cameracopy.ui.DocumentSizeSettingActivity */
 public class DocumentSizeSettingActivity extends ActivityIACommon implements View.OnClickListener {
     private int ID_DIALOG_DELETE = 1;

app/src/main/java/com/epson/cameracopy/ui/FolderSelectActivity.java

@@ -16,13 +16,13 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import epson.print.ActivityIACommon;
-import epson.print.ActivityRequestPermissions;
-
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 
+import epson.print.ActivityIACommon;
+import epson.print.ActivityRequestPermissions;
+
 /* renamed from: com.epson.cameracopy.ui.FolderSelectActivity */
 public class FolderSelectActivity extends ActivityIACommon implements View.OnClickListener {
     private static final int MSG_UPDATE_LIST_VIEW = 901;

app/src/main/java/com/epson/cameracopy/ui/ImageCollectView.java

@@ -15,12 +15,10 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Region;
 import android.graphics.drawable.BitmapDrawable;
-import android.os.Debug;
 import android.os.Handler;
 import android.os.Message;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;

app/src/main/java/com/epson/cameracopy/ui/ImageFolderFile.java

@@ -2,16 +2,15 @@ package com.epson.cameracopy.ui;
 
 import android.content.Context;
 
-
 import com.epson.cameracopy.alt.FileUtils;
 
-import epson.common.ImageUtil;
-import epson.print.IprintApplication;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 
+import epson.common.ImageUtil;
+import epson.print.IprintApplication;
+
 /* renamed from: com.epson.cameracopy.ui.ImageFolderFile */
 class ImageFolderFile implements ImagePreviewFile, Serializable {
     private static final long serialVersionUID = 1;

app/src/main/java/com/epson/cameracopy/ui/ImageFolderFileViewModel.java

@@ -1,7 +1,6 @@
 package com.epson.cameracopy.ui;
 
 import android.app.Application;
-import android.arch.lifecycle.AndroidViewModel;
 import android.arch.lifecycle.LiveData;
 import android.os.AsyncTask;
 

app/src/main/java/com/epson/cameracopy/ui/ImagePreviewActivity.java

@@ -3,8 +3,6 @@ package com.epson.cameracopy.ui;
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.Dialog;
-
-
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -12,10 +10,6 @@ import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.media.ExifInterface;
 import android.os.Bundle;
-
-
-
-
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -29,13 +23,7 @@ import com.epson.cameracopy.device.CameraFile;
 import com.epson.cameracopy.device.CameraPreviewControl;
 import com.epson.mobilephone.common.wifidirect.NfcTagUtils;
 
-import epson.common.ImageUtil;
-import epson.common.ScalableImageView;
-import epson.print.ActivityIACommon;
-import epson.print.ActivityRequestPermissions;
-
-import epson.print.IprintApplication;
-import epson.print.Util.CommonMessage;
+import org.opencv.videoio.Videoio;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,7 +31,12 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 
-import org.opencv.videoio.Videoio;
+import epson.common.ImageUtil;
+import epson.common.ScalableImageView;
+import epson.print.ActivityIACommon;
+import epson.print.ActivityRequestPermissions;
+import epson.print.IprintApplication;
+import epson.print.Util.CommonMessage;
 
 /* renamed from: com.epson.cameracopy.ui.ImagePreviewActivity */
 public class ImagePreviewActivity extends ActivityIACommon {

app/src/main/java/com/epson/cameracopy/ui/PictureResolutionDialogFragment.java

@@ -4,7 +4,6 @@ import android.app.Service;
 import android.content.Context;
 import android.graphics.Point;
 import android.os.Bundle;
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/epson/cameracopy/ui/PrintPreviewActivity.java

@@ -1,8 +1,6 @@
 package com.epson.cameracopy.ui;
 
 import android.app.AlertDialog;
-
-
 import android.content.ComponentName;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -17,9 +15,6 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteException;
-
-
-
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -38,13 +33,16 @@ import com.epson.cameracopy.printlayout.PreviewView;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 import com.epson.mobilephone.common.wifidirect.NfcTagUtils;
 
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.Locale;
+
 import epson.common.Constants;
 import epson.common.DialogProgress;
 import epson.common.DialogProgressViewModel;
 import epson.common.ExternalFileUtils;
 import epson.print.ActivityIACommon;
 import epson.print.ActivityNfcPrinter;
-
 import epson.print.CommonDefine;
 import epson.print.EPImage;
 import epson.print.EPImageList;
@@ -60,10 +58,6 @@ import epson.print.service.EpsonService;
 import epson.print.service.IEpsonService;
 import epson.print.service.IEpsonServiceCallback;
 
-import java.util.ArrayList;
-import java.util.Deque;
-import java.util.Locale;
-
 /* renamed from: com.epson.cameracopy.ui.PrintPreviewActivity */
 public class PrintPreviewActivity extends ActivityIACommon implements CommonDefine, View.OnClickListener, PreviewView.PrttargetScaleChangeListener, ReviewInvitationDialog.OnClickListener {
     static final /* synthetic */ boolean $assertionsDisabled = false;

app/src/main/java/com/epson/cameracopy/ui/SimpleMessageDialogFragment.java

@@ -6,7 +6,6 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 
 
-
 /* renamed from: com.epson.cameracopy.ui.SimpleMessageDialogFragment */
 public class SimpleMessageDialogFragment extends DialogFragment {
     private static final String PARAM_MESSAGE_RESOURCE_ID = "resource-id";

app/src/main/java/com/epson/iprint/apf/ApfAdapter.java

@@ -5,18 +5,21 @@ import android.graphics.BitmapFactory;
 import android.media.ExifInterface;
 import android.os.Environment;
 import android.util.Log;
+
 import com.epson.p007sd.common.apf.apflib;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Locale;
+import java.util.UUID;
+import java.util.concurrent.locks.ReentrantLock;
+
 import epson.common.ExternalFileUtils;
 import epson.common.ImageUtil;
 import epson.print.CommonDefine;
 import epson.print.EPImageUtil;
 import epson.print.MyPrinter;
 import epson.print.Util.BmpFileSize;
-import java.io.File;
-import java.io.IOException;
-import java.util.Locale;
-import java.util.UUID;
-import java.util.concurrent.locks.ReentrantLock;
 
 public class ApfAdapter {
     protected static final String APF_IMAGE_DIR = "apf_image";

app/src/main/java/com/epson/iprint/apf/ApfEpImageAdapter.java

@@ -1,11 +1,13 @@
 package com.epson.iprint.apf;
 
 import android.content.Context;
+
+import java.io.File;
+import java.util.Iterator;
+
 import epson.print.EPImage;
 import epson.print.EPImageList;
 import epson.print.service.PrintService;
-import java.io.File;
-import java.util.Iterator;
 
 public class ApfEpImageAdapter {
 

app/src/main/java/com/epson/iprint/apf/ApfPreviewView.java

@@ -6,14 +6,14 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Handler;
 
-import com.epson.iprint.apf.ImageSizeConversionCache;
+import java.io.File;
+
 import epson.print.EPImage;
 import epson.print.EPImageCreator;
 import epson.print.EPImageList;
 import epson.print.IprintApplication;
 import epson.print.phlayout.PhotoPreview;
 import epson.print.phlayout.PhotoPreviewImageList;
-import java.io.File;
 
 public class ApfPreviewView implements PhotoPreview.PreviewBitmapMaker {
     public static final String APF_RESIZE_FILE_PREFIX = "rsapf_";

app/src/main/java/com/epson/iprint/prtlogger/Analytics.java

@@ -4,7 +4,9 @@ import android.content.Context;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
+
 import epson.print.IprintApplication;
 import epson.print.MyPrinter;
 import epson.print.Util.EPLog;

app/src/main/java/com/epson/iprint/prtlogger/AnalyticsPreferences.java

@@ -2,7 +2,6 @@ package com.epson.iprint.prtlogger;
 
 import android.content.Context;
 
-
 import epson.provider.SharedPreferencesProvider;
 
 public class AnalyticsPreferences {

app/src/main/java/com/epson/iprint/prtlogger/CommonLog.java

@@ -2,7 +2,6 @@ package com.epson.iprint.prtlogger;
 
 import android.content.Context;
 
-
 import java.io.Serializable;
 
 import epson.print.MyPrinter;

app/src/main/java/com/epson/iprint/prtlogger/LoggerRecord.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 
 
-
 public class LoggerRecord {
     private static final String ANALYTICS_PREFS_NAME = "logger6_3";
     private static final String PREFS_KEY_LOGGER_ANSWER = "answer";

app/src/main/java/com/epson/iprint/shared/EpsoniPrintSharedActivity.java

@@ -1,13 +1,12 @@
 package com.epson.iprint.shared;
 
 import android.app.Activity;
-
-
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentActivity;
 
@@ -15,6 +14,12 @@ import com.epson.iprint.prtlogger.CommonLog;
 import com.epson.iprint.prtlogger.NewLoggerController;
 import com.epson.iprint.prtlogger.PrintLog;
 import com.epson.mobilephone.common.license.LicenseTopActivity;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Deque;
+
 import epson.common.Constants;
 import epson.common.DialogProgress;
 import epson.common.DialogProgressViewModel;
@@ -24,16 +29,12 @@ import epson.common.IprintUserSurveyInfo;
 import epson.common.Utils;
 import epson.print.ActivityRequestPermissions;
 import epson.print.ActivityViewImageSelect;
-import epson.print.R;
 import epson.print.EPImageUtil;
 import epson.print.MyPrinter;
+import epson.print.R;
 import epson.print.Util.EPLog;
 import epson.print.WebviewActivity;
 import epson.scan.activity.ScanActivity;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Deque;
 
 public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runnable {
     public static final String ACTION_CONFIRM_PRINTER_SCANNER_SELECTION = "com.epson.iprint.isSetDevice";

app/src/main/java/com/epson/iprint/shared/ManagePreferences.java

@@ -4,9 +4,11 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
+
+import java.util.Map;
+
 import epson.common.Constants;
 import epson.print.screen.PrintSetting;
-import java.util.Map;
 
 public class ManagePreferences {
     public static final String PREFS_INFO_PRINT_CLONE = "PrintSettingClone";

app/src/main/java/com/epson/iprint/shared/SharedParam.java

@@ -1,6 +1,7 @@
 package com.epson.iprint.shared;
 
 import android.os.Bundle;
+
 import java.io.Serializable;
 
 abstract class SharedParam implements Serializable {

app/src/main/java/com/epson/iprint/shared/SharedParamPhoto.java

@@ -1,11 +1,14 @@
 package com.epson.iprint.shared;
 
 import android.os.Bundle;
+
 import com.epson.mobilephone.common.PrintingLib.define.Constants;
-import epson.print.CommonDefine;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 
+import epson.print.CommonDefine;
+
 public class SharedParamPhoto extends SharedParam implements Serializable {
     private static final long serialVersionUID = 1;
     private ArrayList<String> arrayFileFullPath = null;

app/src/main/java/com/epson/iprint/shared/SharedParamScan.java

@@ -1,6 +1,7 @@
 package com.epson.iprint.shared;
 
 import android.os.Bundle;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 

app/src/main/java/com/epson/iprint/shared/SharedParamStatus.java

@@ -1,6 +1,7 @@
 package com.epson.iprint.shared;
 
 import android.os.Bundle;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 

app/src/main/java/com/epson/iprint/storage/ConfirmCancelDialog.java

@@ -3,10 +3,8 @@ package com.epson.iprint.storage;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-
-
-
 import android.support.p003v7.app.AlertDialog;
+
 import epson.print.R;
 
 public class ConfirmCancelDialog extends DialogFragment {

app/src/main/java/com/epson/iprint/storage/LocalProgressDialog.java

@@ -2,9 +2,6 @@ package com.epson.iprint.storage;
 
 import android.app.Dialog;
 import android.os.Bundle;
-
-
-
 import android.support.p000v4.app.FragmentManager;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -13,6 +10,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
 import epson.print.R;
 
 public class LocalProgressDialog extends DialogFragment {

app/src/main/java/com/epson/iprint/storage/Network.java

@@ -3,6 +3,7 @@ package com.epson.iprint.storage;
 
 import com.epson.iprint.storage.gdrivev3.ActivityWrapper;
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
+
 import epson.common.Utils;
 
 public class Network {

app/src/main/java/com/epson/iprint/storage/OneButtonDialogFragment.java

@@ -5,9 +5,6 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
-
-
-
 import epson.print.R;
 
 public class OneButtonDialogFragment extends DialogFragment {

app/src/main/java/com/epson/iprint/storage/SecureKeyStore.java

@@ -1,6 +1,7 @@
 package com.epson.iprint.storage;
 
 import android.content.Context;
+
 import com.epson.mobilephone.common.keyenc.SecureKeyFactory;
 
 public class SecureKeyStore implements ISecureKeyStore {

app/src/main/java/com/epson/iprint/storage/StorageActivity.java

@@ -15,9 +15,11 @@ import android.text.TextWatcher;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+
+import java.util.Random;
+
 import epson.print.ActivityIACommon;
 import epson.print.R;
-import java.util.Random;
 
 class StorageActivity extends ActivityIACommon {
 

app/src/main/java/com/epson/iprint/storage/StorageItem.java

@@ -1,10 +1,12 @@
 package com.epson.iprint.storage;
 
 import android.content.Context;
-import epson.common.ExternalFileUtils;
+
 import java.io.File;
 import java.util.Comparator;
 
+import epson.common.ExternalFileUtils;
+
 public class StorageItem {
     static final int LOGGERINFO_MYPOCKET_FILE = 2;
     static final int LOGGERINFO_MYPOCKET_PHOTO = 1;

app/src/main/java/com/epson/iprint/storage/StorageProcessActivity.java

@@ -7,7 +7,9 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.TextView;
+
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
+
 import epson.print.R;
 
 public abstract class StorageProcessActivity extends StorageActivity {

app/src/main/java/com/epson/iprint/storage/StorageProcessDownloadActivity.java

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,24 +14,24 @@ import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
+
 import com.epson.iprint.prtlogger.PrintLog;
-import com.epson.iprint.storage.StorageActivity;
-import com.epson.iprint.storage.StorageItem;
-import com.epson.iprint.storage.StorageProcessActivity;
-import com.epson.iprint.storage.StorageServiceClient;
+
+import org.opencv.videoio.Videoio;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Stack;
+
 import epson.common.Utils;
 import epson.print.ActivityDocsPrintPreview;
 import epson.print.ActivityPrintWeb;
 import epson.print.ActivityViewImageSelect;
-import epson.print.R;
 import epson.print.CommonDefine;
+import epson.print.R;
 import epson.print.Util.AsyncTaskExecutor;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Stack;
-import org.opencv.videoio.Videoio;
 
 public class StorageProcessDownloadActivity extends StorageProcessActivity {
     public static final String PARAM_KEY_ONLINE_STORAGE_PRINT_LOG = "print_log";

app/src/main/java/com/epson/iprint/storage/StorageProcessUploadActivity.java

@@ -10,23 +10,23 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.RadioGroup;
 import android.widget.TextView;
-import com.epson.iprint.storage.StorageActivity;
-import com.epson.iprint.storage.StorageProcessActivity;
-import com.epson.iprint.storage.StorageServiceClient;
+
 import com.epson.iprint.storage.gdrivev3.GoogleV3UploadClient;
 import com.epson.iprint.storage.gdrivev3.GoogleV3UploadSignInActivity;
-import epson.print.R;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
 import epson.print.CommonDefine;
+import epson.print.R;
 import epson.print.ScanFileNumber;
 import epson.print.Util.EPLog;
 import epson.print.Util.Utils;
 import epson.scan.lib.libHaru;
 import epson.server.utils.MyUtility;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
 
 public class StorageProcessUploadActivity extends StorageProcessActivity {
     final String UPLOAD_EDITING_FILENAME = "Upload.Editing.Filename";

app/src/main/java/com/epson/iprint/storage/StorageSecureStore.java

@@ -4,9 +4,12 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+
 import com.box.androidsdk.content.requests.BoxRequestsMetadata;
+
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
 

app/src/main/java/com/epson/iprint/storage/StorageServiceClient.java

@@ -2,18 +2,21 @@ package com.epson.iprint.storage;
 
 import android.app.Activity;
 import android.content.Context;
-
 import android.widget.ImageView;
+
 import com.epson.iprint.storage.box.BoxNetClient;
 import com.epson.iprint.storage.dropbox.DropboxV2Client;
 import com.epson.iprint.storage.evernote.EvernoteClient;
 import com.epson.iprint.storage.gdrivev3.GoogleV3UploadClient;
 import com.epson.iprint.storage.onedrive.OneDriveClient;
+
+import org.apache.commons.lang.CharEncoding;
+
+import java.util.List;
+
 import epson.common.Utils;
 import epson.print.CommonDefine;
 import epson.print.fileBrower;
-import java.util.List;
-import org.apache.commons.lang.CharEncoding;
 
 public abstract class StorageServiceClient {
     public static final String EPSON_IPRINT_FOLDER = "Epson iPrint";

app/src/main/java/com/epson/iprint/storage/StorageSignInActivity.java

@@ -7,12 +7,13 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.EditText;
-import com.epson.iprint.storage.StorageActivity;
+
 import com.epson.iprint.storage.box.BoxNetSignInActivity;
 import com.epson.iprint.storage.dropbox.DropboxV2SignInActivity;
 import com.epson.iprint.storage.evernote.EvernoteSignInActivity;
 import com.epson.iprint.storage.gdrivev3.GoogleV3UploadSignInActivity;
 import com.epson.iprint.storage.onedrive.OneDriveSignInActivity;
+
 import epson.print.R;
 
 public abstract class StorageSignInActivity extends StorageActivity {

app/src/main/java/com/epson/iprint/storage/StorageWaitingActivity.java

@@ -12,6 +12,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
+
 import epson.print.R;
 
 public class StorageWaitingActivity extends Activity {

app/src/main/java/com/epson/iprint/storage/box/BoxAuthStorage.java

@@ -1,15 +1,18 @@
 package com.epson.iprint.storage.box;
 
 import android.content.Context;
+
 import com.box.androidsdk.content.auth.BoxAuthentication;
 import com.box.androidsdk.content.models.BoxEntity;
 import com.eclipsesource.json.JsonObject;
 import com.eclipsesource.json.JsonValue;
 import com.epson.iprint.storage.StorageSecureStore;
-import epson.server.utils.Define;
+
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import epson.server.utils.Define;
+
 public class BoxAuthStorage extends BoxAuthentication.AuthStorage {
     private static final String SECURE_STORE_KEY = "FolderViewer.BOXNET_AUTO_INFO_V4";
 

app/src/main/java/com/epson/iprint/storage/box/BoxNetClient.java

@@ -3,7 +3,6 @@ package com.epson.iprint.storage.box;
 import android.app.Activity;
 import android.content.Context;
 
-
 import com.box.androidsdk.content.BoxApiFile;
 import com.box.androidsdk.content.BoxApiFolder;
 import com.box.androidsdk.content.BoxApiSearch;
@@ -21,8 +20,7 @@ import com.box.androidsdk.content.models.BoxSession;
 import com.epson.iprint.storage.SecureKeyStore;
 import com.epson.iprint.storage.StorageItem;
 import com.epson.iprint.storage.StorageServiceClient;
-import epson.print.R;
-import epson.print.IprintApplication;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,6 +28,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
+import epson.print.IprintApplication;
+import epson.print.R;
+
 public class BoxNetClient extends StorageServiceClient {
     private static BoxNetClient sBoxClient;
     private BoxApiFile mBoxApiFile;

app/src/main/java/com/epson/iprint/storage/box/BoxNetSignInActivity.java

@@ -6,12 +6,13 @@ import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 
-
 import com.box.androidsdk.content.auth.BoxAuthentication;
 import com.epson.iprint.storage.StorageSignInActivity;
-import epson.print.R;
+
 import java.lang.ref.WeakReference;
 
+import epson.print.R;
+
 public class BoxNetSignInActivity extends StorageSignInActivity implements BoxAuthentication.AuthListener {
     private static final String PARAM_KEY_LOGOUT = "logout";
     private BoxNetClient mBoxClient;

app/src/main/java/com/epson/iprint/storage/dropbox/DropboxV2Adapter.java

@@ -2,11 +2,11 @@ package com.epson.iprint.storage.dropbox;
 
 import android.content.Context;
 
-
 import com.dropbox.core.android.Auth;
 import com.dropbox.core.p005v2.DbxClientV2;
 import com.epson.iprint.storage.SecureKeyStore;
 import com.epson.iprint.storage.StorageSecureStore;
+
 import epson.server.utils.Define;
 
 public class DropboxV2Adapter {

app/src/main/java/com/epson/iprint/storage/dropbox/DropboxV2Client.java

@@ -3,9 +3,8 @@ package com.epson.iprint.storage.dropbox;
 import android.app.Activity;
 import android.content.Context;
 import android.os.AsyncTask;
-
-
 import android.widget.ImageView;
+
 import com.dropbox.core.DbxException;
 import com.dropbox.core.p005v2.DbxClientV2;
 import com.dropbox.core.p005v2.files.FileMetadata;
@@ -14,15 +13,18 @@ import com.dropbox.core.p005v2.files.ListFolderResult;
 import com.dropbox.core.p005v2.files.Metadata;
 import com.epson.iprint.storage.StorageItem;
 import com.epson.iprint.storage.StorageServiceClient;
-import epson.print.R;
-import epson.print.CommonDefine;
+
+import org.apache.commons.lang.CharEncoding;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.apache.commons.lang.CharEncoding;
+
+import epson.print.CommonDefine;
+import epson.print.R;
 
 public class DropboxV2Client extends StorageServiceClient {
     public boolean isSupportedUploadType(StorageServiceClient.UploadFileType uploadFileType) {

app/src/main/java/com/epson/iprint/storage/dropbox/DropboxV2SignInActivity.java

@@ -2,6 +2,7 @@ package com.epson.iprint.storage.dropbox;
 
 import android.os.AsyncTask;
 import android.os.Bundle;
+
 import com.dropbox.core.DbxException;
 import com.dropbox.core.p005v2.DbxClientV2;
 import com.epson.iprint.storage.StorageSignInActivity;

app/src/main/java/com/epson/iprint/storage/evernote/EvernoteClient.java

@@ -3,14 +3,17 @@ package com.epson.iprint.storage.evernote;
 import android.app.Activity;
 import android.content.Context;
 import android.os.AsyncTask;
+
 import com.epson.iprint.storage.StorageItem;
 import com.epson.iprint.storage.StorageServiceClient;
-import com.epson.iprint.storage.evernote.EvernoteRequest;
-import epson.print.CommonDefine;
-import epson.print.Util.AsyncTaskExecutor;
+
+import org.apache.commons.lang.CharEncoding;
+
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.lang.CharEncoding;
+
+import epson.print.CommonDefine;
+import epson.print.Util.AsyncTaskExecutor;
 
 public class EvernoteClient extends StorageServiceClient {
     public String getStorageServiceName(Context context) {

app/src/main/java/com/epson/iprint/storage/evernote/EvernoteRequest.java

@@ -1,6 +1,7 @@
 package com.epson.iprint.storage.evernote;
 
 import android.content.Context;
+
 import com.epson.iprint.storage.StorageItem;
 import com.epson.iprint.storage.StorageServiceClient;
 import com.evernote.client.android.EvernoteSession;
@@ -17,9 +18,7 @@ import com.evernote.edam.type.Resource;
 import com.evernote.edam.type.ResourceAttributes;
 import com.evernote.thrift.TException;
 import com.google.common.primitives.UnsignedBytes;
-import epson.common.Utils;
-import epson.print.Util.EPLog;
-import epson.server.service.EvernoteClient;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,6 +32,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
+import epson.common.Utils;
+import epson.print.Util.EPLog;
+
 public class EvernoteRequest {
     private static final String NOTE_PREFIX = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE en-note SYSTEM \"http://xml.evernote.com/pub/enml2.dtd\"><en-note>";
     private static final String NOTE_SUFFIX = "</en-note>";

app/src/main/java/com/epson/iprint/storage/evernote/EvernoteSignInActivity.java

@@ -3,9 +3,10 @@ package com.epson.iprint.storage.evernote;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+
 import com.epson.iprint.storage.StorageSignInActivity;
+
 import epson.print.Util.EPLog;
-import epson.server.service.EvernoteClient;
 
 public class EvernoteSignInActivity extends StorageSignInActivity {
     private static final String TAG = "EvernoteSignInActivity";

app/src/main/java/com/epson/iprint/storage/gdrivev3/ActivityWrapper.java

@@ -3,8 +3,6 @@ package com.epson.iprint.storage.gdrivev3;
 import android.app.Activity;
 import android.content.Intent;
 
-import com.epson.iprint.storage.gdrivev3.IprintGoogleSignIn;
-
 public interface ActivityWrapper {
     @NonNull
     Activity getActivity();

app/src/main/java/com/epson/iprint/storage/gdrivev3/DownloadFile.java

@@ -1,7 +1,6 @@
 package com.epson.iprint.storage.gdrivev3;
 
 
-
 public class DownloadFile implements OnlineFile {
     private final String mMimeType;
     private final String mName;

app/src/main/java/com/epson/iprint/storage/gdrivev3/DownloadTask.java

@@ -4,13 +4,12 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.AsyncTask;
 
-
+import java.io.File;
+import java.io.IOException;
 
 import epson.common.ExternalFileUtils;
 import epson.common.Utils;
 import epson.print.CommonDefine;
-import java.io.File;
-import java.io.IOException;
 
 public class DownloadTask extends AsyncTask<OnlineFile, Void, OnlineFile> implements Canceller {
     private static final String DOWNLOAD_TMP_FILE_NAME_BODY = "google_v3";

app/src/main/java/com/epson/iprint/storage/gdrivev3/DownloaderWrapper.java

@@ -1,9 +1,6 @@
 package com.epson.iprint.storage.gdrivev3;
 
 
-
-import com.epson.iprint.storage.gdrivev3.DownloadTask;
-import com.epson.iprint.storage.gdrivev3.DriveListTask;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 
 public class DownloaderWrapper {

app/src/main/java/com/epson/iprint/storage/gdrivev3/DriveListTask.java

@@ -2,7 +2,6 @@ package com.epson.iprint.storage.gdrivev3;
 
 import android.os.AsyncTask;
 
-
 import java.util.ArrayList;
 import java.util.Iterator;
 

app/src/main/java/com/epson/iprint/storage/gdrivev3/DriveWriter.java

@@ -2,7 +2,6 @@ package com.epson.iprint.storage.gdrivev3;
 
 import android.content.Context;
 
-
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.api.client.extensions.android.http.AndroidHttp;
 import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential;
@@ -11,7 +10,7 @@ import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.drive.Drive;
 import com.google.api.services.drive.model.File;
 import com.google.api.services.drive.model.FileList;
-import epson.print.gdconv.ConvertStatus;
+
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -20,6 +19,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
+import epson.print.gdconv.ConvertStatus;
+
 public class DriveWriter {
     private static final String ROOT_ID = "root";
     private static final String TAG = "DriveConverter ";

app/src/main/java/com/epson/iprint/storage/gdrivev3/FileListAdapter.java

@@ -1,17 +1,17 @@
 package com.epson.iprint.storage.gdrivev3;
 
 import android.content.Context;
-
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import epson.print.R;
+
 import java.util.ArrayList;
 
+import epson.print.R;
+
 public class FileListAdapter extends BaseAdapter {
     private ArrayList<OnlineFile> mDriveFiles;
     private final LayoutInflater mLayoutInflater;

app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleDownloadContract.java

@@ -1,7 +1,6 @@
 package com.epson.iprint.storage.gdrivev3;
 
 
-
 import java.util.ArrayList;
 
 public interface GoogleDownloadContract {

app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleDownloadPresenter.java

@@ -1,14 +1,9 @@
 package com.epson.iprint.storage.gdrivev3;
 
 
-
 import com.epson.iprint.storage.Network;
-import com.epson.iprint.storage.gdrivev3.DownloadTask;
-import com.epson.iprint.storage.gdrivev3.DriveListTask;
-import com.epson.iprint.storage.gdrivev3.GoogleDownloadContract;
-import com.epson.iprint.storage.gdrivev3.IprintGoogleSignIn;
-import com.epson.iprint.storage.gdrivev3.PlayServiceDialogManager;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
+
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 

app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleDownloader.java

@@ -4,16 +4,13 @@ import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 
-
-import com.epson.iprint.storage.gdrivev3.DownloadTask;
-import com.epson.iprint.storage.gdrivev3.DriveListTask;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.api.client.extensions.android.http.AndroidHttp;
 import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential;
 import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.drive.Drive;
 import com.google.api.services.drive.model.FileList;
-import epson.print.CommonDefine;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -22,6 +19,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
 
+import epson.print.CommonDefine;
+
 public class GoogleDownloader {
     private static final String ROOT_ID = "root";
     private static final String TARGET_SCOPE = "https://www.googleapis.com/auth/drive";

app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleDriveFile.java

@@ -1,9 +1,9 @@
 package com.epson.iprint.storage.gdrivev3;
 
 
-
 import com.epson.iprint.storage.StorageServiceClient;
 import com.google.api.services.drive.model.File;
+
 import java.util.HashSet;
 
 public class GoogleDriveFile implements OnlineFile {

app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleV3UploadClient.java

@@ -6,7 +6,7 @@ import android.os.AsyncTask;
 
 import com.epson.iprint.storage.StorageItem;
 import com.epson.iprint.storage.StorageServiceClient;
-import com.epson.iprint.storage.gdrivev3.IprintGoogleSignIn;
+
 import epson.print.R;
 
 public class GoogleV3UploadClient extends StorageServiceClient {

app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleV3UploadSignInActivity.java

@@ -5,20 +5,17 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
-
-
-
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.epson.iprint.storage.Network;
 import com.epson.iprint.storage.OneButtonDialogFragment;
-import com.epson.iprint.storage.gdrivev3.IprintGoogleSignIn;
-import com.epson.iprint.storage.gdrivev3.PlayServiceDialogManager;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
-import epson.print.R;
+
 import java.util.Iterator;
 import java.util.LinkedList;
 
+import epson.print.R;
+
 public class GoogleV3UploadSignInActivity extends AppCompatActivity implements ActivityWrapper, PlayServiceDialogManager.SingInCancelNotifier, OneButtonDialogFragment.DialogCallback, IprintGoogleSignIn.SignInListener {
     private static final String DIALOG_TAG_OFFLINE_ERROR = "offline_error";
     private static final String DIALOG_TAG_SIGN_IN_FAILED = "sign-in_failed";

app/src/main/java/com/epson/iprint/storage/gdrivev3/Injection.java

@@ -1,9 +1,7 @@
 package com.epson.iprint.storage.gdrivev3;
 
 
-
 import com.epson.iprint.storage.Network;
-import com.epson.iprint.storage.gdrivev3.GoogleDownloadContract;
 
 class Injection {
     private static volatile DownloadPresenterFactory sDownloadPresenterFactory;

app/src/main/java/com/epson/iprint/storage/gdrivev3/IprintGoogleSignIn.java

@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 
-
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInClient;

app/src/main/java/com/epson/iprint/storage/gdrivev3/ListAndDownloadActivity.java

@@ -5,10 +5,6 @@ import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
-
-
-
-
 import android.support.p000v4.app.FragmentManager;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -16,19 +12,20 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
+
 import com.epson.iprint.prtlogger.PrintLog;
 import com.epson.iprint.storage.ConfirmCancelDialog;
 import com.epson.iprint.storage.LocalProgressDialog;
 import com.epson.iprint.storage.OneButtonDialogFragment;
 import com.epson.iprint.storage.StorageProcessDownloadActivity;
-import com.epson.iprint.storage.gdrivev3.GoogleDownloadContract;
-import com.epson.iprint.storage.gdrivev3.IprintGoogleSignIn;
-import epson.print.ActivityIACommon;
-import epson.print.R;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 
+import epson.print.ActivityIACommon;
+import epson.print.R;
+
 public class ListAndDownloadActivity extends ActivityIACommon implements ActivityWrapper, GoogleDownloadContract.View, OneButtonDialogFragment.DialogCallback, ConfirmCancelDialog.DialogCancelListener {
     private static final String DIALOG_TAG_CONFIRM_CANCEL = "confirm-cancel";
     private static final String DIALOG_TAG_DOWNLOAD_FAILED = "download_failed";

app/src/main/java/com/epson/iprint/storage/gdrivev3/OnlineFile.java

@@ -1,7 +1,6 @@
 package com.epson.iprint.storage.gdrivev3;
 
 
-
 public interface OnlineFile {
     @Nullable
     String getId();

app/src/main/java/com/epson/iprint/storage/gdrivev3/ParentFolder.java

@@ -1,7 +1,6 @@
 package com.epson.iprint.storage.gdrivev3;
 
 
-
 public class ParentFolder implements OnlineFile {
     @Nullable
     public String getId() {

app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveAuthenticator.java

@@ -2,6 +2,7 @@ package com.epson.iprint.storage.onedrive;
 
 import android.app.Activity;
 import android.content.Context;
+
 import com.epson.iprint.storage.SecureKeyStore;
 import com.onedrive.sdk.authentication.IAuthenticator;
 import com.onedrive.sdk.authentication.MSAAuthenticator;
@@ -9,7 +10,6 @@ import com.onedrive.sdk.concurrency.ICallback;
 import com.onedrive.sdk.core.ClientException;
 import com.onedrive.sdk.core.DefaultClientConfig;
 import com.onedrive.sdk.extensions.IOneDriveClient;
-import com.onedrive.sdk.extensions.OneDriveClient;
 
 public class OneDriveAuthenticator {
     protected static final String TAG = "OneDriveAuthenticator";

app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveClient.java

@@ -3,13 +3,12 @@ package com.epson.iprint.storage.onedrive;
 import android.app.Activity;
 import android.content.Context;
 import android.os.AsyncTask;
-
 import android.support.p000v4.app.NotificationCompat;
+
 import com.box.androidsdk.content.models.BoxRepresentation;
 import com.epson.iprint.storage.StorageItem;
 import com.epson.iprint.storage.StorageSecureStore;
 import com.epson.iprint.storage.StorageServiceClient;
-import com.epson.iprint.storage.onedrive.OneDriveAuthenticator;
 import com.onedrive.sdk.authentication.IAccountInfo;
 import com.onedrive.sdk.concurrency.ChunkedUploadProvider;
 import com.onedrive.sdk.concurrency.ICallback;
@@ -24,9 +23,7 @@ import com.onedrive.sdk.extensions.Item;
 import com.onedrive.sdk.extensions.Shared;
 import com.onedrive.sdk.extensions.UploadSession;
 import com.onedrive.sdk.options.QueryOption;
-import epson.print.R;
-import epson.print.CommonDefine;
-import epson.server.utils.Define;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -37,6 +34,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import epson.print.CommonDefine;
+import epson.print.R;
+import epson.server.utils.Define;
+
 public class OneDriveClient extends StorageServiceClient {
     private static final String[] EXTENSIONS_IPRINT_SPEC = {"doc", "docx", "rtf", "xls", "xlsm", "xlsx", "ppt", "pptx", "pps", "ppsx"};
     private static final String[] EXTENSIONS_ONEDRIVE_SPEC = {"doc", "docx", "epub", "eml", "htm", "html", "md", NotificationCompat.CATEGORY_MESSAGE, "odp", "ods", "odt", "pps", "ppsx", "ppt", "pptx", "rtf", "tif", "tiff", "xls", "xlsm", "xlsx"};

app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveSignInActivity.java

@@ -1,7 +1,6 @@
 package com.epson.iprint.storage.onedrive;
 
 import com.epson.iprint.storage.StorageSignInActivity;
-import com.epson.iprint.storage.onedrive.OneDriveAuthenticator;
 import com.onedrive.sdk.extensions.IOneDriveClient;
 
 public class OneDriveSignInActivity extends StorageSignInActivity {

app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveStorageProcessUploadActivity.java

@@ -3,11 +3,12 @@ package com.epson.iprint.storage.onedrive;
 import android.content.Context;
 import android.content.Intent;
 import android.widget.Button;
+
 import com.epson.iprint.storage.StorageProcessActivity;
 import com.epson.iprint.storage.StorageProcessUploadActivity;
 import com.epson.iprint.storage.StorageServiceClient;
-import com.epson.iprint.storage.onedrive.OneDriveAuthenticator;
 import com.onedrive.sdk.extensions.IOneDriveClient;
+
 import epson.print.R;
 
 public class OneDriveStorageProcessUploadActivity extends StorageProcessUploadActivity {

app/src/main/java/com/epson/lib/escani2/EscanI2Lib.java

@@ -1,8 +1,5 @@
 package com.epson.lib.escani2;
 
-import com.epson.lib.escani2.EscanI2NativeInterface;
-import com.epson.lib.escani2.ScanSize;
-
 import java.util.ArrayList;
 import java.util.Locale;
 

app/src/main/java/com/epson/lib/escani2/EscanI2NativeIf.java

@@ -1,7 +1,5 @@
 package com.epson.lib.escani2;
 
-import com.epson.lib.escani2.EscanI2NativeInterface;
-
 class EscanI2NativeIf implements EscanI2NativeInterface {
     private long mNativeInscance;
     EscanI2NativeInterface.PageWriteCallback mPageWriteCallback;

app/src/main/java/com/epson/lib/escani2/I2LibScannerInfoAndCapability.java

@@ -1,7 +1,5 @@
 package com.epson.lib.escani2;
 
-import com.epson.lib.escani2.EscanI2Lib;
-
 import java.io.Serializable;
 
 public class I2LibScannerInfoAndCapability implements Serializable {

app/src/main/java/com/epson/lib/escani2/ScanI2Params.java

@@ -1,7 +1,5 @@
 package com.epson.lib.escani2;
 
-import com.epson.lib.escani2.EscanI2Lib;
-
 import java.io.Serializable;
 
 public class ScanI2Params implements Serializable, Cloneable {

app/src/main/java/com/epson/lib/escani2/ScanSize.java

@@ -1,15 +1,11 @@
 package com.epson.lib.escani2;
 
 
-
-
-import com.epson.lib.escani2.EscanI2Lib;
+import java.io.Serializable;
 
 import epson.scan.i2lib.I2ScanParamArbiter;
 import epson.scan.lib.ScanSizeHelper;
 
-import java.io.Serializable;
-
 public class ScanSize implements Serializable {
     private int mOffsetX;
     private int mOffsetY;

app/src/main/java/com/epson/lib/escani2/ScannerI2Info.java

@@ -1,7 +1,5 @@
 package com.epson.lib.escani2;
 
-import com.epson.lib.escani2.EscanI2Lib;
-
 import java.io.Serializable;
 
 public class ScannerI2Info implements Serializable {

app/src/main/java/com/epson/memcardacc/AltAlertDialogFragment.java

@@ -6,7 +6,6 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 
 
-
 public class AltAlertDialogFragment extends DialogFragment {
     private static final String ARG_MESSAGE = "message";
     private static final String ARG_MESSAGE_STR = "message_string";

app/src/main/java/com/epson/memcardacc/AltViewImageAdapter.java

@@ -11,13 +11,13 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import epson.print.CommonDefine;
 import epson.print.ImageItem;
 import epson.print.Util.EPLog;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
     private static final String TAG = "ViewImageAdapter";
     int itmH;

app/src/main/java/com/epson/memcardacc/BitmapCache.java

@@ -5,13 +5,11 @@ import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
 import android.media.ExifInterface;
 
-import com.epson.memcardacc.ImageUtil;
-
-import epson.print.EPImage;
-
 import java.io.File;
 import java.io.IOException;
 
+import epson.print.EPImage;
+
 public class BitmapCache {
     private static final String LOG_TAG = "BitmapCache";
     private static BitmapCache sBitmapCacheInstance;

app/src/main/java/com/epson/memcardacc/CifsAccess.java

@@ -5,8 +5,8 @@ import android.content.SharedPreferences;
 
 import com.google.common.primitives.UnsignedBytes;
 
-import epson.print.IprintApplication;
-import epson.print.Util.EPLog;
+import org.apache.commons.lang.CharEncoding;
+import org.apache.commons.lang.time.DateUtils;
 
 import java.io.UnsupportedEncodingException;
 import java.util.LinkedList;
@@ -14,8 +14,8 @@ import java.util.TimeZone;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.lang.CharEncoding;
-import org.apache.commons.lang.time.DateUtils;
+import epson.print.IprintApplication;
+import epson.print.Util.EPLog;
 
 public class CifsAccess {
     public static final int CHECK_STORAGE_ERROR = 0;

app/src/main/java/com/epson/memcardacc/ConfirmReadMemcard.java

@@ -1,25 +1,15 @@
 package com.epson.memcardacc;
 
 
-
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.StatFs;
-
-
 import android.view.View;
 import android.widget.TextView;
 
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 
-import epson.common.DialogProgress;
-import epson.common.DialogProgressViewModel;
-import epson.print.ActivityIACommon;
-
-import epson.print.CommonDefine;
-import epson.print.Util.EPLog;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -27,6 +17,12 @@ import java.util.Deque;
 import java.util.Iterator;
 import java.util.Locale;
 
+import epson.common.DialogProgress;
+import epson.common.DialogProgressViewModel;
+import epson.print.ActivityIACommon;
+import epson.print.CommonDefine;
+import epson.print.Util.EPLog;
+
 public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgress.DialogButtonClick {
     private static final int ACTIVITY_DIRECTORY_SELECT = 2;
     private static final int ACTIVITY_TYPE_PROGRESS = 1;

app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java

@@ -1,33 +1,26 @@
 package com.epson.memcardacc;
 
 
-
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-
-
-
-
 import android.view.View;
 import android.widget.TextView;
 
-import com.epson.memcardacc.MemCardWriteConvertViewModel;
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Deque;
+import java.util.Locale;
+
 import epson.common.DialogProgress;
 import epson.common.DialogProgressViewModel;
 import epson.print.ActivityIACommon;
-
 import epson.print.MyPrinter;
 import epson.print.Util.EPLog;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Deque;
-import java.util.Locale;
-
 public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgress.DialogButtonClick {
     private static final int ACTIVITY_TYPE_PROGRESS = 1;
     private static final String DIALOG_CHECK_AND_NEXT = "dialog_check_and_next";

app/src/main/java/com/epson/memcardacc/CopyTask.java

@@ -2,14 +2,13 @@ package com.epson.memcardacc;
 
 import android.content.Context;
 
-
 import com.epson.iprint.prtlogger.CommonLog;
 
+import java.util.ArrayList;
+
 import epson.print.Util.AsyncTaskExecutor;
 import epson.print.Util.EPLog;
 
-import java.util.ArrayList;
-
 /* compiled from: MemcardWriteProgress */
 class CopyTask extends AsyncTaskExecutor<Void, Integer, Integer> {
     private static final String LOG_TAG = "CopyTask";

app/src/main/java/com/epson/memcardacc/DirectorySelecterActivity.java

@@ -13,10 +13,10 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import epson.print.CommonDefine;
-
 import java.io.File;
 
+import epson.print.CommonDefine;
+
 public class DirectorySelecterActivity extends Activity {
     private static final int DIALOG_FILE_NAME_INVALID = 1;
     public static final String PARAM_BASE_DIRECTORY = "baseDirectory";

app/src/main/java/com/epson/memcardacc/FileConvertTask.java

@@ -2,15 +2,14 @@ package com.epson.memcardacc;
 
 import android.os.AsyncTask;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
 
 import epson.common.ExternalFileUtils;
 import epson.common.ImageUtil;
 import epson.print.IprintApplication;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-
 class FileConvertTask extends AsyncTask<Void, Void, ArrayList<String>> {
     private static final int FILE_SIZE_LIMIT = 10485760;
     private final ConvertEndListener mConvertEndListener;